1 files changed, 24 insertions, 24 deletions

diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index 016a39ee6..bb32c04ff 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -37,8 +37,8 @@
 using KPIM::ProgressManager;
 
 
-KNNetAccess::KNNetAccess(TQObject *parent, const char *name )
-  : TQObject(parent,name), currentNntpJob(0), currentSmtpJob(0)
+KNNetAccess::KNNetAccess(TQObject *tqparent, const char *name )
+  : TQObject(tqparent,name), currentNntpJob(0), currentSmtpJob(0)
 {
   if ( pipe(nntpInPipe) == -1 || pipe(nntpOutPipe) == -1 ) {
     KMessageBox::error(knGlobals.topWidget, i18n("Internal error:\nFailed to open pipes for internal communication."));
@@ -102,7 +102,7 @@ void KNNetAccess::addJob(KNJobData *job)
   if ( !job->account()->readyForLogin() ) {
     mWalletQueue.append( job );
     knGlobals.accountManager()->loadPasswordsAsync();
-    job->seStatus( i18n( "Waiting for KWallet..." ) );
+    job->setqStatus( i18n( "Waiting for KWallet..." ) );
     return;
   }
 
@@ -142,7 +142,7 @@ void KNNetAccess::addJob(KNJobData *job)
         startJobNntp();
     }
   }
-  updateStatus();
+  updatetqStatus();
 }
 
 
@@ -178,7 +178,7 @@ void KNNetAccess::stopJobsNntp( int type )
     } else
       ++it;
   }
-  updateStatus();
+  updatetqStatus();
 }
 
 
@@ -207,7 +207,7 @@ void KNNetAccess::stopJobsSmtp( int type )
     } else
       ++it;
   }
-  updateStatus();
+  updatetqStatus();
 }
 
 
@@ -317,7 +317,7 @@ void KNNetAccess::threadDoneNntp()
         info->setUser(user);
         info->setPass(pass);
         tmp->setAuthError(false);
-        tmp->setErrorString(TQString::null);
+        tmp->setErrorString(TQString());
 
         kdDebug(5003) << "KNNetAccess::threadDoneNntp(): trying again with authentication data" << endl;
 
@@ -331,7 +331,7 @@ void KNNetAccess::threadDoneNntp()
   nntpClient->removeJob();
   currentNntpJob = 0L;
 
-  currMsg = TQString::null;
+  currMsg = TQString();
   knGlobals.seStatusMsg();
   tmp->setComplete();
 
@@ -340,7 +340,7 @@ void KNNetAccess::threadDoneNntp()
   if (!nntpJobQueue.isEmpty())
     startJobNntp();
 
-  updateStatus();
+  updatetqStatus();
 }
 
 
@@ -358,7 +358,7 @@ void KNNetAccess::threadDoneSmtp()
   tmp = currentSmtpJob;
   currentSmtpJob = 0L;
   if (!currentNntpJob) {
-    currMsg = TQString::null;
+    currMsg = TQString();
     knGlobals.seStatusMsg();
   }
   tmp->setComplete();
@@ -368,7 +368,7 @@ void KNNetAccess::threadDoneSmtp()
   if (!smtpJobQueue.isEmpty())
     startJobSmtp();
 
-  updateStatus();
+  updatetqStatus();
 }
 
 
@@ -399,52 +399,52 @@ void KNNetAccess::slotThreadSignal(int i)
       case KNProtocolClient::TSconnect:
         currMsg = i18n(" Connecting to server...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSloadGrouplist:
         currMsg = i18n(" Loading group list from disk...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSwriteGrouplist:
         currMsg = i18n(" Writing group list to disk...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadGrouplist:
         currMsg = i18n(" Downloading group list...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadNewGroups:
         currMsg = i18n(" Looking for new groups...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadDesc:
         currMsg = i18n(" Downloading group descriptions...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadNew:
         currMsg = i18n(" Downloading new headers...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSsortNew:
         currMsg = i18n(" Sorting...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadArticle:
         currMsg = i18n(" Downloading article...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSsendArticle:
         currMsg = i18n(" Sending article...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->seStatus(currMsg);
+        currentNntpJob->setqStatus(currMsg);
       break;
       case KNProtocolClient::TSjobStarted:
         currentNntpJob->setProgress(0);
@@ -477,7 +477,7 @@ void KNNetAccess::slotPasswordsChanged()
 {
   TQValueList<KNJobData*>::ConstIterator it;
   for ( it = mWalletQueue.begin(); it != mWalletQueue.end(); ++it ) {
-    (*it)->seStatus( i18n("Waiting...") );
+    (*it)->setqStatus( i18n("Waiting...") );
     if ( (*it)->type() == KNJobData::JTmail )
       smtpJobQueue.append( (*it) );
     else
@@ -528,10 +528,10 @@ void KNNetAccess::slotCancelJob( KPIM::ProgressItem *item )
   if ( currentSmtpJob && currentSmtpJob->progressItem() == item )
     cancelCurrentSmtpJob();
 
-  updateStatus();
+  updatetqStatus();
 }
 
-void KNNetAccess::updateStatus( )
+void KNNetAccess::updatetqStatus( )
 {
   if ( nntpJobQueue.isEmpty() && smtpJobQueue.isEmpty() && !currentNntpJob
        && !currentSmtpJob && mWalletQueue.isEmpty() )