7 files changed, 13 insertions, 25 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..8a9a6cb2 100644
--- a/korganizer/printing/calprinter.cpp
+++ b/korganizer/printing/calprinter.cpp
@@ -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..c8e462d6 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 <kdemacros.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.h b/korganizer/printing/calprintpluginbase.h
index 3684e2f1..cc42b928 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 <kdemacros.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..5b8c977f 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 <kdemacros.h>
 
 namespace KOrg {
 
-class KDE_EXPORT CellItem
+class TDE_EXPORT CellItem
 {
   public:
     CellItem()