1 files changed, 14 insertions, 14 deletions

diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index af9a75c38..fd53997b3 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -148,7 +148,7 @@ void BackupJob::abort( const TQString &errorMessage )
     // The progressmanager will delete it
   }
 
-  TQString text = i18n( "Failed to archive the folder '%1'." ).tqarg( mRootFolder->name() );
+  TQString text = i18n( "Failed to archive the folder '%1'." ).arg( mRootFolder->name() );
   text += "\n" + errorMessage;
   KMessageBox::sorry( mParentWidget, text, i18n( "Archiving failed." ) );
   deleteLater();
@@ -165,19 +165,19 @@ void BackupJob::finish()
     }
   }
 
-  mProgressItem->seStatus( i18n( "Archiving finished" ) );
+  mProgressItem->setStatus( i18n( "Archiving finished" ) );
   mProgressItem->setComplete();
   mProgressItem = 0;
 
   TQFileInfo archiveFileInfo( mMailArchivePath.path() );
   TQString text = i18n( "Archiving folder '%1' successfully completed. "
                        "The archive was written to the file '%2'." )
-                   .tqarg( mRootFolder->name() ).tqarg( mMailArchivePath.path() );
+                   .arg( mRootFolder->name() ).arg( mMailArchivePath.path() );
   text += "\n" + i18n( "1 message of size %1 was archived.",
                        "%n messages with the total size of %1 were archived.", mArchivedMessages )
-                   .tqarg( KIO::convertSize( mArchivedSize ) );
+                   .arg( KIO::convertSize( mArchivedSize ) );
   text += "\n" + i18n( "The archive file has a size of %1." )
-                   .tqarg( KIO::convertSize( archiveFileInfo.size() ) );
+                   .arg( KIO::convertSize( archiveFileInfo.size() ) );
   KMessageBox::information( mParentWidget, text, i18n( "Archiving finished." ) );
 
   if ( mDeleteFoldersAfterCompletion ) {
@@ -213,7 +213,7 @@ void BackupJob::archiveNextMessage()
   KMMsgDict::instance()->getLocation( serNum, &folder, &mMessageIndex );
   if ( mMessageIndex == -1 ) {
     kdWarning(5006) << "Failed to get message location for sernum " << serNum << endl;
-    abort( i18n( "Unable to retrieve a message for folder '%1'." ).tqarg( mCurrentFolder->name() ) );
+    abort( i18n( "Unable to retrieve a message for folder '%1'." ).arg( mCurrentFolder->name() ) );
     return;
   }
 
@@ -223,7 +223,7 @@ void BackupJob::archiveNextMessage()
   KMMessage *message = mCurrentFolder->getMsg( mMessageIndex );
   if ( !message ) {
     kdWarning(5006) << "Failed to retrieve message with index " << mMessageIndex << endl;
-    abort( i18n( "Unable to retrieve a message for folder '%1'." ).tqarg( mCurrentFolder->name() ) );
+    abort( i18n( "Unable to retrieve a message for folder '%1'." ).arg( mCurrentFolder->name() ) );
     return;
   }
 
@@ -249,7 +249,7 @@ void BackupJob::archiveNextMessage()
     kdWarning(5006) << "Message with subject " << mCurrentMessage->subject()
                     << " is neither complete nor has a parent!" << endl;
     abort( i18n( "Internal error while trying to retrieve a message from folder '%1'." )
-              .tqarg( mCurrentFolder->name() ) );
+              .arg( mCurrentFolder->name() ) );
   }
 
   mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) );
@@ -318,7 +318,7 @@ void BackupJob::processCurrentMessage()
 
     if ( !mArchive->writeFile( fileName, user, group, messageSize, permissions, accessTime,
                                modificationTime, creationTime, messageString ) ) {
-      abort( i18n( "Failed to write a message into the archive folder '%1'." ).tqarg( mCurrentFolder->name() ) );
+      abort( i18n( "Failed to write a message into the archive folder '%1'." ).arg( mCurrentFolder->name() ) );
       return;
     }
 
@@ -357,7 +357,7 @@ void BackupJob::folderJobFinished( KMail::FolderJob *job )
 
   if ( job->error() ) {
     if ( mCurrentFolder )
-      abort( i18n( "Downloading a message in folder '%1' failed." ).tqarg( mCurrentFolder->name() ) );
+      abort( i18n( "Downloading a message in folder '%1' failed." ).arg( mCurrentFolder->name() ) );
     else
       abort( i18n( "Downloading a message in the current folder failed." ) );
   }
@@ -388,9 +388,9 @@ void BackupJob::archiveNextFolder()
 
   mCurrentFolder = mPendingFolders.take( 0 );
   kdDebug(5006) << "===> Archiving next folder: " << mCurrentFolder->name() << endl;
-  mProgressItem->seStatus( i18n( "Archiving folder %1" ).tqarg( mCurrentFolder->name() ) );
+  mProgressItem->setStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) );
   if ( mCurrentFolder->open( "BackupJob" ) != 0 ) {
-    abort( i18n( "Unable to open folder '%1'.").tqarg( mCurrentFolder->name() ) );
+    abort( i18n( "Unable to open folder '%1'.").arg( mCurrentFolder->name() ) );
     return;
   }
   mCurrentFolderOpen = true;
@@ -411,7 +411,7 @@ void BackupJob::archiveNextFolder()
     success = false;
   if ( !success ) {
     abort( i18n( "Unable to create folder structure for folder '%1' within archive file." )
-              .tqarg( mCurrentFolder->name() ) );
+              .arg( mCurrentFolder->name() ) );
     return;
   }
 
@@ -423,7 +423,7 @@ void BackupJob::archiveNextFolder()
                       << " at index " << i << "!" << endl;
       // TODO: handle error in a nicer way. this is _very_ bad
       abort( i18n( "Unable to backup messages in folder '%1', the index file is corrupted." )
-               .tqarg( mCurrentFolder->name() ) );
+               .arg( mCurrentFolder->name() ) );
       return;
     }
     else