1 files changed, 13 insertions, 13 deletions

diff --git a/kdialogd3/kdialogd.cpp b/kdialogd3/kdialogd.cpp
index 8886e65..024f5ba 100644
--- a/kdialogd3/kdialogd.cpp
+++ b/kdialogd3/kdialogd.cpp
@@ -3,7 +3,7 @@
 #include "kdialogd.h"
 #include <iostream>
 #include <tdediroperator.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tqsocketnotifier.h>
 #include <tdeio/netaccess.h>
 #include <tdemessagebox.h>
@@ -157,7 +157,7 @@ KDialogD::KDialogD(TQObject *parent)
     {
         kdError() << "KDialogD could not create socket" << endl;
 #ifdef KDIALOGD_APP
-        kapp->exit();
+        tdeApp->exit();
 #endif
     }
     else
@@ -173,7 +173,7 @@ KDialogD::KDialogD(TQObject *parent)
             theirConfig=new TDEConfig("kdialogdrc", false, false);
 
         connect(new TQSocketNotifier(itsFd, TQSocketNotifier::Read, this),
-                TQT_SIGNAL(activated(int)), this, TQT_SLOT(newConnection()));
+                TQ_SIGNAL(activated(int)), this, TQ_SLOT(newConnection()));
 
 #ifdef KDIALOGD_APP
         if(theirConfig->hasGroup(CFG_TIMEOUT_GROUP))
@@ -187,7 +187,7 @@ KDialogD::KDialogD(TQObject *parent)
 
         kdDebug() << "Timeout:" << itsTimeoutVal << endl;
         if(itsTimeoutVal)
-            connect(itsTimer=new TQTimer(this), TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
+            connect(itsTimer=new TQTimer(this), TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
 #endif
     }
 }
@@ -234,8 +234,8 @@ void KDialogD::newConnection()
                     itsTimer->stop();
 #endif
                 connect(new KDialogDClient(connectedFD, appName, this),
-                        TQT_SIGNAL(error(KDialogDClient *)),
-                        this, TQT_SLOT(deleteConnection(KDialogDClient *)));
+                        TQ_SIGNAL(error(KDialogDClient *)),
+                        this, TQ_SLOT(deleteConnection(KDialogDClient *)));
             }
         }
     }
@@ -262,7 +262,7 @@ void KDialogD::timeout()
         if(grabLock(0)>0)   // 0=> no wait...
         {
             kdDebug() << "Timeout occured, and no connections, so exit" << endl;
-            kapp->exit();
+            tdeApp->exit();
         }
         else     //...unlock lock file...
         {
@@ -280,8 +280,8 @@ KDialogDClient::KDialogDClient(int sock, const TQString &an, TQObject *parent)
                 itsAppName(an)
 {
     kdDebug() << "new client..." << itsAppName << " (" << itsFd << ")" << endl;
-    connect(new TQSocketNotifier(itsFd, TQSocketNotifier::Read, this), TQT_SIGNAL(activated(int)), this, TQT_SLOT(read()));
-    connect(new TQSocketNotifier(itsFd, TQSocketNotifier::Exception, this), TQT_SIGNAL(activated(int)), this, TQT_SLOT(close()));
+    connect(new TQSocketNotifier(itsFd, TQSocketNotifier::Read, this), TQ_SIGNAL(activated(int)), this, TQ_SLOT(read()));
+    connect(new TQSocketNotifier(itsFd, TQSocketNotifier::Exception, this), TQ_SIGNAL(activated(int)), this, TQ_SLOT(close()));
 }
 
 KDialogDClient::~KDialogDClient()
@@ -505,8 +505,8 @@ void KDialogDClient::initDialog(const TQString &caption, KDialogBase *d, unsigne
 #endif
     }
 
-    connect(itsDlg, TQT_SIGNAL(ok(const TQStringList &)), this, TQT_SLOT(ok(const TQStringList &)));
-    connect(itsDlg, TQT_SIGNAL(finished()), this, TQT_SLOT(finished()));
+    connect(itsDlg, TQ_SIGNAL(ok(const TQStringList &)), this, TQ_SLOT(ok(const TQStringList &)));
+    connect(itsDlg, TQ_SIGNAL(finished()), this, TQ_SLOT(finished()));
     itsDlg->show();
 }
 
@@ -691,7 +691,7 @@ int main(int argc, char **argv)
 {
     TDECmdLineArgs::init(argc, argv, &aboutData);
 
-    KUniqueApplication *app=new KUniqueApplication;
+    TDEUniqueApplication *app=new TDEUniqueApplication;
     KDialogD           kdialogd;
     int                rv=app->exec();
 
@@ -704,7 +704,7 @@ int main(int argc, char **argv)
 #else
 extern "C"
 {
-    KDE_EXPORT KDEDModule *create_kdialogd(const TQCString &obj)
+    TDE_EXPORT KDEDModule *create_kdialogd(const TQCString &obj)
     {
         return new KDialogDKDED(obj);
     }