From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:50 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 kmail/kmacctimap.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'kmail/kmacctimap.cpp')

diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index cac848937..fe74bc80a 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -50,7 +50,7 @@ using KPIM::ProgressManager;
 #include <kmessagebox.h>
 #include <kdebug.h>
 
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 
 #include <errno.h>
 
@@ -69,7 +69,7 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin
   connect(&mErrorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotResetConnectionError()));
 
   TQString serNumUri = locateLocal( "data", "kmail/unfiltered." +
-				   TQString("%1").arg(KAccount::id()) );
+				   TQString("%1").tqarg(KAccount::id()) );
   KConfig config( serNumUri );
   TQStringList serNums = config.readListEntry( "unfiltered" );
   mFilterSerNumsToSave.setAutoDelete( false );
@@ -88,7 +88,7 @@ KMAcctImap::~KMAcctImap()
   killAllJobs( true );
 
   TQString serNumUri = locateLocal( "data", "kmail/unfiltered." +
-				   TQString("%1").arg(KAccount::id()) );
+				   TQString("%1").tqarg(KAccount::id()) );
   KConfig config( serNumUri );
   TQStringList serNums;
   TQDictIterator<int> it( mFilterSerNumsToSave );
@@ -297,7 +297,7 @@ void KMAcctImap::processNewMail(bool interactive)
   mMailCheckProgressItem =
     ProgressManager::createProgressItem(
         "MailCheckAccount" + name(),
-        i18n("Checking account: %1" ).arg( TQStyleSheet::escape( name() ) ),
+        i18n("Checking account: %1" ).tqarg( TQStyleSheet::escape( name() ) ),
         TQString(), // status
         true, // can be canceled
         useSSL() || useTLS() );
@@ -395,7 +395,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
   if ( mMailCheckProgressItem ) {
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") );
+    mMailCheckProgressItem->setqStatus( folder->prettyURL() + i18n(" completed") );
   }
   mCountRemainChecks--;
 
@@ -434,7 +434,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
     // It's possible that the message has been deleted or moved into a
     // different folder, or that the serNum is stale
     if ( !folder ) {
-      mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) );
+      mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) );
       ++filterIt;
       continue;
     }
@@ -443,7 +443,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
     if (!imapFolder ||
 	!imapFolder->folder()->isSystemFolder() ||
         !(imapFolder->imapPath() == "/INBOX/") ) { // sanity checking
-      mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) );
+      mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) );
       ++filterIt;
       continue;
     }
@@ -452,7 +452,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
 
       msg = folder->getMsg( idx );
       if (!msg) { // sanity checking
-        mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) );
+        mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) );
         ++filterIt;
         continue;
       }
@@ -473,7 +473,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
 		  TQT_SLOT(slotFilterMsg(KMMessage*)));
 	  job->start();
 	} else {
-	  mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) );
+	  mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) );
 	  if (slotFilterMsg(msg) == 2) break;
 	}
       }
@@ -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;
   }
@@ -498,7 +498,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
 //-----------------------------------------------------------------------------
 void KMAcctImap::slotFiltered(TQ_UINT32 serNum)
 {
-    mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) );
+    mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) );
 }
 
 //-----------------------------------------------------------------------------
@@ -584,7 +584,7 @@ void KMAcctImap::execFilters(TQ_UINT32 serNum)
   if ( findIt != mFilterSerNums.end() )
       return;
   mFilterSerNums.append( serNum );
-  mFilterSerNumsToSave.insert( TQString( "%1" ).arg( serNum ), (const int *)1 );
+  mFilterSerNumsToSave.insert( TQString( "%1" ).tqarg( serNum ), (const int *)1 );
 }
 
 int KMAcctImap::slotFilterMsg( KMMessage *msg )
@@ -596,7 +596,7 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg )
   msg->setTransferInProgress(false);
   TQ_UINT32 serNum = msg->getMsgSerNum();
   if ( serNum )
-    mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) );
+    mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) );
 
   int filterResult = kmkernel->filterMgr()->process(msg,
 						    KMFilterMgr::Inbound,
-- 
cgit v1.2.1