1 files changed, 9 insertions, 9 deletions

diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index 57488f71..475a48e3 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -42,16 +42,16 @@ KNNetAccess::KNNetAccess(TQObject *parent, const char *name )
 {
   if ( pipe(nntpInPipe) == -1 || pipe(nntpOutPipe) == -1 ) {
     KMessageBox::error(knGlobals.topWidget, i18n("Internal error:\nFailed to open pipes for internal communication."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
   if ( fcntl( nntpInPipe[0], F_SETFL, O_NONBLOCK ) == -1 ||
        fcntl( nntpOutPipe[0], F_SETFL, O_NONBLOCK ) == -1 ) {
     KMessageBox::error(knGlobals.topWidget, i18n("Internal error:\nFailed to open pipes for internal communication."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
 
   nntpNotifier=new TQSocketNotifier(nntpInPipe[0], TQSocketNotifier::Read);
-  connect(nntpNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotThreadSignal(int)));
+  connect(nntpNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotThreadSignal(int)));
 
   // initialize the KSocks stuff in the main thread, otherwise we get
   // strange effects on FreeBSD
@@ -60,14 +60,14 @@ KNNetAccess::KNNetAccess(TQObject *parent, const char *name )
   nntpClient=new KNNntpClient(nntpOutPipe[0],nntpInPipe[1],nntp_Mutex);
   nntpClient->start();
 
-  connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordsChanged()) );
+  connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordsChanged()) );
 }
 
 
 
 KNNetAccess::~KNNetAccess()
 {
-  disconnect(nntpNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotThreadSignal(int)));
+  disconnect(nntpNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotThreadSignal(int)));
 
   nntpClient->terminateClient();
   triggerAsyncThread(nntpOutPipe[1]);
@@ -95,7 +95,7 @@ void KNNetAccess::addJob(KNJobData *job)
   }
 
   job->createProgressItem();
-  connect( job->progressItem(), TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotCancelJob(KPIM::ProgressItem*)) );
+  connect( job->progressItem(), TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQ_SLOT(slotCancelJob(KPIM::ProgressItem*)) );
   emit netActive( true );
 
   // put jobs which are waiting for the wallet into an extra queue
@@ -275,8 +275,8 @@ void KNNetAccess::startJobSmtp()
       destination.setPass( account->pass() );
     }
     TDEIO::Job* job = TDEIO::storedPut( art->encodedContent(true), destination, -1, false, false, false );
-    connect( job, TQT_SIGNAL( result(TDEIO::Job*) ),
-             TQT_SLOT( slotJobResult(TDEIO::Job*) ) );
+    connect( job, TQ_SIGNAL( result(TDEIO::Job*) ),
+             TQ_SLOT( slotJobResult(TDEIO::Job*) ) );
     if ( account->encryption() == KNServerInfo::TLS )
       job->addMetaData( "tls", "on" );
     else
@@ -312,7 +312,7 @@ void KNNetAccess::threadDoneNntp()
       bool keep=false;
       if (KDialog::Accepted == TDEIO::PasswordDialog::getNameAndPassword(user, pass, &keep,
                                  i18n("You need to supply a username and a\npassword to access this server"), false,
-                                 kapp->makeStdCaption(i18n("Authentication Failed")),info->server(),i18n("Server:"))) {
+                                 tdeApp->makeStdCaption(i18n("Authentication Failed")),info->server(),i18n("Server:"))) {
         info->setNeedsLogon(true);
         info->setUser(user);
         info->setPass(pass);