6 files changed, 15 insertions, 15 deletions
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index e2f9126f..7b2d92b2 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -37,11 +37,11 @@
 
 #include "kcmkmailsummary.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_kmailsummary( TQWidget *parent, const char * )
+  TDE_EXPORT TDECModule *create_kmailsummary( TQWidget *parent, const char * )
   {
     return new KCMKMailSummary( parent, "kcmkmailsummary" );
   }
@@ -52,8 +52,8 @@ KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name )
 {
   initGUI();
 
-  connect( mFolderView, TQT_SIGNAL( clicked( TQListViewItem* ) ), TQT_SLOT( modified() ) );
-  connect( mFullPath, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
+  connect( mFolderView, TQ_SIGNAL( clicked( TQListViewItem* ) ), TQ_SLOT( modified() ) );
+  connect( mFullPath, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
 
   TDEAcceleratorManager::manage( this );
 
diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h
index 7cc4763e..e6681153 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.h
+++ b/kontact/plugins/kmail/kcmkmailsummary.h
@@ -35,7 +35,7 @@ class TQCheckListItem;
 
 class KCMKMailSummary : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 09c2fd05..8d9c670a 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -29,7 +29,7 @@
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <tdeparts/componentfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <dcopclient.h>
 #include <tdetempfile.h>
 
@@ -56,17 +56,17 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kmailplugin,
                             KMailPluginFactory( "kontact_kmailplugin" ) )
 
 KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& )
-  : Kontact::Plugin( core, TQT_TQOBJECT(core), "kmail" ),
+  : Kontact::Plugin( core, core, "kmail" ),
     mStub( 0 )
 {
   setInstance( KMailPluginFactory::instance() );
 
   insertNewAction( new TDEAction( i18n( "New Message..." ), "mail-message-new",
-                   CTRL+SHIFT+Key_M, this, TQT_SLOT( slotNewMail() ), actionCollection(),
+                   CTRL+SHIFT+Key_M, this, TQ_SLOT( slotNewMail() ), actionCollection(),
                    "new_mail" ) );
 
   insertSyncAction( new TDEAction( i18n( "Synchronize Mail" ), "reload",
-                   0, this, TQT_SLOT( slotSyncFolders() ), actionCollection(),
+                   0, this, TQ_SLOT( slotSyncFolders() ), actionCollection(),
                    "sync_mail" ) );
 
   mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
@@ -203,7 +203,7 @@ int KMailUniqueAppHandler::newInstance()
 }
 
 bool KMailPlugin::queryClose() const {
-  KMailIface_stub stub( kapp->dcopClient(), "kmail", "KMailIface" );
+  KMailIface_stub stub( tdeApp->dcopClient(), "kmail", "KMailIface" );
   bool canClose=stub.canQueryClose();
   return canClose;
 }
diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h
index 923fd3a8..ff8c532e 100644
--- a/kontact/plugins/kmail/kmail_plugin.h
+++ b/kontact/plugins/kmail/kmail_plugin.h
@@ -45,7 +45,7 @@ public:
 
 class KMailPlugin : public Kontact::Plugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KMailPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 924938a0..31e22992 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -133,8 +133,8 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
       urlLabel->installEventFilter( this );
       urlLabel->setAlignment( AlignLeft );
       urlLabel->show();
-      connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
-               TQT_SLOT( selectFolder( const TQString& ) ) );
+      connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+               TQ_SLOT( selectFolder( const TQString& ) ) );
       mLayout->addWidget( urlLabel, counter, 0 );
       mLabels.append( urlLabel );
 
@@ -163,7 +163,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
 bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+    KURLLabel* label = static_cast<KURLLabel*>( obj );
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h
index 3813ee03..d5fb299c 100644
--- a/kontact/plugins/kmail/summarywidget.h
+++ b/kontact/plugins/kmail/summarywidget.h
@@ -40,7 +40,7 @@ class TQString;
 
 class SummaryWidget : public Kontact::Summary, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 //  
   K_DCOP