8 files changed, 20 insertions, 20 deletions
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index 3c270aa83..859e76fa9 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -43,7 +43,7 @@ Core::Core( TQWidget *parent, const char *name )
   d = new Private;
   TQTimer* timer = new TQTimer( this );
   mLastDate = TQDate::currentDate();
-  connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) );
+  connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkNewDay() ) );
   timer->start( 1000*60 );
 }
 
@@ -66,13 +66,13 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname )
   KParts::ReadOnlyPart *part =
       KParts::ComponentFactory::
           createPartInstanceFromLibrary<KParts::ReadOnlyPart>
-              ( libname, this, 0, TQT_TQOBJECT(this), "kontact", TQStringList(), &error );
+              ( libname, this, 0, this, "kontact", TQStringList(), &error );
 
   KParts::ReadOnlyPart *pimPart = dynamic_cast<KParts::ReadOnlyPart*>( part );
   if ( pimPart ) {
     mParts.insert( libname, pimPart );
-    QObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ),
-                      TQT_SLOT( slotPartDestroyed( TQObject * ) ) );
+    TQObject::connect( pimPart, TQ_SIGNAL( destroyed( TQObject * ) ),
+                      TQ_SLOT( slotPartDestroyed( TQObject * ) ) );
   } else {
     // TODO move to KParts::ComponentFactory
     switch( error ) {
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index c76406d5e..a075c2431 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -38,9 +38,9 @@ class Plugin;
 /**
   This class provides the interface to the Kontact core for the plugins.
 */
-class KDE_EXPORT Core : public KParts::MainWindow
+class TDE_EXPORT Core : public KParts::MainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     virtual ~Core();
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index 3b63466c7..71364b6a1 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -147,7 +147,7 @@ KParts::ReadOnlyPart *Plugin::part()
   if ( !d->part ) {
     d->part = createPart();
     if ( d->part ) {
-      connect( d->part, TQT_SIGNAL( destroyed() ), TQT_SLOT( partDestroyed() ) );
+      connect( d->part, TQ_SIGNAL( destroyed() ), TQ_SLOT( partDestroyed() ) );
       core()->partLoaded( this, d->part );
     }
   }
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 70c8a7e23..c08957411 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -55,9 +55,9 @@ class Summary;
   to get a plugin. It can insert an icon into the sidepane,
   add widgets to the widgetstack and add menu items via XMLGUI.
  */
-class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
+class TDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp
index 6192dd4c4..c48e78896 100644
--- a/kontact/interfaces/summary.cpp
+++ b/kontact/interfaces/summary.cpp
@@ -82,14 +82,14 @@ void Summary::mousePressEvent( TQMouseEvent *event )
 
 void Summary::mouseMoveEvent( TQMouseEvent *event )
 {
-  if ( (event->state() & Qt::LeftButton) &&
+  if ( (event->state() & TQt::LeftButton) &&
        (event->pos() - mDragStartPoint).manhattanLength() > 4 ) {
 
     TQDragObject *drag = new TQTextDrag( "", this, "SummaryWidgetDrag" );
 
     TQPixmap pm = TQPixmap::grabWidget( this );
     if ( pm.width() > 300 )
-      pm = pm.convertToImage().smoothScale( 300, 300, TQ_ScaleMin );
+      pm = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin );
 
     TQPainter painter;
     painter.begin( &pm );
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index dba346e2b..303babb3d 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -33,9 +33,9 @@ namespace Kontact
 /**
   Summary widget for display in the Summary View plugin.
  */
-class KDE_EXPORT Summary : public TQWidget
+class TDE_EXPORT Summary : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 98a5d45b0..2ad0f6381 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -156,8 +156,8 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
 
   if ( mRunningStandalone ) {
     kapp->dcopClient()->setNotifications( true );
-    connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
-             this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+    connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+             this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
   } else {
     mFactory->createHandler( mPlugin );
   }
@@ -174,8 +174,8 @@ UniqueAppWatcher::~UniqueAppWatcher()
 void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId )
 {
   if ( appId == mPlugin->name() && mRunningStandalone ) {
-    disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
-                this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+    disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+                this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
     kdDebug(5601) << k_funcinfo << appId << endl;
     mFactory->createHandler( mPlugin );
     kapp->dcopClient()->setNotifications( false );
diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h
index 025bb8b83..d6a339634 100644
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@@ -36,7 +36,7 @@ namespace Kontact
  * By default this means simply bringing the main window to the front,
  * but newInstance can be reimplemented.
  */
-class KDE_EXPORT UniqueAppHandler : public DCOPObject
+class TDE_EXPORT UniqueAppHandler : public DCOPObject
 {
   K_DCOP
 
@@ -91,9 +91,9 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor
  * Kontact takes over from there.
  *
  */
-class KDE_EXPORT UniqueAppWatcher : public TQObject
+class TDE_EXPORT UniqueAppWatcher : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public: