From 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:34:45 -0600
Subject: Rename old tq methods that no longer need a unique name

---
 kmail/kmfoldercachedimap.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'kmail/kmfoldercachedimap.cpp')

diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index 10dfff5af..a55d22561 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -1531,7 +1531,7 @@ void KMFolderCachedImap::uploadFlags()
       // Send off a status setting job for each set.
       for( TQStringList::Iterator slit = sets.begin(); slit != sets.end(); ++slit ) {
         TQString imappath = imapPath() + ";UID=" + ( *slit );
-        mAccount->setImaptqStatus(folder(), imappath, flags);
+        mAccount->setImapStatus(folder(), imappath, flags);
       }
     }
     // FIXME END DUPLICATED FROM KMFOLDERIMAP
@@ -1575,7 +1575,7 @@ void KMFolderCachedImap::uploadSeenFlags()
       mStatusFlagsJobs += sets.count();
       for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) {
         TQString imappath = imapPath() + ";UID=" + ( *it );
-        mAccount->setImapSeentqStatus( folder(), imappath, true );
+        mAccount->setImapSeenStatus( folder(), imappath, true );
       }
     }
     if ( !unseenUids.isEmpty() ) {
@@ -1583,7 +1583,7 @@ void KMFolderCachedImap::uploadSeenFlags()
       mStatusFlagsJobs += sets.count();
       for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) {
         TQString imappath = imapPath() + ";UID=" + ( *it );
-        mAccount->setImapSeentqStatus( folder(), imappath, false );
+        mAccount->setImapSeenStatus( folder(), imappath, false );
       }
     }
 
@@ -1618,18 +1618,18 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString&
 }
 
 // This is not perfect, what if the status didn't really change? Oh well ...
-void KMFolderCachedImap::setqStatus( int idx, KMMsgtqStatus status, bool toggle)
+void KMFolderCachedImap::seStatus( int idx, KMMsgStatus status, bool toggle)
 {
-  KMFolderMaildir::setqStatus( idx, status, toggle );
+  KMFolderMaildir::seStatus( idx, status, toggle );
   const KMMsgBase *msg = getMsgBase( idx );
   Q_ASSERT( msg );
   if ( msg )
     mUIDsOfLocallyChangedStatuses.insert( msg->UID() );
 }
 
-void KMFolderCachedImap::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle)
+void KMFolderCachedImap::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
 {
-  KMFolderMaildir::setqStatus(ids, status, toggle);
+  KMFolderMaildir::seStatus(ids, status, toggle);
   for (TQValueList<int>::iterator it = ids.begin(); it != ids.end(); it++ ) {
     const KMMsgBase *msg = getMsgBase( *it );
     Q_ASSERT( msg );
@@ -1929,9 +1929,9 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
           // be considered correct.
           if ( !mReadOnly || !GlobalSettings::allowLocalFlags() ) {
             /* The message is OK, update flags */
-            KMFolderImap::flagsTotqStatus( existingMessage, flags,  false, mReadOnly ? INT_MAX : mPermanentFlags );
+            KMFolderImap::flagsToStatus( existingMessage, flags,  false, mReadOnly ? INT_MAX : mPermanentFlags );
           } else if ( mUserRights & KMail::ACLJobs::WriteSeenFlag ) {
-            KMFolderImap::seenFlagTotqStatus( existingMessage, flags );
+            KMFolderImap::seenFlagToStatus( existingMessage, flags );
           }
         }
         // kdDebug(5006) << "message with uid " << uid << " found in the local cache. " << endl;
@@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState()
   KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem();
   TQString str = i18n("Aborted");
   if (progressItem)
-     progressItem->setqStatus( str );
+     progressItem->seStatus( str );
   emit statusMsg( str );
   emit syncStateChanged();
 }
@@ -2606,21 +2606,21 @@ void KMFolderCachedImap::slotIncreaseProgress()
   mProgress += 5;
 }
 
-void KMFolderCachedImap::newState( int progress, const TQString& synctqStatus )
+void KMFolderCachedImap::newState( int progress, const TQString& syncStatus )
 {
-  //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << synctqStatus << endl;
+  //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << syncStatus << endl;
   KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem();
   if( progressItem )
     progressItem->setCompletedItems( progress );
-  if ( !synctqStatus.isEmpty() ) {
+  if ( !syncStatus.isEmpty() ) {
     TQString str;
     // For a subfolder, show the label. But for the main folder, it's already shown.
     if ( mAccount->imapFolder() == this )
-      str = synctqStatus;
+      str = syncStatus;
     else
-      str = TQString( "%1: %2" ).tqarg( label() ).tqarg( synctqStatus );
+      str = TQString( "%1: %2" ).tqarg( label() ).tqarg( syncStatus );
     if( progressItem )
-      progressItem->setqStatus( str );
+      progressItem->seStatus( str );
     emit statusMsg( str );
   }
   if( progressItem )
@@ -3095,7 +3095,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
       break;
 
     // create subfolder for this incident
-    TQDate today = TQDate::tqcurrentDate();
+    TQDate today = TQDate::currentDate();
     TQString baseName = folder()->label() + "-" + TQString::number( today.year() )
         + (today.month() < 10 ? "0" : "" ) + TQString::number( today.month() )
         + (today.day() < 10 ? "0" : "" ) + TQString::number( today.day() );
-- 
cgit v1.2.1