1 files changed, 9 insertions, 9 deletions
diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp
index 075843259..4a578db0e 100644
--- a/tdeio/kpasswdserver/kpasswdserver.cpp
+++ b/tdeio/kpasswdserver/kpasswdserver.cpp
@@ -37,13 +37,13 @@
 #include <tdewallet.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #endif
 
 extern "C" {
-    KDE_EXPORT KDEDModule *create_kpasswdserver(const TQCString &name)
+    TDE_EXPORT KDEDModule *create_kpasswdserver(const TQCString &name)
     {
        return new KPasswdServer(name);
     }
@@ -76,8 +76,8 @@ KPasswdServer::KPasswdServer(const TQCString &name)
     m_authPending.setAutoDelete(true);
     m_seqNr = 0;
     m_wallet = 0;
-    connect(this, TQT_SIGNAL(windowUnregistered(long)),
-            this, TQT_SLOT(removeAuthForWindowId(long)));
+    connect(this, TQ_SIGNAL(windowUnregistered(long)),
+            this, TQ_SLOT(removeAuthForWindowId(long)));
 }
 
 KPasswdServer::~KPasswdServer()
@@ -187,7 +187,7 @@ KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId, unsigned long
     kdDebug(130) << "KPasswdServer::checkAuthInfo: User= " << info.username
               << ", WindowId = " << windowId << endl;
     if( usertime != 0 )
-        kapp->updateUserTimestamp( usertime );
+        tdeApp->updateUserTimestamp( usertime );
 
     TQString key = createCacheKey(info);
 
@@ -256,7 +256,7 @@ KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windo
     if ( !info.password.isEmpty() ) // should we really allow the caller to pre-fill the password?
         kdDebug(130) <<  "password was set by caller" << endl;
     if( usertime != 0 )
-        kapp->updateUserTimestamp( usertime );
+        tdeApp->updateUserTimestamp( usertime );
 
     TQString key = createCacheKey(info);
     Request *request = new Request;
@@ -279,7 +279,7 @@ KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windo
     m_authPending.append(request);
 
     if (m_authPending.count() == 1)
-       TQTimer::singleShot(0, this, TQT_SLOT(processRequest()));
+       TQTimer::singleShot(0, this, TQ_SLOT(processRequest()));
 
     return info;
 }
@@ -386,7 +386,7 @@ KPasswdServer::processRequest()
             if (hasWalletData)
                 dlg.setKeepPassword( true );
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
             XSetTransientForHint( tqt_xdisplay(), dlg.winId(), request->windowId);
 #endif
 
@@ -493,7 +493,7 @@ KPasswdServer::processRequest()
     }
 
     if (m_authPending.count())
-       TQTimer::singleShot(0, this, TQT_SLOT(processRequest()));
+       TQTimer::singleShot(0, this, TQ_SLOT(processRequest()));
 
 }