1 files changed, 17 insertions, 17 deletions

diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index 12d17af89..6942bab53 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -28,7 +28,7 @@ using KMail::SieveConfig;
 
 #include "kmmessage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "kmfoldertree.h"
 #include "kmfoldermgr.h"
 #include "kmfolderimap.h"
@@ -153,10 +153,10 @@ void KMAcctImap::killAllJobs( bool disconnectSlave )
           msg->setTransferInProgress( false );
        }
     }
-    if ((*it).parent)
+    if ((*it).tqparent)
     {
       // clear folder state
-      KMFolderImap *fld = static_cast<KMFolderImap*>((*it).parent->storage());
+      KMFolderImap *fld = static_cast<KMFolderImap*>((*it).tqparent->storage());
       fld->setCheckingValidity(false);
       fld->quiet(false);
       fld->setContentState(KMFolderImap::imapNoInformation);
@@ -222,7 +222,7 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder )
   {
     ImapJob *job = it.current();
     ++it;
-    if ( !job->msgList().isEmpty() && job->msgList().first()->parent() == folder )
+    if ( !job->msgList().isEmpty() && job->msgList().first()->tqparent() == folder )
     {
       job->kill();
     }
@@ -237,8 +237,8 @@ void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder )
   while ( it != mapJobData.end() ) {
      TQMap<KIO::Job*, jobData>::Iterator i = it;
      it++;
-     if ( (*i).parent ) {
-        if ( (*i).parent == folder ) {
+     if ( (*i).tqparent ) {
+        if ( (*i).tqparent == folder ) {
            mapJobData.remove(i);
         }
      }
@@ -252,8 +252,8 @@ void KMAcctImap::cancelMailCheck()
   TQValueList<KMFolderImap*> folderList;
   TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for (; it != mapJobData.end(); ++it) {
-    if ( (*it).cancellable && (*it).parent ) {
-      folderList << static_cast<KMFolderImap*>((*it).parent->storage());
+    if ( (*it).cancellable && (*it).tqparent ) {
+      folderList << static_cast<KMFolderImap*>((*it).tqparent->storage());
     }
   }
   // Kill jobs
@@ -298,7 +298,7 @@ void KMAcctImap::processNewMail(bool interactive)
     ProgressManager::createProgressItem(
         "MailCheckAccount" + name(),
         i18n("Checking account: %1" ).arg( TQStyleSheet::escape( name() ) ),
-        TQString::null, // status
+        TQString(), // status
         true, // can be canceled
         useSSL() || useTLS() );
 
@@ -395,14 +395,14 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
   if ( mMailCheckProgressItem ) {
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") );
+    mMailCheckProgressItem->setqStatus( folder->prettyURL() + i18n(" completed") );
   }
   mCountRemainChecks--;
 
   // count the unread messages
   const TQString folderId = folder->idString();
   int newInFolder = folder->countUnread();
-  if ( mUnreadBeforeCheck.find( folderId ) != mUnreadBeforeCheck.end() )
+  if ( mUnreadBeforeCheck.tqfind( folderId ) != mUnreadBeforeCheck.end() )
     newInFolder -= mUnreadBeforeCheck[folderId];
   if ( newInFolder > 0 ) {
     addToNewInFolder( folderId, newInFolder );
@@ -488,8 +488,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
     mCountLastUnread = 0; // => mCountUnread - mCountLastUnread == new count
     // when we check only one folder (=selected) and we have new mails
     // then do not display a summary as the normal status message is better
-    bool showStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true;
-    ImapAccountBase::postProcessNewMail( showStatus );
+    bool showtqStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true;
+    ImapAccountBase::postProcessNewMail( showtqStatus );
     mUnreadBeforeCheck.clear();
     mCheckingSingleFolder = false;
   }
@@ -512,7 +512,7 @@ void KMAcctImap::slotUpdateFolderList()
   TQStringList strList;
   mMailCheckFolders.clear();
   kmkernel->imapFolderMgr()->createFolderList(&strList, &mMailCheckFolders,
-    mFolder->folder()->child(), TQString::null, false);
+    mFolder->folder()->child(), TQString(), false);
   // the new list
   TQValueList<TQGuardedPtr<KMFolder> > includedFolders;
   // check for excluded folders
@@ -580,7 +580,7 @@ void KMAcctImap::slotFolderSelected( KMFolderImap* folder, bool )
 void KMAcctImap::execFilters(TQ_UINT32 serNum)
 {
   if ( !kmkernel->filterMgr()->atLeastOneFilterAppliesTo( id() ) ) return;
-  TQValueListIterator<TQ_UINT32> findIt = mFilterSerNums.find( serNum );
+  TQValueListIterator<TQ_UINT32> findIt = mFilterSerNums.tqfind( serNum );
   if ( findIt != mFilterSerNums.end() )
       return;
   mFilterSerNums.append( serNum );
@@ -607,11 +607,11 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg )
     kmkernel->emergencyExit( i18n("Unable to process messages: " ) + TQString::fromLocal8Bit(strerror(errno)));
     return 2;
   }
-  if (msg->parent()) { // unGet this msg
+  if (msg->tqparent()) { // unGet this msg
     int idx = -1;
     KMFolder * p = 0;
     KMMsgDict::instance()->getLocation( msg, &p, &idx );
-    assert( p == msg->parent() ); assert( idx >= 0 );
+    assert( p == msg->tqparent() ); assert( idx >= 0 );
     p->unGetMsg( idx );
   }