summaryrefslogtreecommitdiffstats
path: root/korganizer/printing
diff options
context:
space:
mode:
Diffstat (limited to 'korganizer/printing')
-rw-r--r--korganizer/printing/calprintdayconfig_base.ui5
-rw-r--r--korganizer/printing/calprinter.cpp8
-rw-r--r--korganizer/printing/calprinter.h8
-rw-r--r--korganizer/printing/calprintpluginbase.cpp18
-rw-r--r--korganizer/printing/calprintpluginbase.h4
-rw-r--r--korganizer/printing/calprinttodoconfig_base.ui8
-rw-r--r--korganizer/printing/calprintweetdeconfig_base.ui5
-rw-r--r--korganizer/printing/cellitem.h4
8 files changed, 24 insertions, 36 deletions
diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui
index b9c070eb..a13bc130 100644
--- a/korganizer/printing/calprintdayconfig_base.ui
+++ b/korganizer/printing/calprintdayconfig_base.ui
@@ -248,10 +248,7 @@
</tabstops>
<includes>
<include location="global" impldecl="in declaration">kdateedit.h</include>
+ <include location="global" impldecl="in implementation">libtdepim/kdateedit.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>libtdepim/kdateedit.h</includehint>
- <includehint>libtdepim/kdateedit.h</includehint>
-</includehints>
</UI>
diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp
index 65d1bc08..596ece08 100644
--- a/korganizer/printing/calprinter.cpp
+++ b/korganizer/printing/calprinter.cpp
@@ -34,7 +34,7 @@
#include <tqsplitter.h>
#include <kprinter.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <kdebug.h>
#include <tdeversion.h>
@@ -50,7 +50,7 @@ CalPrinter::CalPrinter( TQWidget *parent, Calendar *calendar, KOrg::CoreHelper *
: TQObject( parent, "CalPrinter" )
{
mParent = parent;
- mConfig = new KSimpleConfig( "korganizer_printing.rc" );
+ mConfig = new TDESimpleConfig( "korganizer_printing.rc" );
mCoreHelper = helper;
init( calendar );
@@ -174,7 +174,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
TQVBox *page = makeVBoxMainWidget();
TQSplitter *splitter = new TQSplitter( page );
- splitter->setOrientation( Qt::Horizontal );
+ splitter->setOrientation( TQt::Horizontal );
mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" );
// use the minimal width possible = max width of the radio buttons, not extensible
@@ -202,7 +202,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
splitterRightLayout->addWidget( mOrientationSelection, 1, 1 );
// signals and slots connections
- connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( setPrintType( int ) ) );
+ connect( mTypeGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( setPrintType( int ) ) );
orientationLabel->setBuddy( mOrientationSelection );
// First insert the config widgets into the widget stack. This possibly assigns
diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h
index 29b925a6..f8d25a4b 100644
--- a/korganizer/printing/calprinter.h
+++ b/korganizer/printing/calprinter.h
@@ -31,7 +31,7 @@
#include <kdialogbase.h>
#include <korganizer/baseview.h>
#include <korganizer/printplugin.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace KOrg {
class CoreHelper;
@@ -50,9 +50,9 @@ class TQLabel;
different formats (day, week, month). It also provides a way for setting
up the printer and remembering these preferences.
*/
-class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
+class TDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -106,7 +106,7 @@ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
class CalPrintDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
CalPrintDialog( KOrg::PrintPlugin::List plugins,
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 9eecda39..4aff9a46 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -38,7 +38,7 @@
#ifndef KORG_NOPRINTER
-inline int round(const double x)
+inline int roundToInt(const double x)
{
return int(x > 0.0 ? x + 0.5 : x - 0.5);
}
@@ -1178,7 +1178,7 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect
// Fill the remaining space (if a month has less days than others) with a crossed-out pattern
if ( daysinmonth<maxdays ) {
- TQRect dayBox( box.left(), daysBox.top() + round(dayheight*daysinmonth), box.width(), 0 );
+ TQRect dayBox( box.left(), daysBox.top() + roundToInt(dayheight*daysinmonth), box.width(), 0 );
dayBox.setBottom( daysBox.bottom() );
p.fillRect( dayBox, TQt::DiagCrossPattern );
}
@@ -1187,9 +1187,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect
for ( d = 0; d < daysinmonth; ++d ) {
TQDate day;
calsys->setYMD( day, dt.year(), dt.month(), d+1 );
- TQRect dayBox( daysBox.left()/*+rand()%50*/, daysBox.top() + round(dayheight*d), daysBox.width()/*-rand()%50*/, 0 );
+ TQRect dayBox( daysBox.left()/*+rand()%50*/, daysBox.top() + roundToInt(dayheight*d), daysBox.width()/*-rand()%50*/, 0 );
// FIXME: When using a border width of 0 for event boxes, don't let the rectangles overlap, i.e. subtract 1 from the top or bottom!
- dayBox.setBottom( daysBox.top()+round(dayheight*(d+1)) - 1 );
+ dayBox.setBottom( daysBox.top()+roundToInt(dayheight*(d+1)) - 1 );
p.setBrush( isWorkingDay( day )?workdayColor:holidayColor );
p.drawRect( dayBox );
@@ -1314,9 +1314,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect
int minsToEnd = starttime.secsTo( placeItem->end() )/60;
TQRect eventBox( xstartcont + placeItem->subCell()*17,
- daysBox.top() + round( double( minsToStart*daysBox.height()) / double(maxdays*24*60) ),
+ daysBox.top() + roundToInt( double( minsToStart*daysBox.height()) / double(maxdays*24*60) ),
14, 0 );
- eventBox.setBottom( daysBox.top() + round( double( minsToEnd*daysBox.height()) / double(maxdays*24*60) ) );
+ eventBox.setBottom( daysBox.top() + roundToInt( double( minsToEnd*daysBox.height()) / double(maxdays*24*60) ) );
drawVerticalBox( p, 0, eventBox, placeItem->event()->summary() );
newxstartcont = TQMAX( newxstartcont, eventBox.right() );
}
@@ -1327,9 +1327,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect
for ( int d=0; d<daysinmonth; ++d ) {
TQStringList dayEvents( textEvents[d+1] );
TQString txt = dayEvents.join(", ");
- TQRect dayBox( xstartcont, daysBox.top()+round(dayheight*d), 0, 0 );
+ TQRect dayBox( xstartcont, daysBox.top()+roundToInt(dayheight*d), 0, 0 );
dayBox.setRight( box.right() );
- dayBox.setBottom( daysBox.top()+round(dayheight*(d+1)) );
+ dayBox.setBottom( daysBox.top()+roundToInt(dayheight*(d+1)) );
printEventString(p, dayBox, txt, TQt::AlignTop | TQt::AlignLeft | TQt::BreakAnywhere );
}
p.setFont( oldfont );
@@ -1742,7 +1742,7 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd,
p.drawLine(300, lineSpacing * 1, width, lineSpacing * 1);
p.setPen( oldPen );
- p.setFont(TQFont("Times", 20, TQFont::Bold, TRUE));
+ p.setFont(TQFont("Times", 20, TQFont::Bold, true));
int newlineSpacing = p.fontMetrics().lineSpacing();
title += TQString::number(fd.year());
p.drawText( 0, lineSpacing * 1 + 4, width, newlineSpacing,
diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h
index 3684e2f1..7c265f38 100644
--- a/korganizer/printing/calprintpluginbase.h
+++ b/korganizer/printing/calprintpluginbase.h
@@ -30,7 +30,7 @@
#include <tqdatetime.h>
#include <kprinter.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
#include <libkcal/calendar.h>
#include <libkcal/event.h>
#include <libkcal/todo.h>
@@ -61,7 +61,7 @@ using namespace KCal;
Base class for KOrganizer printing classes. Each sub class represents one
calendar print format.
*/
-class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
+class TDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
{
public:
enum DisplayFlags {
diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui
index 106ffd7d..031c45dd 100644
--- a/korganizer/printing/calprinttodoconfig_base.ui
+++ b/korganizer/printing/calprinttodoconfig_base.ui
@@ -245,9 +245,6 @@
<property name="text">
<string>Due date</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>true</bool>
</property>
@@ -446,10 +443,7 @@
</tabstops>
<includes>
<include location="global" impldecl="in declaration">kdateedit.h</include>
+ <include location="global" impldecl="in implementation">libtdepim/kdateedit.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>libtdepim/kdateedit.h</includehint>
- <includehint>libtdepim/kdateedit.h</includehint>
-</includehints>
</UI>
diff --git a/korganizer/printing/calprintweetdeconfig_base.ui b/korganizer/printing/calprintweetdeconfig_base.ui
index 0be844ab..079bd164 100644
--- a/korganizer/printing/calprintweetdeconfig_base.ui
+++ b/korganizer/printing/calprintweetdeconfig_base.ui
@@ -291,10 +291,7 @@
</tabstops>
<includes>
<include location="global" impldecl="in declaration">kdateedit.h</include>
+ <include location="global" impldecl="in implementation">libtdepim/kdateedit.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>libtdepim/kdateedit.h</includehint>
- <includehint>libtdepim/kdateedit.h</includehint>
-</includehints>
</UI>
diff --git a/korganizer/printing/cellitem.h b/korganizer/printing/cellitem.h
index e4a37da0..6e030365 100644
--- a/korganizer/printing/cellitem.h
+++ b/korganizer/printing/cellitem.h
@@ -27,11 +27,11 @@
#include <tqstring.h>
#include <tqptrlist.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace KOrg {
-class KDE_EXPORT CellItem
+class TDE_EXPORT CellItem
{
public:
CellItem()
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-25 16:37:54 +0000