1 files changed, 11 insertions, 11 deletions

diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index 783c2dd5c..3a7de1981 100644
--- a/kmail/importjob.cpp
+++ b/kmail/importjob.cpp
@@ -78,7 +78,7 @@ void KMail::ImportJob::finish()
   mProgressItem->setComplete();
   mProgressItem = 0;
   TQString text = i18n( "Importing the archive file '%1' into the folder '%2' succeeded." )
-                     .tqarg( mArchiveFile.path() ).tqarg( mRootFolder->name() );
+                     .arg( mArchiveFile.path() ).arg( mRootFolder->name() );
   text += "\n" + i18n( "1 message was imported.", "%n messages were imported.", mNumberOfImportedMessages );
   KMessageBox::information( mParentWidget, text, i18n( "Import finished." ) );
   deleteLater();
@@ -95,7 +95,7 @@ void KMail::ImportJob::abort( const TQString &errorMessage )
     return;
 
   mAborted = true;
-  TQString text = i18n( "Failed to import the archive into folder '%1'." ).tqarg( mRootFolder->name() );
+  TQString text = i18n( "Failed to import the archive into folder '%1'." ).arg( mRootFolder->name() );
   text += "\n" + errorMessage;
   if ( mProgressItem ) {
     mProgressItem->setComplete();
@@ -111,7 +111,7 @@ KMFolder * KMail::ImportJob::createSubFolder( KMFolder *parent, const TQString &
   KMFolder *newFolder = FolderUtil::createSubFolder( parent, parent->child(), folderName, TQString(),
                                                      KMFolderTypeMaildir );
   if ( !newFolder ) {
-    abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parent->name() ) );
+    abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parent->name() ) );
     return 0;
   }
   else {
@@ -207,11 +207,11 @@ void KMail::ImportJob::importNextMessage()
     }
     mCurrentFolder = folder;
     if ( mCurrentFolder->open( "ImportJob" ) != 0 ) {
-      abort( i18n( "Unable to open folder '%1'." ).tqarg( mCurrentFolder->name() ) );
+      abort( i18n( "Unable to open folder '%1'." ).arg( mCurrentFolder->name() ) );
       return;
     }
     kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl;
-    mProgressItem->seStatus( i18n( "Importing folder %1" ).tqarg( mCurrentFolder->name() ) );
+    mProgressItem->setStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) );
   }
 
   mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) );
@@ -221,7 +221,7 @@ void KMail::ImportJob::importNextMessage()
   messages.files.removeFirst();
 
   mCurrentMessage = new KMMessage();
-  mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* seStatus */ );
+  mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* setStatus */ );
   int retIndex;
 
   // If this is not an IMAP folder, we can add the message directly. Otherwise, the whole thing is
@@ -231,7 +231,7 @@ void KMail::ImportJob::importNextMessage()
   // uploaded.
   if ( mCurrentFolder->folderType() != KMFolderTypeImap ) {
     if ( mCurrentFolder->addMsg( mCurrentMessage, &retIndex ) != 0 ) {
-      abort( i18n( "Failed to add a message to the folder '%1'." ).tqarg( mCurrentFolder->name() ) );
+      abort( i18n( "Failed to add a message to the folder '%1'." ).arg( mCurrentFolder->name() ) );
       return;
     }
     messageAdded();
@@ -284,7 +284,7 @@ KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *parentFolder, const
                                            mode_t subFolderPermissions )
 {
   if ( !parentFolder->createChildFolder() ) {
-    abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parentFolder->name() ) );
+    abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parentFolder->name() ) );
     return 0;
   }
 
@@ -334,7 +334,7 @@ void KMail::ImportJob::importNextDirectory()
 
         const TQString folderName = folderNameForDirectoryName( entry->name() );
         if ( folderName.isEmpty() ) {
-          abort( i18n( "Unexpected subdirectory named '%1'." ).tqarg( entry->name() ) );
+          abort( i18n( "Unexpected subdirectory named '%1'." ).arg( entry->name() ) );
           return;
         }
         KMFolder *subFolder = getOrCreateSubFolder( currentFolder, folderName, entry->permissions() );
@@ -368,12 +368,12 @@ void KMail::ImportJob::start()
   else if ( !mimeType->patterns().grep( "zip", false ).isEmpty() )
     mArchive = new KZip( mArchiveFile.path() );
   else {
-    abort( i18n( "The file '%1' does not appear to be a valid archive." ).tqarg( mArchiveFile.path() ) );
+    abort( i18n( "The file '%1' does not appear to be a valid archive." ).arg( mArchiveFile.path() ) );
     return;
   }
 
   if ( !mArchive->open( IO_ReadOnly ) ) {
-    abort( i18n( "Unable to open archive file '%1'" ).tqarg( mArchiveFile.path() ) );
+    abort( i18n( "Unable to open archive file '%1'" ).arg( mArchiveFile.path() ) );
     return;
   }