From 716a5de8870d7c02bb4d0aed72f30291b17b763a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 11:59:01 -0600
Subject: Remove additional unneeded tq method conversions

---
 kmail/expirejob.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'kmail/expirejob.cpp')

diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index 65de61a3..a208b918 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -162,7 +162,7 @@ void ExpireJob::done()
       moving = true;
       str = i18n( "Removing 1 old message from folder %1...",
                   "Removing %n old messages from folder %1...", count )
-            .tqarg( mSrcFolder->label() );
+            .arg( mSrcFolder->label() );
     } else {
       // Expire by moving
       mMoveToFolder =
@@ -170,7 +170,7 @@ void ExpireJob::done()
       if ( !mMoveToFolder ) {
         str = i18n( "Cannot expire messages from folder %1: destination "
                     "folder %2 not found" )
-              .tqarg( mSrcFolder->label(), mSrcFolder->expireToFolderId() );
+              .arg( mSrcFolder->label(), mSrcFolder->expireToFolderId() );
         kdWarning(5006) << str << endl;
       } else {
         kdDebug(5006) << "ExpireJob: finished expiring in folder "
@@ -185,12 +185,12 @@ void ExpireJob::done()
         str = i18n( "Moving 1 old message from folder %1 to folder %2...",
                     "Moving %n old messages from folder %1 to folder %2...",
                     count )
-              .tqarg( mSrcFolder->label(), mMoveToFolder->label() );
+              .arg( mSrcFolder->label(), mMoveToFolder->label() );
       }
     }
   }
   if ( !str.isEmpty() )
-    BroadcastStatus::instance()->seStatusMsg( str );
+    BroadcastStatus::instance()->setStatusMsg( str );
 
   KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
   group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used
@@ -213,38 +213,38 @@ void ExpireJob::slotMessagesMoved( KMCommand *command )
       msg = i18n( "Removed 1 old message from folder %1.",
                   "Removed %n old messages from folder %1.",
                   mRemovedMsgs.count() )
-            .tqarg( mSrcFolder->label() );
+            .arg( mSrcFolder->label() );
     }
     else {
       msg = i18n( "Moved 1 old message from folder %1 to folder %2.",
                   "Moved %n old messages from folder %1 to folder %2.",
                   mRemovedMsgs.count() )
-            .tqarg( mSrcFolder->label(), mMoveToFolder->label() );
+            .arg( mSrcFolder->label(), mMoveToFolder->label() );
     }
     break;
   case KMCommand::Failed:
     if ( mSrcFolder->expireAction() == KMFolder::ExpireDelete ) {
       msg = i18n( "Removing old messages from folder %1 failed." )
-            .tqarg( mSrcFolder->label() );
+            .arg( mSrcFolder->label() );
     }
     else {
       msg = i18n( "Moving old messages from folder %1 to folder %2 failed." )
-            .tqarg( mSrcFolder->label(), mMoveToFolder->label() );
+            .arg( mSrcFolder->label(), mMoveToFolder->label() );
     }
     break;
   case KMCommand::Canceled:
     if ( mSrcFolder->expireAction() == KMFolder::ExpireDelete ) {
       msg = i18n( "Removing old messages from folder %1 was canceled." )
-            .tqarg( mSrcFolder->label() );
+            .arg( mSrcFolder->label() );
     }
     else {
       msg = i18n( "Moving old messages from folder %1 to folder %2 was "
                   "canceled." )
-            .tqarg( mSrcFolder->label(), mMoveToFolder->label() );
+            .arg( mSrcFolder->label(), mMoveToFolder->label() );
     }
   default: ;
   }
-  BroadcastStatus::instance()->seStatusMsg( msg );
+  BroadcastStatus::instance()->setStatusMsg( msg );
 
   deleteLater();
 }
-- 
cgit v1.2.3