Remove additional unneeded tq method conversions

124 files changed, 965 insertions, 965 deletions

diff --git a/kmail/ChangeLog b/kmail/ChangeLog
index 8c7c6664..8dddd300 100644
--- a/kmail/ChangeLog
+++ b/kmail/ChangeLog
@@ -184,7 +184,7 @@ please visit http://webcvs.kde.org
           Do the right thing when sending to "me@there (John Doe)"
           Waldo's folderless-acount-segv-fix
           More against destroyed last char in message
-          Better long/normal folder-list tqgeometry bugfix
+          Better long/normal folder-list geometry bugfix
           Don't quit while sending, and show a label while you send.
         
 1999-02-03  Sven Radej <radej@kde.org> (KMail-1.0.16)
@@ -553,7 +553,7 @@ Sun Sep  6 18:28:45 1998  Markus Wuebben  <markus@kde.org>
 	quoted text to catch smileys at the beginning of the
 	line ;-)
 
-	* Main window configuration (tqgeometry, etc.) is now
+	* Main window configuration (geometry, etc.) is now
 	stored again.
 
 	* Composer: changed completion key from Ctrl-. to Ctrl-T
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index 05802ef7..cdab18ac 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -589,11 +589,11 @@ Strategy:
   case. These are messages that have neither an In-Reply-To header nor
   a References header and have a subject that is not prefixed.
   In case there is a perfect parent, the current sort cache item is
-  appended to the parents list of unsorted tqchildren, or to that of
+  appended to the parents list of unsorted children, or to that of
   root, if there is not. A sort cache item is created in the mSortCache
   for the parent, if it is not already there. Messages with a parent of
   -1 are appended to the "unparented" list, which is later traversed and
-  its elements threaded. Messages with -2 as the parent are tqchildren of
+  its elements threaded. Messages with -2 as the parent are children of
   root as well, as noted above, and will remain so. 
 
   Once the end of the file is reached, we should have a nicely filled 
@@ -677,13 +677,13 @@ Strategy:
   cache items happen at the same time. 
   
   As previously mentioned (or not) each sort cache item holds a list of its
-  sorted and one of its unsorted tqchildren. Starting with the root node the
+  sorted and one of its unsorted children. Starting with the root node the
   unsorted list is first qsorted, and then merged with the list of already
-  sorted tqchildren. To achieve that, the heads of both lists are compared and
+  sorted children. To achieve that, the heads of both lists are compared and
   the one with the "better" key is added to the list view next by creating a
   KMHeaderListItem for it. That header item receives both its sort key as well
   as its id from the sort cache item. Should the current sort cache item have
-  tqchildren, it is added to the end of a queue of nodes to repeat these steps
+  children, it is added to the end of a queue of nodes to repeat these steps
   on after the current level is sorted. This way, a breadth first merge sort
   is performed on the sort cache items and header items are created at each
   node.
@@ -714,7 +714,7 @@ What happens when a message arrives in the folder?
   After those house keeping tasks are performed, the list of as of yet imper-
   fectly threaded messages is traversed and our newly arrived message is 
   considered as a new parent for each item on it. This is especially important
-  to ensure that parents arriving out of order after their tqchildren still end
+  to ensure that parents arriving out of order after their children still end
   up as parents. If necessary, the entries in the .sorted file of rethreaded
   messages are updated. An entry for the new message itself is appended to the
   .sorted file as well.
@@ -732,9 +732,9 @@ What happens when a message is removed from the folder?
   In this case the msgRemoved slot kicks in and updates the headers list. First
   the sort cache item and header item representing our message are removed from
   the data structures and the ids of all items after it in the store decre-
-  mented. Then a list of tqchildren of the message is assembled containing those
-  tqchildren that have to be reparented now that our message has gone away. If 
-  one of those tqchildren has been marked as toBeDeleted, it is simply added to 
+  mented. Then a list of children of the message is assembled containing those
+  children that have to be reparented now that our message has gone away. If 
+  one of those children has been marked as toBeDeleted, it is simply added to 
   root at top level, because there is no need to find a parent for it if it is
   to go away as well. This is an optimization to avoid rethreading  all 
   messages in a thread when deleting several messages in a thread, or even the
@@ -743,7 +743,7 @@ What happens when a message is removed from the folder?
   can be avoided. Note that that does not work when moving messages via filter
   action. 
 
-  That list of tqchildren is then traversed and a new parent found for each one
+  That list of children is then traversed and a new parent found for each one
   using, again, findParent and findParentBySubject. When a message becomes
   imperfectly threaded in the process, it is added to the corresponding list.
 
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 3712346e..fd29fa19 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -1191,7 +1191,7 @@ void AccountDialog::setupSettings()
     mPop.loginEdit->setText( ap.login() );
     mPop.passwordEdit->setText( ap.passwd());
     mPop.hostEdit->setText( ap.host() );
-    mPop.portEdit->setText( TQString("%1").tqarg( ap.port() ) );
+    mPop.portEdit->setText( TQString("%1").arg( ap.port() ) );
     mPop.usePipeliningCheck->setChecked( ap.usePipelining() );
     mPop.storePasswordCheck->setChecked( ap.storePasswd() );
     mPop.leaveOnServerCheck->setChecked( ap.leaveOnServer() );
@@ -1256,7 +1256,7 @@ void AccountDialog::setupSettings()
     mImap.loginEdit->setText( ai.login() );
     mImap.passwordEdit->setText( ai.passwd());
     mImap.hostEdit->setText( ai.host() );
-    mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) );
+    mImap.portEdit->setText( TQString("%1").arg( ai.port() ) );
     mImap.autoExpungeCheck->setChecked( ai.autoExpunge() );
     mImap.hiddenFoldersCheck->setChecked( ai.hiddenFolders() );
     mImap.subscribedFoldersCheck->setChecked( ai.onlySubscribedFolders() );
@@ -1309,7 +1309,7 @@ void AccountDialog::setupSettings()
     mImap.loginEdit->setText( ai.login() );
     mImap.passwordEdit->setText( ai.passwd());
     mImap.hostEdit->setText( ai.host() );
-    mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) );
+    mImap.portEdit->setText( TQString("%1").arg( ai.port() ) );
 #if 0
     mImap.resourceCheck->setChecked( ai.resource() );
 #endif
@@ -2293,7 +2293,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
   } else {
     ns = i18n("Shared");
   }
-  setCaption( i18n("Edit Namespace '%1'").tqarg(ns) );
+  setCaption( i18n("Edit Namespace '%1'").arg(ns) );
   TQGrid* grid = new TQGrid( 2, page );
 
   mBg = new TQButtonGroup( 0 );
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index a086292a..0610622f 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -100,7 +100,7 @@ void AccountManager::readConfig(void)
       acctType = "pop";
     acctName = config->readEntry("Name");
     id = config->readUnsignedNumEntry("Id", 0);
-    if (acctName.isEmpty()) acctName = i18n("Account %1").tqarg(i);
+    if (acctName.isEmpty()) acctName = i18n("Account %1").arg(i);
     acct = create(acctType, acctName, id);
     if (!acct) continue;
     add(acct);
@@ -155,7 +155,7 @@ void AccountManager::processNextCheck( bool _newMail )
   if ( mAcctChecking.isEmpty() ) {
     // all checks finished, display summary
     if ( mDisplaySummary )
-      KPIM::BroadcastStatus::instance()->seStatusMsgTransmissionCompleted(
+      KPIM::BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
           mTotalNewMailsArrived );
     emit checkedMail( mNewMailArrived, mInteractive, mTotalNewInFolder );
     mTotalNewMailsArrived = 0;
@@ -183,7 +183,7 @@ void AccountManager::processNextCheck( bool _newMail )
     TQString tmp = i18n("Account %1 has no mailbox defined:\n"
         "mail checking aborted;\n"
         "check your account settings.")
-      .tqarg(curAccount->name());
+      .arg(curAccount->name());
     KMessageBox::information(0,tmp);
     emit checkedMail( false, mInteractive, mTotalNewInFolder );
     mTotalNewMailsArrived = 0;
@@ -222,8 +222,8 @@ void AccountManager::processNextCheck( bool _newMail )
   connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                 this, TQT_SLOT( processNextCheck( bool ) ) );
 
-  KPIM::BroadcastStatus::instance()->seStatusMsg(
-      i18n("Checking account %1 for new mail").tqarg(curAccount->name()));
+  KPIM::BroadcastStatus::instance()->setStatusMsg(
+      i18n("Checking account %1 for new mail").arg(curAccount->name()));
 
   kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl;
 
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 6a188fbb..caafcb35 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -516,7 +516,7 @@ void AccountWizard::checkPopCapabilities( const TQString &server, int port )
   connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ),
            this, TQT_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) );
 
-  mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) );
+  mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
 }
 
 void AccountWizard::checkImapCapabilities( const TQString &server, int port )
@@ -527,7 +527,7 @@ void AccountWizard::checkImapCapabilities( const TQString &server, int port )
   connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ),
            this, TQT_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) );
 
-  mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) );
+  mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
 }
 
 void AccountWizard::checkSmtpCapabilities( const TQString &server, int port )
@@ -540,7 +540,7 @@ void AccountWizard::checkSmtpCapabilities( const TQString &server, int port )
            this, TQT_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&,
                                          const TQString&, const TQString&, const TQString& ) ) );
 
-  mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) );
+  mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
 }
 
 void AccountWizard::popCapabilities( const TQStringList &capaNormalList,
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index f699ff90..215e5451 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -454,7 +454,7 @@ void ActionScheduler::messageFetched( KMMessage *msg )
     serNumS.setNum( msg->getMsgSerNum() );
     KMMessage *newMsg = new KMMessage;
     newMsg->fromString(msg->asString());
-    newMsg->seStatus(msg->status());
+    newMsg->setStatus(msg->status());
     newMsg->setComplete(msg->isComplete());
     newMsg->setHeaderField( "X-KMail-Filtered", serNumS );
     mSrcFolder->addMsg( newMsg );
@@ -625,7 +625,7 @@ void ActionScheduler::actionMessage(KMFilterAction::ReturnCode res)
     if (msg) {
       if ( FilterLog::instance()->isLogging() ) {
         TQString logText( i18n( "<b>Applying filter action:</b> %1" )
-                        .tqarg( mFilterAction->displayString() ) );
+                        .arg( mFilterAction->displayString() ) );
         FilterLog::instance()->add( logText, FilterLog::appliedAction );
       }
       KMFilterAction *action = mFilterAction;
@@ -786,19 +786,19 @@ TQString ActionScheduler::debug()
     TQValueList<ActionScheduler*>::iterator it;
     int i = 1;
     for ( it = schedulerList->begin(); it != schedulerList->end(); ++it ) {
-	res.append( TQString( "ActionScheduler #%1.\n" ).tqarg( i ) );
+	res.append( TQString( "ActionScheduler #%1.\n" ).arg( i ) );
 	if ((*it)->mAccount && kmkernel->find( (*it)->mAccountId )) {
 	    res.append( TQString( "Account %1, Name %2.\n" )
-			.tqarg( (*it)->mAccountId )
-			.tqarg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) );
+			.arg( (*it)->mAccountId )
+			.arg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) );
 	}
-	res.append( TQString( "mExecuting %1, " ).tqarg( (*it)->mExecuting ? "true" : "false" ) );
-	res.append( TQString( "mExecutingLock %1, " ).tqarg( (*it)->mExecutingLock ? "true" : "false" ) );
-	res.append( TQString( "mFetchExecuting %1.\n" ).tqarg( (*it)->mFetchExecuting ? "true" : "false" ) );
-	res.append( TQString( "mOriginalSerNum %1.\n" ).tqarg( (*it)->mOriginalSerNum ) );
-	res.append( TQString( "mMessageIt %1.\n" ).tqarg( ((*it)->mMessageIt != 0) ? *(*it)->mMessageIt : 0 ) );
-	res.append( TQString( "mSerNums count %1, " ).tqarg( (*it)->mSerNums.count() ) );
-	res.append( TQString( "mFetchSerNums count %1.\n" ).tqarg( (*it)->mFetchSerNums.count() ) );
+	res.append( TQString( "mExecuting %1, " ).arg( (*it)->mExecuting ? "true" : "false" ) );
+	res.append( TQString( "mExecutingLock %1, " ).arg( (*it)->mExecutingLock ? "true" : "false" ) );
+	res.append( TQString( "mFetchExecuting %1.\n" ).arg( (*it)->mFetchExecuting ? "true" : "false" ) );
+	res.append( TQString( "mOriginalSerNum %1.\n" ).arg( (*it)->mOriginalSerNum ) );
+	res.append( TQString( "mMessageIt %1.\n" ).arg( ((*it)->mMessageIt != 0) ? *(*it)->mMessageIt : 0 ) );
+	res.append( TQString( "mSerNums count %1, " ).arg( (*it)->mSerNums.count() ) );
+	res.append( TQString( "mFetchSerNums count %1.\n" ).arg( (*it)->mFetchSerNums.count() ) );
 	res.append( TQString( "mResult " ) );
 	if ((*it)->mResult == ResultOk)
 	    res.append( TQString( "ResultOk.\n" ) );
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index 50052995..0cb047fd 100644
--- a/kmail/antispamconfig.cpp
+++ b/kmail/antispamconfig.cpp
@@ -59,7 +59,7 @@ void AntiSpamConfig::readConfig()
   KConfigGroup general( &config, "General" );
   unsigned int totalTools = general.readUnsignedNumEntry( "tools", 0 );
   for ( unsigned int i = 1; i <= totalTools; ++i ) {
-    KConfigGroup tool( &config, TQString("Spamtool #%1").tqarg( i ) );
+    KConfigGroup tool( &config, TQString("Spamtool #%1").arg( i ) );
     if ( tool.hasKey( "ScoreHeader" ) ) {
       TQString name      = tool.readEntry( "ScoreName" );
       TQCString header   = tool.readEntry( "ScoreHeader" ).latin1();
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index e0b40fc6..533ee379 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -495,7 +495,7 @@ void AntiSpamWizard::checkToolAvailability()
   bool found = false;
   for ( TQValueListIterator<SpamToolConfig> it = mToolList.begin();
         it != mToolList.end(); ++it ) {
-    TQString text( i18n("Scanning for %1...").tqarg( (*it).getId() ) );
+    TQString text( i18n("Scanning for %1...").arg( (*it).getId() ) );
     mInfoPage->setScanProgressText( text );
     if ( (*it).isSpamTool() && (*it).isServerBased() ) {
       // check the configured account for pattern in <server>
@@ -702,7 +702,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
   int registeredTools = general.readNumEntry( "tools", 0 );
   for (int i = 1; i <= registeredTools; i++)
   {
-    KConfigGroup toolConfig( mConfig, groupName.tqarg( i ) );
+    KConfigGroup toolConfig( mConfig, groupName.arg( i ) );
     if( !toolConfig.readBoolEntry( "HeadersOnly", false ) )
       mToolList.append( readToolConfig( toolConfig ) );
   }
@@ -714,7 +714,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
   int user_registeredTools = user_general.readNumEntry( "tools", 0 );
   for (int i = 1; i <= user_registeredTools; i++)
   {
-    KConfigGroup toolConfig( mConfig, groupName.tqarg( i ) );
+    KConfigGroup toolConfig( mConfig, groupName.arg( i ) );
     if( !toolConfig.readBoolEntry( "HeadersOnly", false ) )
       mergeToolConfig( readToolConfig( toolConfig ) );
   }
diff --git a/kmail/attachmentcollector.cpp b/kmail/attachmentcollector.cpp
index 688af623..b902f596 100644
--- a/kmail/attachmentcollector.cpp
+++ b/kmail/attachmentcollector.cpp
@@ -65,7 +65,7 @@ void KMail::AttachmentCollector::collectAttachmentsFrom( partNode * node ) {
       continue;
     }
     if ( isInSkipList( node ) ) {
-      node = node->next( false ); // skip even the tqchildren
+      node = node->next( false ); // skip even the children
       continue;
     }
     if ( isInExclusionList( node ) ) {
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index af9a75c3..fd53997b 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
diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h
index 1f236c4a..a436fb44 100644
--- a/kmail/bodyvisitor.h
+++ b/kmail/bodyvisitor.h
@@ -60,7 +60,7 @@ namespace KMail {
 
     protected:
       /** 
-       * Checks if one of the parents needs loaded tqchildren
+       * Checks if one of the parents needs loaded children
        * This is e.g. needed for multipart/signed where all parts have to be loaded 
        */
       static bool parentNeedsLoading( KMMessagePart * part );
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index ec7dece7..5e5232d4 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -234,7 +234,7 @@ void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
 
   KURL url = mAccount->getUrl();
   url.setPath( mFolder->imapPath() +
-               TQString::fromLatin1(";UID=%1").tqarg(uids) );
+               TQString::fromLatin1(";UID=%1").arg(uids) );
 
   KIO::SimpleJob *simpleJob = KIO::file_delete( url, false );
   KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
@@ -311,7 +311,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
       mFolder->addMsgInternal( mMsg, true, &index );
 
       if ( kmkernel->iCalIface().isResourceFolder( mFolder->folder() ) ) {
-        mFolder->seStatus( index, KMMsgStatusRead, false );
+        mFolder->setStatus( index, KMMsgStatusRead, false );
       }
 
       emit messageRetrieved( mMsg );
@@ -341,7 +341,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
   if( mfd.flags > 0 )
     KMFolderImap::flagsToStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX);
   KURL url = mAccount->getUrl();
-  url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").tqarg(mfd.uid));
+  url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").arg(mfd.uid));
 
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.cancellable = true;
@@ -408,10 +408,10 @@ void CachedImapJob::slotPutNextMessage()
   unsigned int i = 0;
   for( char *ch = cstr.data(); *ch; ch++ ) {
     if ( *ch == '\n' ) {
-      mData.tqat(i) = '\r';
+      mData.at(i) = '\r';
       i++;
     }
-    mData.tqat(i) = *ch; i++;
+    mData.at(i) = *ch; i++;
   }
   jd.data = mData;
   jd.msgList.append( mMsg );
@@ -539,7 +539,7 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
 
     if ( job->error() && !silentUpload ) {
       TQString myError = "<p><b>" + i18n("Error while uploading folder")
-        + "</b></p><p>" + i18n("Could not make the folder <b>%1</b> on the server.").tqarg((*it).items[0])
+        + "</b></p><p>" + i18n("Could not make the folder <b>%1</b> on the server.").arg((*it).items[0])
         + "</p><p>" + i18n("This could be because you do not have permission to do this, or because the folder is already present on the server; the error message from the server communication is here:") + "</p>";
       mAccount->handleJobError( job, myError );
     }
@@ -597,8 +597,8 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
     TQDataStream stream( packedArgs, IO_WriteOnly );
 
     const TQString command = TQString( "X-CREATE-SPECIAL" );
-    const TQString argument = TQString( "%1 %2" ).tqarg( Scalix::Utils::contentsTypeToScalixId( folder->contentsType() ) )
-                                               .tqarg( path );
+    const TQString argument = TQString( "%1 %2" ).arg( Scalix::Utils::contentsTypeToScalixId( folder->contentsType() ) )
+                                               .arg( path );
 
     stream << (int) 'X' << 'N' << command << argument;
 
@@ -626,7 +626,7 @@ void CachedImapJob::slotDeleteNextFolder( KIO::Job *job )
     mAccount->removeDeletedFolder( (*it).path );
 
     if( job->error() ) {
-      mAccount->handleJobError( job, i18n( "Error while deleting folder %1 on the server: " ).tqarg( (*it).path ) + '\n' );
+      mAccount->handleJobError( job, i18n( "Error while deleting folder %1 on the server: " ).arg( (*it).path ) + '\n' );
       delete this;
       return;
     }
@@ -679,7 +679,7 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
 
   if( job->error() ) {
     mErrorCode = job->error();
-    mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).parent->label() ) + '\n' );
+    mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).arg( (*it).parent->label() ) + '\n' );
     delete this;
     return;
   }
@@ -813,7 +813,7 @@ void CachedImapJob::slotSubscribtionChange1Failed( const TQString &errorMessage
                                "from the folder list after the next sync since it is unsubscribed on the server.\n"
                                "You can try to manually subscribe to the folder yourself.\n\n"
                                "%2" )
-      .tqarg( mFolder->label() ).tqarg( errorMessage ) );
+      .arg( mFolder->label() ).arg( errorMessage ) );
   delete this;
 }
 
@@ -854,7 +854,7 @@ void CachedImapJob::slotRenameFolderResult( KIO::Job *job )
 
   if( job->error() ) {
     revertLabelChange();
-    const TQString errorMessage = i18n( "Error while trying to rename folder %1" ).tqarg( mFolder->label() );
+    const TQString errorMessage = i18n( "Error while trying to rename folder %1" ).arg( mFolder->label() );
     mAccount->handleJobError( job, errorMessage );
     delete this;
   } else {
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index 0b94a5d1..7a7a583f 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -94,13 +94,13 @@ bool Callback::mailICal( const TQString& to, const TQString &iCal,
   msg->setSubject( subject );
   if ( GlobalSettings::self()->exchangeCompatibleInvitations() ) {
     if ( status == TQString("cancel") )
-      msg->setSubject( i18n( "Declined: %1" ).tqarg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Declined: %1" ).arg(subject).replace("Answer: ","") );
     else if ( status == TQString("tentative") )
-      msg->setSubject( i18n( "Tentative: %1" ).tqarg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Tentative: %1" ).arg(subject).replace("Answer: ","") );
     else if ( status == TQString("accepted") )
-      msg->setSubject( i18n( "Accepted: %1" ).tqarg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Accepted: %1" ).arg(subject).replace("Answer: ","") );
     else if ( status == TQString("delegated") )
-      msg->setSubject( i18n( "Delegated: %1" ).tqarg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Delegated: %1" ).arg(subject).replace("Answer: ","") );
   }
   msg->setTo( to );
   msg->setFrom( receiver() );
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp
index aa563c46..fd89f458 100644
--- a/kmail/compactionjob.cpp
+++ b/kmail/compactionjob.cpp
@@ -96,8 +96,8 @@ int MboxCompactionJob::executeNow( bool silent )
   if (!storage->compactable()) {
     kdDebug(5006) << storage->location() << " compaction skipped." << endl;
     if ( !mSilent ) {
-      TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).tqarg( mbox->label() );
-      BroadcastStatus::instance()->seStatusMsg( str );
+      TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).arg( mbox->label() );
+      BroadcastStatus::instance()->setStatusMsg( str );
     }
     return 0;
   }
@@ -173,11 +173,11 @@ void MboxCompactionJob::done( int rc )
     mbox->close("mboxcompact", true);
     mbox->setAutoCreateIndex( autoCreate );
     mbox->setNeedsCompacting( false );            // We are clean now
-    str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() );
+    str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() );
     kdDebug(5006) << str << endl;
   } else {
     mbox->close("mboxcompact");
-    str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() );
+    str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() );
     kdDebug(5006) << "Error occurred while compacting " << mbox->location() << endl;
     kdDebug(5006) << "Compaction aborted." << endl;
     TQFile::remove( mTempName );
@@ -185,7 +185,7 @@ void MboxCompactionJob::done( int rc )
   mErrorCode = rc;
 
   if ( !mSilent )
-    BroadcastStatus::instance()->seStatusMsg( str );
+    BroadcastStatus::instance()->setStatusMsg( str );
 
   mFolderOpen = false;
   deleteLater(); // later, because of the "return mErrorCode"
@@ -256,9 +256,9 @@ void MaildirCompactionJob::done( int rc )
   mCancellable = false;
   TQString str;
   if ( !rc ) {
-    str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() );
+    str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() );
   } else {
-    str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() );
+    str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() );
   }
   mErrorCode = rc;
   storage->setNeedsCompacting( false );
@@ -266,7 +266,7 @@ void MaildirCompactionJob::done( int rc )
   if ( storage->isOpened() )
     storage->updateIndex();
   if ( !mSilent )
-    BroadcastStatus::instance()->seStatusMsg( str );
+    BroadcastStatus::instance()->setStatusMsg( str );
 
   mFolderOpen = false;
   deleteLater(); // later, because of the "return mErrorCode"
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 6dd25347..538b6205 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -233,9 +233,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
   // the KCMultiDialog starts with the size of the first kcm, not
   // the largest one. This way at least after the first showing of
   // the largest kcm the size is kept.
-  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
-  int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" );
-  int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" );
+  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  int width = geometry.readNumEntry( "ConfigureDialogWidth" );
+  int height = geometry.readNumEntry( "ConfigureDialogHeight" );
   if ( width != 0 && height != 0 ) {
      setMinimumSize( width, height );
   }
@@ -243,9 +243,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
 }
 
 void ConfigureDialog::hideEvent( TQHideEvent *ev ) {
-  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
-  tqgeometry.writeEntry( "ConfigureDialogWidth", width() );
-  tqgeometry.writeEntry( "ConfigureDialogHeight",height() );
+  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  geometry.writeEntry( "ConfigureDialogWidth", width() );
+  geometry.writeEntry( "ConfigureDialogHeight",height() );
   KDialogBase::hideEvent( ev );
 }
 
@@ -451,7 +451,7 @@ void IdentityPage::slotRemoveIdentity()
   if ( !item ) return;
 
   TQString msg = i18n("<qt>Do you really want to remove the identity named "
-                     "<b>%1</b>?</qt>").tqarg( item->identity().identityName() );
+                     "<b>%1</b>?</qt>").arg( item->identity().identityName() );
   if( KMessageBox::warningContinueCancel( this, msg, i18n("Remove Identity"),
    KGuiItem(i18n("&Remove"),"editdelete") ) == KMessageBox::Continue )
     if ( im->removeIdentity( item->identity().identityName() ) ) {
@@ -742,7 +742,7 @@ static inline TQString uniqueName( const TQStringList & list,
   while ( list.find( result ) != list.end() ) {
     result = i18n("%1: name; %2: number appended to it to make it unique "
                   "among a list of names", "%1 %2")
-      .tqarg( name ).tqarg( suffix );
+      .arg( name ).arg( suffix );
     suffix++;
   }
   return result;
@@ -830,7 +830,7 @@ void AccountsPage::SendingTab::slotAddTransport()
                            "Configure->Accounts->Sending listview, \"type\" "
                            "column, first row, to indicate that this is the "
                            "default transport", "%1 (Default)")
-      .tqarg( transportInfo->type );
+      .arg( transportInfo->type );
     GlobalSettings::self()->setDefaultTransport( transportInfo->name );
   }
   (void) new TQListViewItem( mTransportList, lastItem, transportInfo->name,
@@ -1364,7 +1364,7 @@ void AccountsPage::ReceivingTab::slotRemoveSelectedAccount() {
   if ( !acct ) {
     // ### FIXME: see above
     KMessageBox::sorry( this, i18n("<qt>Unable to locate account <b>%1</b>.</qt>")
-                        .tqarg(listItem->text(0)) );
+                        .arg(listItem->text(0)) );
     return;
   }
 
@@ -1444,7 +1444,7 @@ void AccountsPage::ReceivingTab::save() {
     kmkernel->acctMgr()->writeConfig( true );
     if ( (*it) && !kmkernel->acctMgr()->remove(*it) )
       KMessageBox::sorry( this, i18n("<qt>Unable to locate account <b>%1</b>.</qt>")
-                          .tqarg( (*it)->name() ) );
+                          .arg( (*it)->name() ) );
   }
   mAccountsToDelete.clear();
 
@@ -1941,33 +1941,33 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char
 
 void AppearancePage::LayoutTab::doLoadOther() {
   const KConfigGroup reader( KMKernel::config(), "Reader" );
-  const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
 
-  loadWidget( mFolderListGroup, tqgeometry, folderListMode );
+  loadWidget( mFolderListGroup, geometry, folderListMode );
   loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation );
   loadWidget( mMIMETreeModeGroup, reader, mimeTreeMode );
-  loadWidget( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
+  loadWidget( mReaderWindowModeGroup, geometry, readerWindowMode );
   mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() );
 }
 
 void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
   const KConfigGroup reader( profile, "Reader" );
-  const KConfigGroup tqgeometry( profile, "Geometry" );
+  const KConfigGroup geometry( profile, "Geometry" );
 
-  loadProfile( mFolderListGroup, tqgeometry, folderListMode );
+  loadProfile( mFolderListGroup, geometry, folderListMode );
   loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation );
   loadProfile( mMIMETreeModeGroup, reader, mimeTreeMode );
-  loadProfile( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
+  loadProfile( mReaderWindowModeGroup, geometry, readerWindowMode );
 }
 
 void AppearancePage::LayoutTab::save() {
   KConfigGroup reader( KMKernel::config(), "Reader" );
-  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  KConfigGroup geometry( KMKernel::config(), "Geometry" );
 
-  saveButtonGroup( mFolderListGroup, tqgeometry, folderListMode );
+  saveButtonGroup( mFolderListGroup, geometry, folderListMode );
   saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation );
   saveButtonGroup( mMIMETreeModeGroup, reader, mimeTreeMode );
-  saveButtonGroup( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
+  saveButtonGroup( mReaderWindowModeGroup, geometry, readerWindowMode );
   GlobalSettings::self()->setEnableFavoriteFolderView( mFavoriteFolderViewCB->isChecked() );
 }
 
@@ -2058,7 +2058,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
   for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) {
     TQString buttonLabel = i18n(dateDisplayConfig[i].displayName);
     if ( buttonLabel.contains("%1") )
-      buttonLabel = buttonLabel.tqarg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) );
+      buttonLabel = buttonLabel.arg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) );
     radio = new TQRadioButton( buttonLabel, mDateDisplay );
     mDateDisplay->insert( radio, i );
     if ( dateDisplayConfig[i].dateDisplay == DateFormatter::Custom ) {
@@ -2115,16 +2115,16 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 
 void AppearancePage::HeadersTab::doLoadOther() {
   KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  KConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   // "General Options":
-  mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages", false ) );
+  mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) );
   mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize", false ) );
   mCryptoIconsCheck->setChecked( general.readBoolEntry( "showCryptoIcons", false ) );
   mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon", true ) );
 
   // "Message Header Threading Options":
-  int num = tqgeometry.readNumEntry( "nestingPolicy", 3 );
+  int num = geometry.readNumEntry( "nestingPolicy", 3 );
   if ( num < 0 || num > 3 ) num = 3;
   mNestingPolicy->setButton( num );
 
@@ -2152,10 +2152,10 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma
 
 void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
   KConfigGroup general( profile, "General" );
-  KConfigGroup tqgeometry( profile, "Geometry" );
+  KConfigGroup geometry( profile, "Geometry" );
 
-  if ( tqgeometry.hasKey( "nestedMessages" ) )
-    mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages" ) );
+  if ( geometry.hasKey( "nestedMessages" ) )
+    mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) );
   if ( general.hasKey( "showMessageSize" ) )
     mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize" ) );
 
@@ -2164,8 +2164,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
   if ( general.hasKey( "showAttachmentIcon" ) )
     mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon" ) );
 
-  if ( tqgeometry.hasKey( "nestingPolicy" ) ) {
-    int num = tqgeometry.readNumEntry( "nestingPolicy" );
+  if ( geometry.hasKey( "nestingPolicy" ) ) {
+    int num = geometry.readNumEntry( "nestingPolicy" );
     if ( num < 0 || num > 3 ) num = 3;
     mNestingPolicy->setButton( num );
   }
@@ -2177,16 +2177,16 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
 
 void AppearancePage::HeadersTab::save() {
   KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  KConfigGroup geometry( KMKernel::config(), "Geometry" );
 
-  if ( tqgeometry.readBoolEntry( "nestedMessages", false )
+  if ( geometry.readBoolEntry( "nestedMessages", false )
        != mNestedMessagesCheck->isChecked() ) {
     int result = KMessageBox::warningContinueCancel( this,
                    i18n("Changing the global threading setting will override "
                         "all folder specific values."),
                    TQString(), KStdGuiItem::cont(), "threadOverride" );
     if ( result == KMessageBox::Continue ) {
-      tqgeometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() );
+      geometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() );
       // remove all threadMessagesOverride keys from all [Folder-*] groups:
       TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") );
       kdDebug(5006) << "groups.count() == " << groups.count() << endl;
@@ -2197,7 +2197,7 @@ void AppearancePage::HeadersTab::save() {
     }
   }
 
-  tqgeometry.writeEntry( "nestingPolicy",
+  geometry.writeEntry( "nestingPolicy",
                        mNestingPolicy->id( mNestingPolicy->selected() ) );
   general.writeEntry( "showMessageSize", mMessageSizeCheck->isChecked() );
   general.writeEntry( "showCryptoIcons", mCryptoIconsCheck->isChecked() );
@@ -3304,7 +3304,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
 
   if ( charset.lower() == TQString::fromLatin1("locale") ) {
     charset =  TQString::fromLatin1("%1 (locale)")
-      .tqarg( TQString( kmkernel->networkCodec()->mimeName() ).lower() );
+      .arg( TQString( kmkernel->networkCodec()->mimeName() ).lower() );
     return;
   }
 
@@ -3328,7 +3328,7 @@ void ComposerPage::CharsetTab::doLoadOther() {
     if ( (*it) == TQString::fromLatin1("locale") ) {
       TQCString cset = kmkernel->networkCodec()->mimeName();
       KPIM::kAsciiToLower( cset.data() );
-      (*it) = TQString("%1 (locale)").tqarg( TQString(cset) );
+      (*it) = TQString("%1 (locale)").arg( TQString(cset) );
     }
 
   mCharsetListEditor->setStringList( charsets );
@@ -3815,7 +3815,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
                            "exploits. <a href=\"whatsthis:%1\">More about "
                            "HTML mails...</a> <a href=\"whatsthis:%2\">More "
                            "about external references...</a>")
-                           .tqarg(htmlWhatsThis).tqarg(externalWhatsThis),
+                           .arg(htmlWhatsThis).arg(externalWhatsThis),
                            group );
 
   vlay->addWidget( group );
@@ -3890,7 +3890,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
   label = new KActiveLabel( i18n("<b>WARNING:</b> Unconditionally returning "
                            "confirmations undermines your privacy. "
                            "<a href=\"whatsthis:%1\">More...</a>")
-                             .tqarg(receiptWhatsThis),
+                             .arg(receiptWhatsThis),
                            group );
 
   vlay->addWidget( group );
@@ -4358,7 +4358,7 @@ void SecurityPage::SMimeTab::doLoadOther() {
     TQString systemProxy = TQString::fromLocal8Bit( getenv( "http_proxy" ) );
     if ( systemProxy.isEmpty() )
       systemProxy = i18n( "no proxy" );
-    mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).tqarg( systemProxy ) );
+    mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).arg( systemProxy ) );
     bool honor = e.mHonorHTTPProxy && e.mHonorHTTPProxy->boolValue();
     mWidget->honorHTTPProxyRB->setChecked( honor );
     mWidget->useCustomHTTPProxyRB->setChecked( !honor );
@@ -4482,11 +4482,11 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp
 {
     Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName );
     if ( !entry ) {
-        kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) << endl;
+        kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) << endl;
         return 0;
     }
     if( entry->argType() != argType || entry->isList() != isList ) {
-        kdWarning(5006) << TQString( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) << endl;
+        kdWarning(5006) << TQString( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) << endl;
         return 0;
     }
     return entry;
@@ -5135,7 +5135,7 @@ void MiscPage::GroupwareTab::save() {
     // Inbox folder of the selected account
     KMAccount* acct = mAccountCombo->currentAccount();
     if (  acct ) {
-      folderId = TQString( ".%1.directory/INBOX" ).tqarg( acct->id() );
+      folderId = TQString( ".%1.directory/INBOX" ).arg( acct->id() );
       GlobalSettings::self()->setTheIMAPResourceAccount( acct->id() );
     }
   }
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index ccc0230b..93f6123c 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -225,7 +225,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
     if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) {
       // not found:
       TQString displayname = TQString::fromLatin1("%1 (%2)")
-	.tqarg( name ).tqarg( acronym );
+	.arg( name ).arg( acronym );
       TQPixmap flag( locate("locale", acronym + flagPng ) );
       mComboBox->insertItem( flag, displayname );
     }
@@ -255,7 +255,7 @@ int LanguageComboBox::insertLanguage( const TQString & language )
   KSimpleConfig entry( locate("locale", language + entryDesktop) );
   entry.setGroup( "KCM Locale" );
   TQString name = entry.readEntry( "Name" );
-  TQString output = TQString::fromLatin1("%1 (%2)").tqarg( name ).tqarg( language );
+  TQString output = TQString::fromLatin1("%1 (%2)").arg( name ).arg( language );
   insertItem( TQPixmap( locate("locale", language + flagPng ) ), output );
   return listBox()->index( listBox()->findItem(output) );
 }
@@ -269,7 +269,7 @@ TQString LanguageComboBox::language() const
 
 void LanguageComboBox::setLanguage( const TQString & language )
 {
-  TQString parenthizedLanguage = TQString::fromLatin1("(%1)").tqarg( language );
+  TQString parenthizedLanguage = TQString::fromLatin1("(%1)").arg( language );
   for (int i = 0; i < count(); i++)
     // ### FIXME: use .endWith():
     if ( text(i).find( parenthizedLanguage ) >= 0 ) {
diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp
index 9be07213..a83b1cd6 100644
--- a/kmail/copyfolderjob.cpp
+++ b/kmail/copyfolderjob.cpp
@@ -67,7 +67,7 @@ CopyFolderJob::~CopyFolderJob()
 
 /*
  * The basic strategy is to first create the target folder, then copy all the mail
- * from the source to the target folder, then recurse for each of the folder's tqchildren
+ * from the source to the target folder, then recurse for each of the folder's children
  */
 void CopyFolderJob::execute()
 {
@@ -113,7 +113,7 @@ void CopyFolderJob::slotCopyCompleted( KMCommand* command )
     rollback();
     return;
   }
-  // if we have tqchildren, recurse
+  // if we have children, recurse
   if ( mStorage->folder()->child() ) {
     slotCopyNextChild();
   } else {
@@ -144,7 +144,7 @@ void CopyFolderJob::slotCopyNextChild( bool success )
     mNextChildFolder = static_cast<KMFolder*>(node);
     ++mChildFolderNodeIterator;
   } else {
-    // no more tqchildren, we are done
+    // no more children, we are done
     emit folderCopyComplete( true );
     deleteLater();
     return;
diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp
index 86166dbc..3fe2fd78 100644
--- a/kmail/csshelper.cpp
+++ b/kmail/csshelper.cpp
@@ -77,7 +77,7 @@ namespace KMail {
       TQFont defaultFont = mBodyFont;
       defaultFont.setItalic( true );
       for ( int i = 0 ; i < 3 ; ++i ) {
-        const TQString key = TQString( "quote%1-font" ).tqarg( i+1 );
+        const TQString key = TQString( "quote%1-font" ).arg( i+1 );
         mQuoteFont[i] = fonts.readFontEntry( key, &defaultFont );
       }
     }
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index 279c71ae..6a0a7f4c 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -117,7 +117,7 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name )
             "<i>Universal</i> which can be used for all kind of operations. "
             "You cannot bind keyboard shortcut to <i>Universal</i> templates.</p>"
             "</qt>" );
-  mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg( help ) );
+  mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg( help ) );
 
   const TQString toToolTip = i18n( "Additional recipients of the message when forwarding" );
   const TQString ccToolTip = i18n( "Additional recipients who get a copy of the message when forwarding" );
diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui
index c72ccec0..73300edd 100644
--- a/kmail/customtemplates_base.ui
+++ b/kmail/customtemplates_base.ui
@@ -260,7 +260,7 @@
                             <property name="text">
                                 <string>Shortc&amp;ut:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -282,7 +282,7 @@
                             <property name="text">
                                 <string>&amp;Template type:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 26f720ad..5dcb81d2 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -196,7 +196,7 @@ void DistributionListDialog::slotUser1()
 #endif
     KMessageBox::information( this,
       i18n( "<qt>Distribution list with the given name <b>%1</b> "
-        "already exists. Please select a different name.</qt>" ).tqarg( name ) );
+        "already exists. Please select a different name.</qt>" ).arg( name ) );
     return;
   }
 
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();
 }
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index e1689a9a..6715f486 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -253,7 +253,7 @@ void FavoriteFolderView::itemClicked(TQListViewItem * item)
   if ( !item ) return;
   if ( !item->isSelected() )
     item->setSelected( true );
-  item->tqrepaint();
+  item->repaint();
   handleGroupwareFolder( static_cast<KMFolderTreeItem*>( item ) );
 }
 
@@ -267,11 +267,11 @@ void FavoriteFolderView::folderTreeSelectionChanged(KMFolder * folder)
       fti->setSelected( true );
       setCurrentItem( fti );
       ensureItemVisible( fti );
-      fti->tqrepaint();
+      fti->repaint();
       found = true;
     } else if ( fti->folder() != folder && fti->isSelected() ) {
       fti->setSelected( false );
-      fti->tqrepaint();
+      fti->repaint();
     }
   }
   blockSignals( false );
@@ -405,13 +405,13 @@ TQString FavoriteFolderView::prettyName(KMFolderTreeItem * fti)
     if ( fti->protocol() == KFolderTreeItem::Local || fti->protocol() == KFolderTreeItem::NONE ) {
       name = i18n( "Local Inbox" );
     } else {
-      name = i18n( "Inbox of %1" ).tqarg( accountFti->text( 0 ) );
+      name = i18n( "Inbox of %1" ).arg( accountFti->text( 0 ) );
     }
   } else {
     if ( fti->protocol() != KFolderTreeItem::Local && fti->protocol() != KFolderTreeItem::NONE ) {
-      name = i18n( "%1 on %2" ).tqarg( fti->text( 0 ) ).tqarg( accountFti->text( 0 ) );
+      name = i18n( "%1 on %2" ).arg( fti->text( 0 ) ).arg( accountFti->text( 0 ) );
     } else {
-      name = i18n( "%1 (local)" ).tqarg( fti->text( 0 ) );
+      name = i18n( "%1 (local)" ).arg( fti->text( 0 ) );
     }
   }
   return name;
@@ -524,7 +524,7 @@ void FavoriteFolderView::refresh()
     KMFolderTreeItem* fti = static_cast<KMFolderTreeItem*>(it.current());
     if (!fti || !fti->folder())
       continue;
-    fti->tqrepaint();
+    fti->repaint();
   }
   update();
 }
diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp
index 33bfa8d3..fef3b89c 100644
--- a/kmail/filterlogdlg.cpp
+++ b/kmail/filterlogdlg.cpp
@@ -257,7 +257,7 @@ void FilterLogDialog::slotUser2()
       KMessageBox::error( this,
                           i18n( "Could not write the file %1:\n"
                                 "\"%2\" is the detailed error description." )
-                          .tqarg( fileName,
+                          .arg( fileName,
                                 TQString::fromLocal8Bit( strerror( errno ) ) ),
                           i18n( "KMail Error" ) );
     }
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 63b67ffc..b6c3e2c1 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -244,7 +244,7 @@ static TQString permissionsToUserString( unsigned int permissions, const TQStrin
   if ( internalRightsList.isEmpty() )
     return i18n( "Custom Permissions" ); // not very helpful, but shouldn't happen
   else
-    return i18n( "Custom Permissions (%1)" ).tqarg( internalRightsList );
+    return i18n( "Custom Permissions (%1)" ).arg( internalRightsList );
 }
 
 void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissions )
@@ -453,7 +453,7 @@ void KMail::FolderDiaACLTab::load()
   KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
   if ( folder && folder->storage() == mImapAccount->rootFolder() )
     return; // nothing to be done for the (virtual) account folder
-  mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) );
+  mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) );
   ImapAccountBase::ConnectionState state = mImapAccount->makeConnection();
   if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
     slotConnectionResult( -1, TQString() );
@@ -471,7 +471,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString
               this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
   if ( errorCode ) {
     if ( errorCode == -1 ) // unspecified error
-      mLabel->setText( i18n( "Error connecting to server %1" ).tqarg( mImapAccount->host() ) );
+      mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
     else
       // Connection error (error message box already shown by the account)
       mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) );
@@ -521,7 +521,7 @@ void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, c
       if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
         mLabel->setText( i18n( "This IMAP server does not have support for access control lists (ACL)" ) );
       else
-        mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).tqarg( job->errorString() ) );
+        mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).arg( job->errorString() ) );
       return;
     }
 
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 7c133bb8..133a2b1a 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -117,7 +117,7 @@ void KMail::FolderDiaQuotaTab::load()
   KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
   if ( folder && folder->storage() == mImapAccount->rootFolder() )
     return; // nothing to be done for the (virtual) account folder
-  mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) );
+  mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) );
   ImapAccountBase::ConnectionState state = mImapAccount->makeConnection();
   if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
     slotConnectionResult( -1, TQString() );
@@ -136,7 +136,7 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri
               this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
   if ( errorCode ) {
     if ( errorCode == -1 )  // unspecified error
-      mLabel->setText( i18n( "Error connecting to server %1" ).tqarg( mImapAccount->host() ) );
+      mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
     else
       // Connection error (error message box already shown by the account)
       mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) );
@@ -162,7 +162,7 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder,
       if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
         mLabel->setText( i18n( "This account does not have support for quota information." ) );
       else
-        mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).tqarg( job->errorString() ) );
+        mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).arg( job->errorString() ) );
     } else {
       mQuotaInfo = info;
     }
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index 242037b9..ca6271c8 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -104,7 +104,7 @@ void FolderRequester::setFolder( const TQString &idString )
     setFolder( folder );
   } else {
     if ( !idString.isEmpty() ) {
-      edit->setText( i18n( "Unknown folder '%1'" ).tqarg( idString ) );
+      edit->setText( i18n( "Unknown folder '%1'" ).arg( idString ) );
     } else {
       edit->setText( i18n( "Please select a folder" ) );
     }
diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp
index 9095a647..770b6cfc 100644
--- a/kmail/foldershortcutdialog.cpp
+++ b/kmail/foldershortcutdialog.cpp
@@ -56,7 +56,7 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder,
                                             TQWidget *parent,
                                             const char *name )
 :  KDialogBase( parent, name, true,
-               i18n( "Shortcut for Folder %1" ).tqarg( folder->label() ),
+               i18n( "Shortcut for Folder %1" ).arg( folder->label() ),
                KDialogBase::Ok | KDialogBase::Cancel ),
    mFolder( folder ), mMainWidget( mainwidget )
 {
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 57241cd4..bfc36b70 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -174,7 +174,7 @@ void FolderStorage::markNewAsUnread()
     if (!(msgBase = getMsgBase(i))) continue;
     if (msgBase->isNew())
     {
-      msgBase->seStatus(KMMsgStatusUnread);
+      msgBase->setStatus(KMMsgStatusUnread);
       msgBase->setDirty(true);
     }
   }
@@ -503,7 +503,7 @@ KMMessage* FolderStorage::getMsg(int idx)
         kdDebug(5006) << "Error: " << location() <<
           " Index file is inconsistent with folder file. This should never happen." << endl;
 
-        // We can't recreate the index at this point, since that would tqinvalidate the current
+        // We can't recreate the index at this point, since that would invalidate the current
         // message list and delete KMMsgBase or KMMessage objects that are in use.
         // Do it later in KMFolderIndex::readIndexHeader() instead.
         mCompactable = false; // Don't compact
@@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle)
+void FolderStorage::setStatus(int idx, KMMsgStatus status, bool toggle)
 {
   KMMsgBase *msg = getMsgBase(idx);
   if ( msg ) {
     if (toggle)
       msg->toggleStatus(status, idx);
     else
-      msg->seStatus(status, idx);
+      msg->setStatus(status, idx);
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void FolderStorage::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
+void FolderStorage::setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
 {
   for ( TQValueList<int>::Iterator it = ids.begin(); it != ids.end(); ++it )
   {
-    FolderStorage::seStatus(*it, status, toggle);
+    FolderStorage::setStatus(*it, status, toggle);
   }
 }
 
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index 390675a2..3aeefbc4 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -71,7 +71,7 @@ typedef TQValueList<TQ_UINT32> SerNumList;
  *
  * @section Accounts
  *   The accounts (of KMail) that are fed into the folder are
- *   represented as the tqchildren of the folder. They are only stored here
+ *   represented as the children of the folder. They are only stored here
  *   during runtime to have a reference for which accounts point to a
  *   specific folder.
  */
@@ -109,10 +109,10 @@ public:
   /** Specify, that the folder can't contain mails. */
   virtual void setNoContent(bool aNoContent);
 
-  /** Returns, if the folder can't have tqchildren */
+  /** Returns, if the folder can't have children */
   virtual bool noChildren() const { return mNoChildren; }
 
-  /** Specify, that the folder can't have tqchildren */
+  /** Specify, that the folder can't have children */
   virtual void setNoChildren( bool aNoChildren );
 
   enum ChildrenState {
@@ -120,11 +120,11 @@ public:
     HasNoChildren,
     ChildrenUnknown
   };
-  /** Returns if the folder has tqchildren,
-   *  has no tqchildren or we don't know */
+  /** Returns if the folder has children,
+   *  has no children or we don't know */
   virtual ChildrenState hasChildren() const { return mHasChildren; }
 
-  /** Specify if the folder has tqchildren */
+  /** Specify if the folder has children */
   virtual void setHasChildren( ChildrenState state )
     { mHasChildren = state; }
 
@@ -245,7 +245,7 @@ public:
    * be reflected in the UI.  */
   virtual bool isCloseToQuota() const;
 
-  /** Called by KMMsgBase::seStatus when status of a message has changed
+  /** Called by KMMsgBase::setStatus when status of a message has changed
       required to keep the number unread messages variable current. */
   virtual void msgStatusChanged( const KMMsgStatus oldStatus,
                                  const KMMsgStatus newStatus,
@@ -364,10 +364,10 @@ public:
   void deregisterFromMessageDict();
 
   /** Set the status of the message at index @p idx to @p status. */
-  virtual void seStatus(int idx, KMMsgStatus status, bool toggle=false);
+  virtual void setStatus(int idx, KMMsgStatus status, bool toggle=false);
 
   /** Set the status of the message(s) in the TQValueList @p ids to @p status. */
-  virtual void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
+  virtual void setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
 
   void removeJobs();
 
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 8557388a..68c881f0 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -179,10 +179,10 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
   }
 
   // set it
-  bool tqrepaint = false;
+  bool repaint = false;
   if (fti->unreadCount() != count) {
      fti->adjustUnreadCount( count );
-     tqrepaint = true;
+     repaint = true;
   }
   if (isTotalActive() || force)
   {
@@ -196,7 +196,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
     // set it
     if ( count != fti->totalCount() ) {
       fti->setTotalCount(count);
-      tqrepaint = true;
+      repaint = true;
     }
   }
   if ( isSizeActive() || force ) {
@@ -204,7 +204,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
       TQ_INT64 size = folder->storage()->folderSize();
       if ( size != fti->folderSize() ) {
         fti->setFolderSize( size );
-        tqrepaint = true;
+        repaint = true;
       }
     }
   }
@@ -213,8 +213,8 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
   }
 
   if (fti->parent() && !fti->parent()->isOpen())
-    tqrepaint = false; // we're not visible
-  if (tqrepaint) {
+    repaint = false; // we're not visible
+  if (repaint) {
     fti->setNeedsRepaint( true );
     emit triggerRefresh();
   }
diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp
index 40b543be..0c2554dc 100644
--- a/kmail/folderutil.cpp
+++ b/kmail/folderutil.cpp
@@ -92,7 +92,7 @@ void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *parent
       KMessageBox::information(parent,
           i18n("<qt>The folder you deleted was associated with the account "
             "<b>%1</b> which delivered mail into it. The folder the account "
-            "delivers new mail into was reset to the main Inbox folder.</qt>").tqarg( (*it)->name()));
+            "delivers new mail into was reset to the main Inbox folder.</qt>").arg( (*it)->name()));
     }
   }
   if (folderToDelete->folderType() == KMFolderTypeImap)
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index 096d2276..dfc3bbba 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -32,15 +32,15 @@ class FolderViewToolTip : public TQToolTip
       
       item->updateCount();
       TQString tipText = i18n("<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4" )
-          .tqarg( item->folder()->prettyURL().replace( " ", "&nbsp;" ) )
-          .tqarg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) )
-          .tqarg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) )
-          .tqarg( KIO::convertSize( item->folderSize() ) );
+          .arg( item->folder()->prettyURL().replace( " ", "&nbsp;" ) )
+          .arg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) )
+          .arg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) )
+          .arg( KIO::convertSize( item->folderSize() ) );
       
       if ( KMFolderCachedImap* imap = dynamic_cast<KMFolderCachedImap*>( item->folder()->storage() ) ) {
           QuotaInfo info = imap->quotaInfo();
           if ( info.isValid() && !info.isEmpty() )
-              tipText += i18n("<br>Quota: %1").tqarg( info.toString() );
+              tipText += i18n("<br>Quota: %1").arg( info.toString() );
       }
       
       tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ), tipText );
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 14d46732..7decd39f 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -145,7 +145,7 @@ TQ_UINT32 HeaderItem::msgSerNum() const
 
 // Update this item to summarise a new folder and message
 
-//Opens all tqchildren in the thread
+//Opens all children in the thread
 void HeaderItem::setOpenRecursive( bool open )
 {
   if (open){
@@ -458,7 +458,7 @@ TQString HeaderItem::generate_key( KMHeaders *headers,
 
   int column = sortOrder & ((1 << 5) - 1);
   TQString ret = TQChar( (char)sortOrder );
-  TQString sortArrival = TQString( "%1" ).tqarg( msg->getMsgSerNum(), 0, 36 );
+  TQString sortArrival = TQString( "%1" ).arg( msg->getMsgSerNum(), 0, 36 );
   while (sortArrival.length() < 7) sortArrival = '0' + sortArrival;
 
   if (column == paintInfo->dateCol) {
diff --git a/kmail/headeritem.h b/kmail/headeritem.h
index 2142cf71..34dee4de 100644
--- a/kmail/headeritem.h
+++ b/kmail/headeritem.h
@@ -80,20 +80,20 @@ public:
     /** Returns whether the item has other items below it. */
     bool hasChildren() const
         { return mSortedChildren.count() || mUnsortedCount; }
-    /** The sorted tqchildren are an array of sortcache items we know are below the
+    /** The sorted children are an array of sortcache items we know are below the
      * current one and are already properly sorted (as read from the cache ) */
     const TQPtrList<SortCacheItem> *sortedChildren() const
         { return &mSortedChildren; }
-    /** The unsorted tqchildren are an array of sortcache items we know are below the
+    /** The unsorted children are an array of sortcache items we know are below the
      * current one, but are yet to be threaded and sorted properly. */
     SortCacheItem **unsortedChildren(int &count) const
         { count = mUnsortedCount; return mUnsortedChildren; }
-    /** Add an item to this itme's list of already sorted tqchildren. */
+    /** Add an item to this itme's list of already sorted children. */
     void addSortedChild(SortCacheItem *i) {
         i->mParent = this;
         mSortedChildren.append(i);
     }
-    /** Add an item to this itme's list of unsorted tqchildren. */
+    /** Add an item to this itme's list of unsorted children. */
     void addUnsortedChild(SortCacheItem *i) {
         i->mParent = this;
         if(!mUnsortedChildren)
@@ -104,7 +104,7 @@ public:
         mUnsortedChildren[mUnsortedCount++] = i;
     }
 
-    /** Clear the sorted and unsorted tqchildren datastructures. */
+    /** Clear the sorted and unsorted children datastructures. */
     void clearChildren() {
       mSortedChildren.clear();
       free( mUnsortedChildren );
@@ -185,7 +185,7 @@ public:
   // Return the serial number of the message associated with this item;
   TQ_UINT32 msgSerNum() const;
 
-  /** Expands all tqchildren of the list view item. */
+  /** Expands all children of the list view item. */
   void setOpenRecursive( bool open );
 
   /** Returns the text of the list view item. */
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index 405f802b..ab3ae936 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -82,10 +82,10 @@ namespace KMail {
   static TQString convertToHtmlBlock( const TQString & str, bool useSpan=false ) {
     TQString dir = directionOf( str );
     TQString format = "<%1 dir=\"%3\">%4</%2>";
-    return format.tqarg( useSpan ? "span" : "div" )
-                 .tqarg( useSpan ? "span" : "div" )
-                 .tqarg( dir )
-                 .tqarg( LinkLocator::convertToHtml( str ) );
+    return format.arg( useSpan ? "span" : "div" )
+                 .arg( useSpan ? "span" : "div" )
+                 .arg( dir )
+                 .arg( LinkLocator::convertToHtml( str ) );
   }
 #endif
 
@@ -262,13 +262,13 @@ namespace KMail {
       return headerStr + "</div>";
     }
 
-    headerStr = TQString("<div class=\"header\" dir=\"%1\">").tqarg(dir);
+    headerStr = TQString("<div class=\"header\" dir=\"%1\">").arg(dir);
 
     //case HdrLong:
     if ( strategy->showHeader( "subject" ) )
       headerStr += TQString("<div dir=\"%1\"><b style=\"font-size:130%\">" +
                            strToHtml(message->subject()) + "</b></div>\n")
-                        .tqarg(subjectDir);
+                        .arg(subjectDir);
 
     if ( strategy->showHeader( "date" ) )
       headerStr.append(i18n("Date: ") + strToHtml(dateString)+"<br>\n");
@@ -408,9 +408,9 @@ namespace KMail {
       }
     }
     TQString titleText = i18n("%1% probability of being spam.\n\nFull report:\n%2")
-                     .tqarg( TQString::number( percent ), filterHeader );
+                     .arg( TQString::number( percent ), filterHeader );
     return TQString("<img src=\"%1\" width=\"%2\" height=\"%3\" style=\"border: 1px solid black;\" title=\"%4\"> &nbsp;")
-      .tqarg( imgToDataUrl( meterBar, "PPM" ), TQString::number( 20 ),
+      .arg( imgToDataUrl( meterBar, "PPM" ), TQString::number( 20 ),
             TQString::number( 5 ), titleText );
   }
 
@@ -430,7 +430,7 @@ namespace KMail {
     // of the application tqlayout.
 
     TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
-    TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").tqarg(dir);
+    TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").arg(dir);
 
     // However, the direction of the message subject within the header is
     // determined according to the contents of the subject itself. Since
@@ -494,7 +494,7 @@ namespace KMail {
           if ( !presence.isEmpty() )
           {
             TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" )
-                .tqarg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
+                .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
             presence += presenceIcon;
           }
       }
@@ -585,26 +585,26 @@ namespace KMail {
     {
         //kdDebug( 5006 ) << "Got a photo: " << photoURL << endl;
       userHTML = TQString("<img src=\"%1\" width=\"%2\" height=\"%3\">")
-          .tqarg( photoURL ).tqarg( photoWidth ).tqarg( photoHeight );
+          .arg( photoURL ).arg( photoWidth ).arg( photoHeight );
       if ( presence.isEmpty() ) {
         userHTML = TQString("<div class=\"senderpic\">") + userHTML + "</div>";
       } else {
         userHTML = TQString( "<div class=\"senderpic\">"
             "<a href=\"im:%1\">%2<div class=\"senderstatus\">"
             "<span name=\"presence-%3\">%4</span></div></a>"
-            "</div>" ).tqarg( kabcUid )
-            .tqarg( userHTML )
-             .tqarg( kabcUid )
-            .tqarg( presence );
+            "</div>" ).arg( kabcUid )
+            .arg( userHTML )
+             .arg( kabcUid )
+            .arg( presence );
       }
     } else {
        // we don't have a photo, just show presence, if we have it
       if ( !presence.isEmpty() )
         userHTML = TQString( "<a href=\"im:%1\"><div class=\"senderstatus\">"
             "<span name=\"presence-%2\">%3</span></div></a>" )
-            .tqarg( kabcUid )
-            .tqarg( kabcUid )
-            .tqarg( presence );
+            .arg( kabcUid )
+            .arg( kabcUid )
+            .arg( presence );
     }
 #if 0
     // Disabled 'Launch IM' link in headers - Will
@@ -719,12 +719,12 @@ namespace KMail {
 				  "margin: 0px 0px 3px 0px;"
 				  "\" class=\"curtime\">%4<br />%5<br />%6</div>"
 				  )
-				  .tqarg( bg_color )
-				  .tqarg( color )
-				  .tqarg( bg_image )
-				  .tqarg( i18n( "Now:" ) )
-				  .tqarg( currTime.toString( tformat ) )
-				  .tqarg( timeofday )
+				  .arg( bg_color )
+				  .arg( color )
+				  .arg( bg_image )
+				  .arg( i18n( "Now:" ) )
+				  .arg( currTime.toString( tformat ) )
+				  .arg( timeofday )
 				  );
 			}
 			else {
@@ -739,8 +739,8 @@ namespace KMail {
                         ( GlobalSettings::self()->showEmoticons() ?
                           LinkLocator::ReplaceSmileys : 0 );
       headerStr += TQString("<div dir=\"%1\">%2</div>\n")
-                        .tqarg(subjectDir)
-                        .tqarg(message->subject().isEmpty()?
+                        .arg(subjectDir)
+                        .arg(message->subject().isEmpty()?
                              i18n("No Subject") :
                              strToHtml( message->subject(), flags ));
     }
@@ -755,11 +755,11 @@ namespace KMail {
         fromStr = message->fromStrip(); // let's use that
       headerStr += TQString("<tr><th>%1</th>\n"
                            "<td>")
-                           .tqarg(i18n("From: "))
+                           .arg(i18n("From: "))
                  + KMMessage::emailAddrAsAnchor( fromStr, false )
                  + ( !message->headerField( "Resent-From" ).isEmpty() ? "&nbsp;"
                                 + i18n("(resent from %1)")
-                                  .tqarg( KMMessage::emailAddrAsAnchor(
+                                  .arg( KMMessage::emailAddrAsAnchor(
                                     message->headerField( "Resent-From" ),false) )
                               : TQString("") )
                  + ( !vCardName.isEmpty() ? "&nbsp;&nbsp;<a href=\"" + vCardName + "\">"
@@ -781,37 +781,37 @@ namespace KMail {
     if ( strategy->showHeader( "to" ) )
       headerStr.append(TQString("<tr><th>%1</th>\n"
                                "<td>%2</td></tr>\n")
-                       .tqarg(i18n("To: "))
-                       .tqarg(KMMessage::emailAddrAsAnchor(message->to(),false)));
+                       .arg(i18n("To: "))
+                       .arg(KMMessage::emailAddrAsAnchor(message->to(),false)));
 
     // cc line, if any
     if ( strategy->showHeader( "cc" ) && !message->cc().isEmpty())
       headerStr.append(TQString("<tr><th>%1</th>\n"
                                "<td>%2</td></tr>\n")
-                       .tqarg(i18n("CC: "))
-                       .tqarg(KMMessage::emailAddrAsAnchor(message->cc(),false)));
+                       .arg(i18n("CC: "))
+                       .arg(KMMessage::emailAddrAsAnchor(message->cc(),false)));
 
     // Bcc line, if any
     if ( strategy->showHeader( "bcc" ) && !message->bcc().isEmpty())
       headerStr.append(TQString("<tr><th>%1</th>\n"
                                "<td>%2</td></tr>\n")
-                       .tqarg(i18n("BCC: "))
-                       .tqarg(KMMessage::emailAddrAsAnchor(message->bcc(),false)));
+                       .arg(i18n("BCC: "))
+                       .arg(KMMessage::emailAddrAsAnchor(message->bcc(),false)));
 
     if ( strategy->showHeader( "date" ) )
       headerStr.append(TQString("<tr><th>%1</th>\n"
                                "<td dir=\"%2\">%3</td></tr>\n")
-                       .tqarg(i18n("Date: "))
-                       .tqarg( directionOf( message->dateStr() ) )
-                       .tqarg(strToHtml(dateString)));
+                       .arg(i18n("Date: "))
+                       .arg( directionOf( message->dateStr() ) )
+                       .arg(strToHtml(dateString)));
 
     if ( GlobalSettings::self()->showUserAgent() ) {
       if ( strategy->showHeader( "user-agent" ) ) {
         if ( !message->headerField("User-Agent").isEmpty() ) {
           headerStr.append(TQString("<tr><th>%1</th>\n"
                                    "<td>%2</td></tr>\n")
-                           .tqarg(i18n("User-Agent: "))
-                           .tqarg( strToHtml( message->headerField("User-Agent") ) ) );
+                           .arg(i18n("User-Agent: "))
+                           .arg( strToHtml( message->headerField("User-Agent") ) ) );
         }
       }
 
@@ -819,8 +819,8 @@ namespace KMail {
         if ( !message->headerField("X-Mailer").isEmpty() ) {
           headerStr.append(TQString("<tr><th>%1</th>\n"
                                    "<td>%2</td></tr>\n")
-                           .tqarg(i18n("X-Mailer: "))
-                           .tqarg( strToHtml( message->headerField("X-Mailer") ) ) );
+                           .arg(i18n("X-Mailer: "))
+                           .arg( strToHtml( message->headerField("X-Mailer") ) ) );
         }
       }
     }
@@ -829,19 +829,19 @@ namespace KMail {
     /*    if( strategy->showHeader( "status" ) )
       headerStr.append( TQString( "<tr><th>%1</th>\n"
                                  "<td dir=\"%2\">%3</td></tr>\n")
-                                    .tqarg(i18n("Sender status: "))
-                                    .tqarg( directionOf( onlineStatus ) )
-                                    .tqarg(onlineStatus));
+                                    .arg(i18n("Sender status: "))
+                                    .arg( directionOf( onlineStatus ) )
+                                    .arg(onlineStatus));
     */
     headerStr.append( TQString("<tr><td colspan=\"2\"><div id=\"attachmentInjectionPoint\"></div></td></tr>" ) );
     headerStr.append(
           TQString( "</table></td><td align=\"center\" valign=\"top\">%1%2</td></tr></table>\n" )
-          .tqarg(timeHTML)
-          .tqarg(userHTML) );
+          .arg(timeHTML)
+          .arg(userHTML) );
 
     if ( !spamHTML.isEmpty() )
       headerStr.append( TQString( "<div class=\"spamheader\" dir=\"%1\"><b>%2</b>&nbsp;<span style=\"padding-left: 20px;\">%3</span></div>\n")
-                        .tqarg( subjectDir, i18n("Spam Status:"), spamHTML ) );
+                        .arg( subjectDir, i18n("Spam Status:"), spamHTML ) );
 
     headerStr += "</div>\n\n";
     return headerStr;
@@ -854,7 +854,7 @@ namespace KMail {
     buffer.open( IO_WriteOnly );
     image.save( &buffer, fmt );
     return TQString::fromLatin1("data:image/%1;base64,%2")
-           .tqarg( fmt, KCodecs::base64Encode( ba ).data() );
+           .arg( fmt, KCodecs::base64Encode( ba ).data() );
   }
 
 // #####################
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index f32c014a..c2455264 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -434,9 +434,9 @@ namespace KMail {
     mXFaceConfigurator->tqlayout()->setMargin( KDialog::marginHint() );
     tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") );
 
-    KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
-    if ( tqgeometry.hasKey( "Identity Dialog size" ) )
-      resize( tqgeometry.readSizeEntry( "Identity Dialog size" ) );
+    KConfigGroup geometry( KMKernel::config(), "Geometry" );
+    if ( geometry.hasKey( "Identity Dialog size" ) )
+      resize( geometry.readSizeEntry( "Identity Dialog size" ) );
     mNameEdit->setFocus();
 
     connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)),
@@ -444,8 +444,8 @@ namespace KMail {
   }
 
   IdentityDialog::~IdentityDialog() {
-    KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
-    tqgeometry.writeEntry( "Identity Dialog size", size() );
+    KConfigGroup geometry( KMKernel::config(), "Geometry" );
+    geometry.writeEntry( "Identity Dialog size", size() );
   }
 
   void IdentityDialog::slotAboutToShow( TQWidget * w ) {
@@ -527,7 +527,7 @@ void IdentityDialog::slotOk() {
     for ( TQStringList::const_iterator it = aliases.begin(), end = aliases.end() ; it != end ; ++it ) {
       if ( !isValidSimpleEmailAddress( *it ) ) {
         TQString errorMsg( simpleEmailAddressErrorMsg());
-        KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Alias \"%1\"").tqarg( *it ) );
+        KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Alias \"%1\"").arg( *it ) );
         return;
       }
     }
@@ -580,7 +580,7 @@ void IdentityDialog::slotOk() {
     }
 
     if ( err )
-      if ( KMessageBox::warningContinueCancel( this, msg.tqarg( email ),
+      if ( KMessageBox::warningContinueCancel( this, msg.arg( email ),
                                           i18n("Email Address Not Found in Key/Certificates"),
                                           KStdGuiItem::cont(), "warn_email_not_in_certificate" )
 	 != KMessageBox::Continue)
@@ -612,7 +612,7 @@ void IdentityDialog::slotOk() {
 
   void IdentityDialog::setIdentity( KPIM::Identity & ident ) {
 
-    setCaption( i18n("Edit Identity \"%1\"").tqarg( ident.identityName() ) );
+    setCaption( i18n("Edit Identity \"%1\"").arg( ident.identityName() ) );
 
     // "General" tab:
     mNameEdit->setText( ident.fullName() );
@@ -641,7 +641,7 @@ void IdentityDialog::slotOk() {
                                   "\"%1\" does not exist (anymore); "
                                   "therefore, the default sent-mail folder "
                                   "will be used.")
-                             .tqarg( ident.identityName() ) ) )
+                             .arg( ident.identityName() ) ) )
       mFccCombo->setFolder( kmkernel->sentFolder() );
     else
       mFccCombo->setFolder( ident.fcc() );
@@ -652,7 +652,7 @@ void IdentityDialog::slotOk() {
                                   "\"%1\" does not exist (anymore); "
                                   "therefore, the default drafts folder "
                                   "will be used.")
-                             .tqarg( ident.identityName() ) ) )
+                             .arg( ident.identityName() ) ) )
       mDraftsCombo->setFolder( kmkernel->draftsFolder() );
     else
       mDraftsCombo->setFolder( ident.drafts() );
@@ -663,14 +663,14 @@ void IdentityDialog::slotOk() {
                                   "\"%1\" does not exist (anymore); "
                                   "therefore, the default templates folder "
                                   "will be used.")
-                             .tqarg( ident.identityName() ) ) )
+                             .arg( ident.identityName() ) ) )
       mTemplatesCombo->setFolder( kmkernel->templatesFolder() );
     else
       mTemplatesCombo->setFolder( ident.templates() );
     
     // "Templates" tab:
     uint identity = ident.uoid();
-		TQString iid = TQString("IDENTITY_%1").tqarg( identity );
+		TQString iid = TQString("IDENTITY_%1").arg( identity );
 		Templates t( iid );
 		mCustom->setChecked(t.useCustomTemplates());
 		mWidget->loadFromIdentity( identity );
@@ -709,7 +709,7 @@ void IdentityDialog::slotOk() {
                      mTemplatesCombo->folder()->idString() : TQString() );
     // "Templates" tab:
     uint identity = ident.uoid();
-    TQString iid = TQString("IDENTITY_%1").tqarg( identity );
+    TQString iid = TQString("IDENTITY_%1").arg( identity );
     Templates t( iid );
 		kdDebug() << "use custom templates for identity " << identity << ": " << mCustom->isChecked() << endl;
 		t.setUseCustomTemplates(mCustom->isChecked());
diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp
index 5ce6f38c..7a513445 100644
--- a/kmail/identitylistview.cpp
+++ b/kmail/identitylistview.cpp
@@ -83,7 +83,7 @@ namespace KMail {
       setText( 0, i18n("%1: identity name. Used in the config "
 		       "dialog, section Identity, to indicate the "
 		       "default identity", "%1 (Default)")
-	       .tqarg( ident.identityName() ) );
+	       .arg( ident.identityName() ) );
     else
       setText( 0, ident.identityName() );
     setText( 1, ident.fullEmailAddr() );
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index df90dfdb..605d5c02 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -318,7 +318,7 @@ namespace KMail {
     mSlave = KIO::Scheduler::getConnectedSlave( getUrl(), slaveConfig() );
     if ( !mSlave ) {
       KMessageBox::error(0, i18n("Could not start process for %1.")
-			 .tqarg( getUrl().protocol() ) );
+			 .arg( getUrl().protocol() ) );
       return Error;
     }
     if ( mSlave->isConnected() ) {
@@ -354,7 +354,7 @@ namespace KMail {
       checkDone( false, CheckOK );
     }
     if ( showStatusMsg )
-      BroadcastStatus::instance()->seStatusMsgTransmissionCompleted(
+      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
           name(), newMails);
   }
 
@@ -400,7 +400,7 @@ namespace KMail {
     if (job->error())
     {
       if ( !(*it).quiet )
-        handleJobError( job, i18n( "Error while trying to subscribe to %1:" ).tqarg( path ) + '\n' );
+        handleJobError( job, i18n( "Error while trying to subscribe to %1:" ).arg( path ) + '\n' );
       emit subscriptionChangeFailed( job->errorString() );
       // ## emit subscriptionChanged here in case anyone needs it to support continue/cancel
     }
@@ -735,7 +735,7 @@ namespace KMail {
       if ( !done ) {
         TQString msg = i18n("KMail has detected a prefix entry in the "
             "configuration of the account \"%1\" which is obsolete with the "
-            "support of IMAP namespaces.").tqarg( name() );
+            "support of IMAP namespaces.").arg( name() );
         if ( list.contains( "" ) ) {
           // replace empty entry with the old prefix
           list.remove( "" );
@@ -879,13 +879,13 @@ namespace KMail {
     KMMessage* msg = jd.msgList.first();
     // Use double-quotes around the subject to keep the sentence readable,
     // but don't use double quotes around the sender since from() might return a double-quoted name already
-    const TQString subject = msg->subject().isEmpty() ? i18n( "<unknown>" ) : TQString("\"%1\"").tqarg( msg->subject() );
+    const TQString subject = msg->subject().isEmpty() ? i18n( "<unknown>" ) : TQString("\"%1\"").arg( msg->subject() );
     const TQString from = msg->from().isEmpty() ? i18n( "<unknown>" ) : msg->from();
     TQString myError = "<p><b>" + i18n("Error while uploading message")
       + "</b></p><p>"
-      + i18n("Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> to the server.").tqarg( msg->dateStr(), TQStyleSheet::escape( from ), TQStyleSheet::escape( subject ) )
+      + i18n("Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> to the server.").arg( msg->dateStr(), TQStyleSheet::escape( from ), TQStyleSheet::escape( subject ) )
       + "</p><p>"
-      + i18n("The destination folder was: <b>%1</b>.").tqarg( TQStyleSheet::escape( folder->prettyURL() ) )
+      + i18n("The destination folder was: <b>%1</b>.").arg( TQStyleSheet::escape( folder->prettyURL() ) )
       + "</p><p>"
       + i18n("The server reported:") + "</p>";
     return handleJobError( job, myError );
@@ -908,7 +908,7 @@ namespace KMail {
           }
           readOnly = folder->isReadOnly();
       }
-      error = i18n("The folder is too close to its quota limit. (%1)").tqarg( quotaAsString );
+      error = i18n("The folder is too close to its quota limit. (%1)").arg( quotaAsString );
       if ( readOnly ) {
           error += i18n("\nSince you do not have write privileges on this folder, "
                         "please ask the owner of the folder to free up some space in it.");
@@ -961,11 +961,11 @@ namespace KMail {
           KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), msg, caption, "kmailConnectionBrokenErrorDialog" );
           // Show it in the status bar, in case the user has ticked "don't show again"
           if ( errorCode == KIO::ERR_CONNECTION_BROKEN )
-            KPIM::BroadcastStatus::instance()->seStatusMsg(
-                i18n(  "The connection to account %1 was broken." ).tqarg( name() ) );
+            KPIM::BroadcastStatus::instance()->setStatusMsg(
+                i18n(  "The connection to account %1 was broken." ).arg( name() ) );
           else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
-            KPIM::BroadcastStatus::instance()->seStatusMsg(
-                i18n(  "The connection to account %1 timed out." ).tqarg( name() ) );
+            KPIM::BroadcastStatus::instance()->setStatusMsg(
+                i18n(  "The connection to account %1 timed out." ).arg( name() ) );
         } else {
           if ( !errors.isEmpty() )
               KMessageBox::detailedError( TQT_TQWIDGET(kapp->activeWindow()), msg, errors.join("\n").prepend("<qt>"), caption );
@@ -1141,10 +1141,10 @@ namespace KMail {
   void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart,
                                         DwBodyPart * parent, const DwMessage * dwmsg )
   {
-    int tqchildren;
+    int children;
     for (int i = 0; i < count; i++)
     {
-      stream >> tqchildren;
+      stream >> children;
       KMMessagePart* part = new KMMessagePart( stream );
       part->setParent( parentKMPart );
       mBodyPartList.append( part );
@@ -1173,7 +1173,7 @@ namespace KMail {
       if ( !parentKMPart )
         parentKMPart = part;
 
-      if (tqchildren > 0)
+      if (children > 0)
       {
         DwBodyPart* newparent = dwpart;
         const DwMessage* newmsg = dwmsg;
@@ -1188,7 +1188,7 @@ namespace KMail {
         if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as parent
           newParentKMPart = parentKMPart;
 
-        constructParts( stream, tqchildren, newParentKMPart, newparent, newmsg );
+        constructParts( stream, children, newParentKMPart, newparent, newmsg );
       }
     }
   }
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index d9f3e7cb..4cca259f 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -267,9 +267,9 @@ namespace KMail {
 
     /**
      * Called when we're completely done checking mail for this account
-     * When @p seStatusMsg is true a status msg is shown
+     * When @p setStatusMsg is true a status msg is shown
      */
-    void postProcessNewMail( bool seStatusMsg = true );
+    void postProcessNewMail( bool setStatusMsg = true );
 
     /**
      * Check whether we're checking for new mail
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index 69341416..ab57da23 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -140,10 +140,10 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
       for ( char *ch = cstr.data(); *ch; ch++ )
       {
         if ( *ch == '\n' && (prevChar != '\r') ) {
-          jd.data.tqat( i ) = '\r';
+          jd.data.at( i ) = '\r';
           i++;
         }
-        jd.data.tqat( i ) = *ch;
+        jd.data.at( i ) = *ch;
         prevChar = *ch;
         i++;
       }
@@ -191,7 +191,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
                           "ImapJobCopyMove"+ProgressManager::getUniqueID(),
                           i18n("Server operation"),
                           i18n("Source folder: %1 - Destination folder: %2")
-                            .tqarg( TQStyleSheet::escape( msg_parent->prettyURL() ),
+                            .arg( TQStyleSheet::escape( msg_parent->prettyURL() ),
                                   TQStyleSheet::escape( mDestFolder->prettyURL() ) ),
                           true,
                           account->useSSL() || account->useTLS() );
@@ -369,7 +369,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
   {
     TQString errorStr = i18n( "Error while retrieving messages from the server." );
     if ( (*it).progressItem )
-      (*it).progressItem->seStatus( errorStr );
+      (*it).progressItem->setStatus( errorStr );
     account->handleJobError( job, errorStr );
     return;
   } else {
@@ -540,12 +540,12 @@ void ImapJob::slotPutMessageResult( KIO::Job *job )
   if (job->error())
   {
     if ( (*it).progressItem )
-      (*it).progressItem->seStatus( i18n("Uploading message data failed.") );
+      (*it).progressItem->setStatus( i18n("Uploading message data failed.") );
     account->handlePutError( job, *it, mDestFolder );
     return;
   } else {
     if ( (*it).progressItem )
-      (*it).progressItem->seStatus( i18n("Uploading message data completed.") );
+      (*it).progressItem->setStatus( i18n("Uploading message data completed.") );
     if ( mParentProgressItem )
     {
       mParentProgressItem->incCompletedItems();
@@ -651,7 +651,7 @@ void ImapJob::slotCopyMessageResult( KIO::Job *job )
     mErrorCode = job->error();
     TQString errStr = i18n("Error while copying messages.");
     if ( (*it).progressItem )
-      (*it).progressItem->seStatus( errStr );
+      (*it).progressItem->setStatus( errStr );
     if ( account->handleJobError( job, errStr  ) )
       deleteLater();
     return;
diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index 783c2dd5..3a7de198 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;
   }
 
diff --git a/kmail/index.cpp b/kmail/index.cpp
index 674588f2..bb1e2ac6 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -550,7 +550,7 @@ void KMMsgIndex::Search::act() {
 			TQString terms;
 			for ( KMSearchRule* rule = pat->first(); rule; rule = pat->next() ) {
 				Q_ASSERT( rule->function() == KMSearchRule::FuncContains );
-				terms += TQString::fromLatin1( " %1 " ).tqarg( rule->contents() );
+				terms += TQString::fromLatin1( " %1 " ).arg( rule->contents() );
 			}
 
 			mValues = kmkernel->msgIndex()->simpleSearch( terms, 0  );
diff --git a/kmail/kcursorsaver.h b/kmail/kcursorsaver.h
index ec02eb94..a4efe26d 100644
--- a/kmail/kcursorsaver.h
+++ b/kmail/kcursorsaver.h
@@ -13,9 +13,9 @@
 class KCursorSaver : public TQt
 {
 public:
-    /// constructor taking TQCursor tqshapes
-    KCursorSaver(TQt::CursorShape tqshape) {
-        TQApplication::setOverrideCursor( TQCursor(tqshape) );
+    /// constructor taking TQCursor shapes
+    KCursorSaver(TQt::CursorShape shape) {
+        TQApplication::setOverrideCursor( TQCursor(shape) );
         inited = true;
     }
 
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index c6abdd95..a9f8dc6d 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -308,7 +308,7 @@ static std::vector<GpgME::Key> trustedOrConfirmed( const std::vector<GpgME::Key>
              "for encryption.")
       : i18n("One or more of the OpenPGP encryption keys or S/MIME "
              "certificates for recipient \"%1\" is not fully trusted "
-             "for encryption.").tqarg(address) ;
+             "for encryption.").arg(address) ;
 
   if ( !fishies.empty() ) {
     // certificates can't have marginal trust
@@ -651,7 +651,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
                      "<p>expired less than a day ago.</p>",
                      "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
                      "<p>expired %n days ago.</p>",
-                     daysSinceExpiry ) ).tqarg( TQString::fromUtf8( key.userID(0).id() ),
+                     daysSinceExpiry ) ).arg( TQString::fromUtf8( key.userID(0).id() ),
 					 key.shortKeyID() )
           : ( ca
               ? ( key.isRoot()
@@ -698,7 +698,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
                              "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
                              "<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
                              "<p>expired %n days ago.</p>",
-                             daysSinceExpiry ) ) ).tqarg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
+                             daysSinceExpiry ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
                                                        orig.issuerSerial(),
                                                        Kleo::DN( key.userID(0).id() ).prettyDN() )
               : ( mine ? sign
@@ -716,7 +716,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
                          "<p>expired less than a day ago.</p>",
                          "<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)</p>"
                          "<p>expired %n days ago.</p>",
-                         daysSinceExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(),
+                         daysSinceExpiry ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(),
                                                  key.issuerSerial() ) );
       d->alreadyWarnedFingerprints.insert( subkey.fingerprint() );
       if ( KMessageBox::warningContinueCancel( 0, msg,
@@ -759,7 +759,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
 		 "<p>expires in less than a day.</p>",
 		 "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
 		 "<p>expires in less than %n days.</p>",
-		 daysTillExpiry ) ).tqarg( TQString::fromUtf8( key.userID(0).id() ),
+		 daysTillExpiry ) ).arg( TQString::fromUtf8( key.userID(0).id() ),
 					 key.shortKeyID() )
       : ( ca
 	  ? ( key.isRoot()
@@ -806,7 +806,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
 			 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
 			 "<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
 			 "<p>expires in less than %n days.</p>",
-			 daysTillExpiry ) ) ).tqarg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
+			 daysTillExpiry ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
 						   orig.issuerSerial(),
 						   Kleo::DN( key.userID(0).id() ).prettyDN() )
 	  : ( mine ? sign
@@ -824,7 +824,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
 		     "<p>expires in less than a day.</p>",
 		     "<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)</p>"
 		     "<p>expires in less than %n days.</p>",
-		     daysTillExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(),
+		     daysTillExpiry ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(),
 					     key.issuerSerial() ) );
     d->alreadyWarnedFingerprints.insert( subkey.fingerprint() );
     if ( KMessageBox::warningContinueCancel( 0, msg,
@@ -1628,7 +1628,7 @@ std::vector<GpgME::Key> Kleo::KeyResolver::getEncryptionKeys( const TQString & p
               "There is a problem with the "
               "encryption certificate(s) for \"%1\".\n\n"
               "Please re-select the certificate(s) which should "
-              "be used for this recipient.").tqarg(person),
+              "be used for this recipient.").arg(person),
             keys );
       }
       bool canceled = false;
@@ -1680,13 +1680,13 @@ std::vector<GpgME::Key> Kleo::KeyResolver::getEncryptionKeys( const TQString & p
               "Select the certificate(s) which should "
               "be used for this recipient. If there is no suitable certificate in the list "
               "you can also search for external certificates by clicking the button: search for external certificates.</qt>")
-             .tqarg( TQStyleSheet::escape(person) )
+             .arg( TQStyleSheet::escape(person) )
           : i18n("if in your language something like "
               "'certificate(s)' isn't possible please "
               "use the plural in the translation",
               "More than one certificate matches \"%1\".\n\n"
               "Select the certificate(s) which should "
-              "be used for this recipient.").tqarg( TQStyleSheet::escape(person) ),
+              "be used for this recipient.").arg( TQStyleSheet::escape(person) ),
           matchingKeys ), address, canceled );
   // we can ignore 'canceled' here, since trustedOrConfirmed() returns
   // an empty vector when canceled == true, and we'd just do the same
@@ -1797,7 +1797,7 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont
   KABC::Addressee addr;
   if ( res.isEmpty() ) {
      bool ok = true;
-     TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).tqarg( email ), TQString(), &ok );
+     TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString(), &ok );
     if ( ok ) {
       addr.setNameFromString( fullName );
       addr.insertEmail( email, true );
diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp
index 2b53e609..3c8ee388 100644
--- a/kmail/khtmlparthtmlwriter.cpp
+++ b/kmail/khtmlparthtmlwriter.cpp
@@ -86,7 +86,7 @@ namespace KMail {
 
     mHtmlPart->view()->viewport()->setUpdatesEnabled( true );
     mHtmlPart->view()->setUpdatesEnabled( true );
-    mHtmlPart->view()->viewport()->tqrepaint( false );
+    mHtmlPart->view()->viewport()->repaint( false );
     mState = Ended;
   }
 
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index fa013b8d..72a68c65 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -45,8 +45,8 @@ using KMail::FolderJob;
 KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent)
   : TQObject(parent), mPrecommand(precommand)
 {
-  BroadcastStatus::instance()->seStatusMsg(
-      i18n("Executing precommand %1").tqarg(precommand ));
+  BroadcastStatus::instance()->setStatusMsg(
+      i18n("Executing precommand %1").arg(precommand ));
 
   mPrecommandProcess.setUseShell(true);
   mPrecommandProcess << precommand;
@@ -66,7 +66,7 @@ bool KMPrecommand::start()
 {
   bool ok = mPrecommandProcess.start( KProcess::NotifyOnExit );
   if (!ok) KMessageBox::error(0, i18n("Could not execute precommand '%1'.")
-    .tqarg(mPrecommand));
+    .arg(mPrecommand));
   return ok;
 }
 
@@ -77,7 +77,7 @@ void KMPrecommand::precommandExited(KProcess *p)
   int exitCode = p->normalExit() ? p->exitStatus() : -1;
   if (exitCode)
     KMessageBox::error(0, i18n("The precommand exited with code %1:\n%2")
-      .tqarg(exitCode).tqarg(strerror(exitCode)));
+      .arg(exitCode).arg(strerror(exitCode)));
   emit finished(!exitCode);
 }
 
@@ -233,10 +233,10 @@ bool KMAccount::processNewMsg(KMMessage* aMsg)
   // This is only valid for pop accounts and produces wrong stati for imap.
   if ( type() != "cachedimap" && type() != "imap" ) {
     if ( aMsg->isOld() )
-      aMsg->seStatus(KMMsgStatusUnread);  // -sanders
-    //    aMsg->seStatus(KMMsgStatusRead);
+      aMsg->setStatus(KMMsgStatusUnread);  // -sanders
+    //    aMsg->setStatus(KMMsgStatusRead);
     else
-      aMsg->seStatus(KMMsgStatusNew);
+      aMsg->setStatus(KMMsgStatusNew);
   }
 /*
 TQFile fileD0( "testdat_xx-kmaccount-0" );
@@ -377,8 +377,8 @@ bool KMAccount::runPrecommand(const TQString &precommand)
 
   KMPrecommand precommandProcess(precommand, this);
 
-  BroadcastStatus::instance()->seStatusMsg(
-      i18n("Executing precommand %1").tqarg(precommand ));
+  BroadcastStatus::instance()->setStatusMsg(
+      i18n("Executing precommand %1").arg(precommand ));
 
   connect(&precommandProcess, TQT_SIGNAL(finished(bool)),
           TQT_SLOT(precommandExited(bool)));
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index e5c1f4e7..1c12042b 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -208,7 +208,7 @@ public:
   virtual void setHasInbox( bool has ) { mHasInbox = has; }
 
   /**
-   * If this account is a disconnected IMAP account, tqinvalidate it.
+   * If this account is a disconnected IMAP account, invalidate it.
    */
   virtual void invalidateIMAPFolders();
 
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index 6690bd00..e57543d3 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -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").tqarg(KAccount::id()) );
+				   TQString("%1").arg(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").tqarg(KAccount::id()) );
+				   TQString("%1").arg(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" ).tqarg( TQStyleSheet::escape( name() ) ),
+        i18n("Checking account: %1" ).arg( 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->setStatus( 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" ).tqarg( *filterIt ) );
+      mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *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" ).tqarg( *filterIt ) );
+      mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) );
       ++filterIt;
       continue;
     }
@@ -452,7 +452,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
 
       msg = folder->getMsg( idx );
       if (!msg) { // sanity checking
-        mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) );
+        mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) );
         ++filterIt;
         continue;
       }
@@ -473,7 +473,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
 		  TQT_SLOT(slotFilterMsg(KMMessage*)));
 	  job->start();
 	} else {
-	  mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) );
+	  mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) );
 	  if (slotFilterMsg(msg) == 2) break;
 	}
       }
@@ -498,7 +498,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
 //-----------------------------------------------------------------------------
 void KMAcctImap::slotFiltered(TQ_UINT32 serNum)
 {
-    mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) );
+    mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) );
 }
 
 //-----------------------------------------------------------------------------
@@ -584,7 +584,7 @@ void KMAcctImap::execFilters(TQ_UINT32 serNum)
   if ( findIt != mFilterSerNums.end() )
       return;
   mFilterSerNums.append( serNum );
-  mFilterSerNumsToSave.insert( TQString( "%1" ).tqarg( serNum ), (const int *)1 );
+  mFilterSerNumsToSave.insert( TQString( "%1" ).arg( 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" ).tqarg( serNum ) );
+    mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) );
 
   int filterResult = kmkernel->filterMgr()->process(msg,
 						    KMFilterMgr::Inbound,
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 9af6e2ca..d1e15f83 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -103,7 +103,7 @@ bool KMAcctLocal::preProcess()
   if ( precommand().isEmpty() ) {
     TQFileInfo fi( location() );
     if ( fi.size() == 0 ) {
-      BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 );
       checkDone( mHasNewMail, CheckOK );
       return false;
     }
@@ -119,13 +119,13 @@ bool KMAcctLocal::preProcess()
 
   if (!mFolder) {
     checkDone( mHasNewMail, CheckError );
-    BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
     return false;
   }
 
   //BroadcastStatus::instance()->reset();
-  BroadcastStatus::instance()->seStatusMsg(
-        i18n("Preparing transmission from \"%1\"...").tqarg(mName));
+  BroadcastStatus::instance()->setStatusMsg(
+        i18n("Preparing transmission from \"%1\"...").arg(mName));
 
 
   Q_ASSERT( !mMailCheckProgressItem );
@@ -133,7 +133,7 @@ bool KMAcctLocal::preProcess()
   mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem(
     "MailCheck" + mName,
     escapedName,
-    i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ),
+    i18n("Preparing transmission from \"%1\"...").arg( escapedName ),
     false, // cannot be canceled
     false ); // no tls/ssl
 
@@ -142,7 +142,7 @@ bool KMAcctLocal::preProcess()
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( mHasNewMail, CheckError );
-    BroadcastStatus::instance()->seStatusMsg( i18n( "Running precommand failed." ));
+    BroadcastStatus::instance()->setStatusMsg( i18n( "Running precommand failed." ));
     return false;
   }
 
@@ -155,7 +155,7 @@ bool KMAcctLocal::preProcess()
     kdDebug(5006) << "cannot open file " << mMailFolder->path() << "/"
       << mMailFolder->name() << endl;
     checkDone( mHasNewMail, CheckError );
-    BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
     return false;
   }
 
@@ -164,8 +164,8 @@ bool KMAcctLocal::preProcess()
     mMailFolder->close("acctlocalMail");
     checkDone( mHasNewMail, CheckError );
     TQString errMsg = i18n( "Transmission failed: Could not lock %1." )
-      .tqarg( mMailFolder->location() );
-    BroadcastStatus::instance()->seStatusMsg( errMsg );
+      .arg( mMailFolder->location() );
+    BroadcastStatus::instance()->setStatusMsg( errMsg );
     return false;
   }
 
@@ -177,9 +177,9 @@ bool KMAcctLocal::preProcess()
 
   // prepare the static parts of the status message:
   mStatusMsgStub = i18n("Moving message %3 of %2 from %1.")
-    .tqarg(mMailFolder->location()).tqarg( mNumMsgs );
+    .arg(mMailFolder->location()).arg( mNumMsgs );
 
-  //BroadcastStatus::instance()->seStatusProgressEnable( "L" + mName, true );
+  //BroadcastStatus::instance()->setStatusProgressEnable( "L" + mName, true );
   return true;
 }
 
@@ -192,11 +192,11 @@ bool KMAcctLocal::fetchMsg()
   /* This causes mail eating
   if (kmkernel->mailCheckAborted()) break; */
 
-  const TQString statusMsg = mStatusMsgStub.tqarg( mMsgsFetched );
-  //BroadcastStatus::instance()->seStatusMsg( statusMsg );
+  const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched );
+  //BroadcastStatus::instance()->setStatusMsg( statusMsg );
   mMailCheckProgressItem->incCompletedItems();
   mMailCheckProgressItem->updateProgress();
-  mMailCheckProgressItem->seStatus( statusMsg );
+  mMailCheckProgressItem->setStatus( statusMsg );
 
   msg = mMailFolder->take(0);
   if (msg)
@@ -214,7 +214,7 @@ bool KMAcctLocal::fetchMsg()
       fileD0.close();  // If data is 0 we just create a zero length file.
     }
 #endif
-    msg->seStatus(msg->headerField("Status").latin1(),
+    msg->setStatus(msg->headerField("Status").latin1(),
       msg->headerField("X-Status").latin1());
     msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) );
     msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
@@ -244,16 +244,16 @@ void KMAcctLocal::postProcess()
       KMessageBox::queuedMessageBox( 0, KMessageBox::Information,
                                      i18n( "<qt>Cannot remove mail from "
                                            "mailbox <b>%1</b>:<br>%2</qt>" )
-                                     .tqarg( mMailFolder->location() )
-                                     .tqarg( strerror( rc ) ) );
+                                     .arg( mMailFolder->location() )
+                                     .arg( strerror( rc ) ) );
     }
 
     if( mMailCheckProgressItem ) { // do this only once...
-      BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
-      mMailCheckProgressItem->seStatus(
+      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, mNumMsgs );
+      mMailCheckProgressItem->setStatus(
         i18n( "Fetched 1 message from mailbox %1.",
               "Fetched %n messages from mailbox %1.",
-              mNumMsgs ).tqarg( mMailFolder->location() ) );
+              mNumMsgs ).arg( mMailFolder->location() ) );
       mMailCheckProgressItem->setComplete();
       mMailCheckProgressItem = 0;
     }
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index bcf29f11..b3c5d31c 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool)
     TQFileInfo fi( location() );
     if ( !fi.exists() ) {
       checkDone( hasNewMail, CheckOK );
-      BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 );
       return;
     }
   }
@@ -102,19 +102,19 @@ void KMAcctMaildir::processNewMail(bool)
 
   if (!mFolder) {
     checkDone( hasNewMail, CheckError );
-    BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
-  BroadcastStatus::instance()->seStatusMsg(
-	i18n("Preparing transmission from \"%1\"...").tqarg(mName));
+  BroadcastStatus::instance()->setStatusMsg(
+	i18n("Preparing transmission from \"%1\"...").arg(mName));
 
   Q_ASSERT( !mMailCheckProgressItem );
   TQString escapedName = TQStyleSheet::escape( mName );
   mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem(
     "MailCheck" + mName,
     escapedName,
-    i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ),
+    i18n("Preparing transmission from \"%1\"...").arg( escapedName ),
     false, // cannot be canceled
     false ); // no tls/ssl
 
@@ -123,18 +123,18 @@ void KMAcctMaildir::processNewMail(bool)
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( hasNewMail, CheckError );
-    BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
   rc = mailFolder.open("acctmaildirMail");
   if (rc)
   {
-    TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").tqarg( mailFolder.location() );
+    TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").arg( mailFolder.location() );
     KMessageBox::sorry(0, aStr);
     kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl;
     checkDone( hasNewMail, CheckError );
-    BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
@@ -148,7 +148,7 @@ void KMAcctMaildir::processNewMail(bool)
 
   // prepare the static parts of the status message:
   TQString statusMsgStub = i18n("Moving message %3 of %2 from %1.")
-    .tqarg(mailFolder.location()).tqarg(num);
+    .arg(mailFolder.location()).arg(num);
 
   mMailCheckProgressItem->setTotalItems( num );
 
@@ -156,21 +156,21 @@ void KMAcctMaildir::processNewMail(bool)
   {
 
     if( kmkernel->mailCheckAborted() ) {
-      BroadcastStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
+      BroadcastStatus::instance()->setStatusMsg( i18n("Transmission aborted.") );
       num = i;
       addedOk = false;
     }
     if (!addedOk) break;
 
-    TQString statusMsg = statusMsgStub.tqarg(i);
+    TQString statusMsg = statusMsgStub.arg(i);
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->seStatus( statusMsg );
+    mMailCheckProgressItem->setStatus( statusMsg );
 
     msg = mailFolder.take(0);
     if (msg)
     {
-      msg->seStatus(msg->headerField("Status").latin1(),
+      msg->setStatus(msg->headerField("Status").latin1(),
         msg->headerField("X-Status").latin1());
       msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0));
       msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
@@ -188,18 +188,18 @@ void KMAcctMaildir::processNewMail(bool)
   }
 
   if( mMailCheckProgressItem ) { // do this only once...
-    BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( num );
-    mMailCheckProgressItem->seStatus(
+    BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( num );
+    mMailCheckProgressItem->setStatus(
       i18n( "Fetched 1 message from maildir folder %1.",
             "Fetched %n messages from maildir folder %1.",
-            num ).tqarg(mailFolder.location() ) );
+            num ).arg(mailFolder.location() ) );
 
     mMailCheckProgressItem->setComplete();
     mMailCheckProgressItem = 0;
   }
   if (addedOk)
   {
-    BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
+    BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, num );
   }
   // else warning is written already
 
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 45654d27..abf480c9 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -682,8 +682,8 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder )
         remainder.pop_front();
         remainder.pop_front();
         label = i18n("%1's %2")
-            .tqarg( parts[2] )
-            .tqarg( remainder.join( TQString::fromLatin1("/") ) );
+            .arg( parts[2] )
+            .arg( remainder.join( TQString::fromLatin1("/") ) );
     }
     // Another special case is our own folders, under the imap INBOX, make
     // those prettier too
@@ -698,15 +698,15 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder )
           // Fix kolab issue 2531 folder->storage() )->account() can be null
           if( folder->storage() && static_cast<const KMFolderCachedImap*>( folder->storage() )->account() ) {
           label = i18n( "My %1 (%2)")
-              .tqarg( remainder.join( TQString::fromLatin1("/") ),
+              .arg( remainder.join( TQString::fromLatin1("/") ),
                     static_cast<const KMFolderCachedImap*>( folder->storage() )->account()->name() );
           } else {
             label = i18n("My %1")
-              .tqarg( remainder.join( TQString::fromLatin1("/") ) );
+              .arg( remainder.join( TQString::fromLatin1("/") ) );
           }
         } else {
           label = i18n("My %1")
-              .tqarg( remainder.join( TQString::fromLatin1("/") ) );
+              .arg( remainder.join( TQString::fromLatin1("/") ) );
         }
         break;
       }
@@ -1776,7 +1776,7 @@ void KMailICalIfaceImpl::readConfig()
         // No subfolder was found, so ask if we can make them
         msg = i18n("KMail will now create the required groupware folders"
                    " as subfolders of %1; if you do not want this, cancel"
-                   " and the IMAP resource will be disabled").tqarg(parentFolderName);
+                   " and the IMAP resource will be disabled").arg(parentFolderName);
       } else {
         // Some subfolders were found, be more precise
         TQString operations = "<ul>";
@@ -1784,17 +1784,17 @@ void KMailICalIfaceImpl::readConfig()
           if ( i != KMail::ContentsTypeMail ) {
             TQString typeName = localizedDefaultFolderName( static_cast<KMail::FolderContentsType>( i ) );
             if ( results[i].found == StandardFolderSearchResult::NotFound )
-              operations += "<li>" + i18n( "%1: no folder found. It will be created." ).tqarg( typeName ) + "</li>";
+              operations += "<li>" + i18n( "%1: no folder found. It will be created." ).arg( typeName ) + "</li>";
             else if ( results[i].found == StandardFolderSearchResult::FoundByType || results[i].found == StandardFolderSearchResult::FoundByName )
               operations += "<li>" + i18n( "%1: found folder %2. It will be set as the main groupware folder." ).
-                            tqarg( typeName ).tqarg( results[i].folder->label() ) + "</li>";
+                            arg( typeName ).arg( results[i].folder->label() ) + "</li>";
           }
         }
         operations += "</ul>";
 
         msg = i18n("<qt>KMail found the following groupware folders in %1 and needs to perform the following operations: %2"
                    "<br>If you do not want this, cancel"
-                   " and the IMAP resource will be disabled").tqarg(parentFolderName, operations);
+                   " and the IMAP resource will be disabled").arg(parentFolderName, operations);
 
       }
 
@@ -1991,7 +1991,7 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType
       labels << (*it)->prettyURL();
     const TQString selected = KInputDialog::getItem( i18n("Default folder"),
         i18n("There are multiple %1 default folders, please choose one:")
-        .tqarg( localizedDefaultFolderName( contentsType ) ), labels );
+        .arg( localizedDefaultFolderName( contentsType ) ), labels );
     if ( !selected.isEmpty() )
       result.folder = result.folders[ labels.findIndex( selected ) ];
   }
@@ -2017,7 +2017,7 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType
 
   if( folder->canAccess() != 0 ) {
     KMessageBox::sorry(0, i18n("You do not have read/write permission to your %1 folder.")
-                       .tqarg( folderName( itemType ) ) );
+                       .arg( folderName( itemType ) ) );
     return 0;
   }
   folder->storage()->setContentsType( contentsType );
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 50896451..341a3520 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -595,14 +595,14 @@ KMCommand::Result KMUrlCopyCommand::execute()
     clip->setText( address );
     clip->setSelectionMode( false );
     clip->setText( address );
-    KPIM::BroadcastStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." ));
+    KPIM::BroadcastStatus::instance()->setStatusMsg( i18n( "Address copied to clipboard." ));
   } else {
     // put the url into the mouse selection and the clipboard
     clip->setSelectionMode( true );
     clip->setText( mUrl.url() );
     clip->setSelectionMode( false );
     clip->setText( mUrl.url() );
-    KPIM::BroadcastStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." ));
+    KPIM::BroadcastStatus::instance()->setStatusMsg( i18n( "URL copied to clipboard." ));
   }
 
   return OK;
@@ -640,7 +640,7 @@ KMCommand::Result KMUrlSaveCommand::execute()
   {
     if (KMessageBox::warningContinueCancel(0,
         i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>")
-        .tqarg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
+        .arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         != KMessageBox::Continue)
       return Canceled;
   }
@@ -753,8 +753,8 @@ KMCommand::Result KMShowMsgSrcCommand::execute()
     viewer->resize(TQApplication::desktop()->screenGeometry(scnum).width()/2,
                   2*TQApplication::desktop()->screenGeometry(scnum).height()/3);
   } else {
-    viewer->resize(TQApplication::desktop()->tqgeometry().width()/2,
-                  2*TQApplication::desktop()->tqgeometry().height()/3);
+    viewer->resize(TQApplication::desktop()->geometry().width()/2,
+                  2*TQApplication::desktop()->geometry().height()/3);
   }
   viewer->show();
 
@@ -963,7 +963,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
     {
       if (KMessageBox::warningContinueCancel(0,
         i18n("File %1 exists.\nDo you want to replace it?")
-        .tqarg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
+        .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue) {
         mOffset = 0;
 
@@ -1397,12 +1397,12 @@ KMCommand::Result KMForwardDigestCommand::execute()
     msgPartText += "--";
     msgPartText += TQString::fromLatin1( boundary );
     msgPartText += "\nContent-Type: MESSAGE/RFC822";
-    msgPartText += TQString( "; CHARSET=%1" ).tqarg( TQString(msg->charset()) );
+    msgPartText += TQString( "; CHARSET=%1" ).arg( TQString(msg->charset()) );
     msgPartText += '\n';
     DwHeaders dwh;
     dwh.MessageId().CreateDefault();
-    msgPartText += TQString( "Content-ID: %1\n" ).tqarg( dwh.MessageId().AsString().c_str() );
-    msgPartText += TQString( "Content-Description: %1" ).tqarg( msg->subject() );
+    msgPartText += TQString( "Content-ID: %1\n" ).arg( dwh.MessageId().AsString().c_str() );
+    msgPartText += TQString( "Content-Description: %1" ).arg( msg->subject() );
     if ( !msg->subject().contains( "(fwd)" ) )
       msgPartText += " (fwd)";
     msgPartText += "\n\n";
@@ -1430,7 +1430,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
   msgPart->setSubtypeStr( tmp );
   msgPart->setName( "unnamed" );
   msgPart->setCte( DwMime::kCte7bit );   // does it have to be 7bit?
-  msgPart->setContentDescription( TQString( "Digest of %1 messages." ).tqarg( msgCnt ) );
+  msgPart->setContentDescription( TQString( "Digest of %1 messages." ).arg( msgCnt ) );
   // THIS HAS TO BE AFTER setCte()!!!!
   msgPart->setBodyEncoded( TQCString( msgPartText.ascii() ) );
   KCursorSaver busy( KBusyPtr::busy() );
@@ -1690,7 +1690,7 @@ KMCommand::Result KMSeStatusCommand::execute()
   TQMapIterator< KMFolder*, TQValueList<int> > it2 = folderMap.begin();
   while ( it2 != folderMap.end() ) {
      KMFolder *f = it2.key();
-     f->seStatus( (*it2), mStatus, mToggle );
+     f->setStatus( (*it2), mStatus, mToggle );
      ++it2;
   }
   //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() );
@@ -1741,8 +1741,8 @@ KMCommand::Result KMFilterActionCommand::execute()
     if ( diff < 10 || !( msgCount % 20 ) || msgCount <= 10 ) {
       progressItem->updateProgress();
       TQString statusMsg = i18n("Filtering message %1 of %2");
-      statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter );
-      KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg );
+      statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
+      KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
       KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
     }
 
@@ -1995,7 +1995,7 @@ KMCommand::Result KMCopyCommand::execute()
       // corrupt IMAP cache, see FolderStorage::getMsg()
       if ( msg == 0 ) {
         KMessageBox::error( parentWidget(), i18n("Corrupt IMAP cache detected in folder %1. "
-            "Copying of messages aborted.").tqarg( srcFolder->prettyURL() ) );
+            "Copying of messages aborted.").arg( srcFolder->prettyURL() ) );
         deleteLater();
         return Failed;
       }
@@ -2015,7 +2015,7 @@ KMCommand::Result KMCopyCommand::execute()
       // make sure the attachment state is only calculated when it's complete
       if (!newMsg->isComplete())
         newMsg->setReadyToShow(false);
-      newMsg->seStatus(msg->status());
+      newMsg->setStatus(msg->status());
 
       if (srcFolder && !newMsg->isComplete())
       {
@@ -2453,7 +2453,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
            (mUrl.protocol() == "smb")  || (mUrl.protocol() == "fish")  ||
            (mUrl.protocol() == "news"))
   {
-    KPIM::BroadcastStatus::instance()->seStatusMsg( i18n("Opening URL..."));
+    KPIM::BroadcastStatus::instance()->setStatusMsg( i18n("Opening URL..."));
     KMimeType::Ptr mime = KMimeType::findByURL( mUrl );
     if (mime->name() == "application/x-desktop" ||
         mime->name() == "application/x-executable" ||
@@ -2461,7 +2461,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
         mime->name() == "application/x-shellscript" )
     {
       if (KMessageBox::warningYesNo( 0, i18n( "<qt>Do you really want to execute <b>%1</b>?</qt>" )
-        .tqarg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes)
+        .arg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes)
         return Canceled;
     }
     KRun * runner = new KRun( mUrl );
@@ -2605,7 +2605,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
         ++unnamedAtmCount;
         s = i18n("filename for the %1-th unnamed attachment",
                  "attachment.%1")
-            .tqarg( unnamedAtmCount );
+            .arg( unnamedAtmCount );
       }
       curUrl.setFileName( s );
     } else {
@@ -2644,7 +2644,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
       if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) {
         if ( KMessageBox::warningContinueCancel( parentWidget(),
               i18n( "A file named %1 already exists. Do you want to overwrite it?" )
-              .tqarg( curUrl.fileName() ),
+              .arg( curUrl.fileName() ),
               i18n( "File Already Exists" ), i18n("&Overwrite") ) == KMessageBox::Cancel) {
           continue;
         }
@@ -2752,8 +2752,8 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
       KMessageBox::error( parentWidget(),
           i18n( "%2 is detailed error description",
             "Could not write the file %1:\n%2" )
-          .tqarg( file.name() )
-          .tqarg( TQString::fromLocal8Bit( strerror( errno ) ) ),
+          .arg( file.name() )
+          .arg( TQString::fromLocal8Bit( strerror( errno ) ) ),
           i18n( "KMail Error" ) );
       return Failed;
     }
@@ -2777,7 +2777,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
     {
       KMessageBox::error( parentWidget(),
           i18n( "Could not write the file %1." )
-          .tqarg( url.path() ),
+          .arg( url.path() ),
           i18n( "KMail Error" ) );
       return Failed;
     }
@@ -3012,7 +3012,7 @@ KMCommand::Result KMIMChatCommand::execute()
           nameList.append( (*it).realName() );
       }
       TQString names = nameList.join( TQString::fromLatin1( ",\n" ) );
-      apology = apology.tqarg( names );
+      apology = apology.arg( names );
     }
 
     KMessageBox::sorry( parentWidget(), apology );
@@ -3452,7 +3452,7 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify()
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->seStatus( msg->status() );
+  newMsg->setStatus( msg->status() );
 
   storeChangedMessage( newMsg );
   return OK;
@@ -3543,7 +3543,7 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher)
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->seStatus( msg->status() );
+  newMsg->setStatus( msg->status() );
 
   storeChangedMessage( newMsg );
 }
@@ -3563,8 +3563,8 @@ KMCommand::Result CreateTodoCommand::execute()
 
   KMail::KorgHelper::ensureRunning();
 
-  TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( msg->from() )
-                .tqarg( msg->to() ).tqarg( msg->subject() );
+  TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( msg->from() )
+                .arg( msg->to() ).arg( msg->subject() );
 
   KTempFile tf;
   tf.setAutoDelete( true );
@@ -3573,7 +3573,7 @@ KMCommand::Result CreateTodoCommand::execute()
   tf.close();
 
   KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" );
-  iface->openTodoEditor( i18n("Mail: %1").tqarg( msg->subject() ), txt, uri,
+  iface->openTodoEditor( i18n("Mail: %1").arg( msg->subject() ), txt, uri,
                          tf.name(), TQStringList(), "message/rfc822", true );
   delete iface;
 
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 12c2e614..31fff2ad 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -868,7 +868,7 @@ void KMComposeWin::slotContinueAutoSave()
                                      i18n("Autosaving the message as %1 "
                                           "failed.\n"
                                           "Reason: %2" )
-                                     .tqarg( filename, strerror( status ) ),
+                                     .arg( filename, strerror( status ) ),
                                      i18n("Autosaving Failed") );
       mLastAutoSaveErrno = status;
     }
@@ -1109,7 +1109,7 @@ void KMComposeWin::rethinkFields(bool fromSlot)
   else
     mAtmListView->hide();
   resize(this->size());
-  tqrepaint();
+  repaint();
 
   mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() );
   mGrid->activate();
@@ -1625,9 +1625,9 @@ void KMComposeWin::setupStatusBar(void)
   statusBar()->insertItem("", 0, 1);
   statusBar()->setItemAlignment(0, AlignLeft | AlignVCenter);
 
-  statusBar()->insertItem(i18n( " Spellcheck: %1 ").tqarg( "   " ), 3, 0, true );
-  statusBar()->insertItem(i18n( " Column: %1 ").tqarg("     "), 2, 0, true);
-  statusBar()->insertItem(i18n( " Line: %1 ").tqarg("     "), 1, 0, true);
+  statusBar()->insertItem(i18n( " Spellcheck: %1 ").arg( "   " ), 3, 0, true );
+  statusBar()->insertItem(i18n( " Column: %1 ").arg("     "), 2, 0, true);
+  statusBar()->insertItem(i18n( " Line: %1 ").arg("     "), 1, 0, true);
 }
 
 
@@ -1638,9 +1638,9 @@ void KMComposeWin::updateCursorPosition()
   TQString temp;
   line = mEditor->currentLine();
   col = mEditor->currentColumn();
-  temp = i18n(" Line: %1 ").tqarg(line+1);
+  temp = i18n(" Line: %1 ").arg(line+1);
   statusBar()->changeItem(temp,1);
-  temp = i18n(" Column: %1 ").tqarg(col+1);
+  temp = i18n(" Column: %1 ").arg(col+1);
   statusBar()->changeItem(temp,2);
 }
 
@@ -2399,14 +2399,14 @@ bool KMComposeWin::addAttach(const KURL aUrl)
   if ( !aUrl.isValid() ) {
     KMessageBox::sorry( this, i18n( "<qt><p>KMail could not recognize the location of the attachment (%1);</p>"
                                  "<p>you have to specify the full path if you wish to attach a file.</p></qt>" )
-                        .tqarg( aUrl.prettyURL() ) );
+                        .arg( aUrl.prettyURL() ) );
     return false;
   }
 
   const int maxAttachmentSize = GlobalSettings::maximumAttachmentSize();
   const uint maximumAttachmentSizeInByte = maxAttachmentSize*1024*1024;
   if ( aUrl.isLocalFile() && TQFileInfo( aUrl.pathOrURL() ).size() > maximumAttachmentSizeInByte ) {
-    KMessageBox::sorry( this, i18n( "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</p>" ).tqarg( maxAttachmentSize ) );
+    KMessageBox::sorry( this, i18n( "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</p>" ).arg( maxAttachmentSize ) );
     return false;
   }
 
@@ -3114,7 +3114,7 @@ static void showExportError( TQWidget * w, const GpgME::Error & err ) {
   const TQString msg = i18n("<qt><p>An error occurred while trying to export "
 			   "the key from the backend:</p>"
 			   "<p><b>%1</b></p></qt>")
-    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+    .arg( TQString::fromLocal8Bit( err.asString() ) );
   KMessageBox::error( w, msg, i18n("Key Export Failed") );
 }
 
@@ -3153,7 +3153,7 @@ void KMComposeWin::slotPublicKeyExportResult( const GpgME::Error & err, const TQ
 
   // create message part
   KMMessagePart * msgPart = new KMMessagePart();
-  msgPart->setName( i18n("OpenPGP key 0x%1").tqarg( mFingerprint ) );
+  msgPart->setName( i18n("OpenPGP key 0x%1").arg( mFingerprint ) );
   msgPart->setTypeStr("application");
   msgPart->setSubtypeStr("pgp-keys");
   TQValueList<int> dummy;
@@ -4279,7 +4279,7 @@ bool KMComposeWin::saveDraftOrTemplate( const TQString &folderName,
                                      "identify \"%1\" does not exist (anymore); "
                                      "therefore, the default drafts or templates "
                                      "folder will be used.")
-                                .tqarg( id.identityName() ) );
+                                .arg( id.identityName() ) );
     }
   }
   if ( imapTheFolder && imapTheFolder->noContent() )
@@ -4463,7 +4463,7 @@ bool KMComposeWin::checkRecipientNumber() const
        GlobalSettings::self()->tooManyRecipients() &&
        mRecipientsEditor->recipients().count() > thresHold ) {
     if ( KMessageBox::questionYesNo( mMainWidget,
-                               i18n("You are trying to send the mail to more than %1 recipients. Send message anyway?").tqarg(thresHold),
+                               i18n("You are trying to send the mail to more than %1 recipients. Send message anyway?").arg(thresHold),
                                i18n("Too many receipients"),
                                i18n("&Send as Is"),
                                i18n("&Edit Recipients")) == KMessageBox::No ) {
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index bcc95d0a..4b45adc8 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -607,7 +607,7 @@ void KMEdit::slotExternalEditorTempFileChanged( const TQString & fileName ) {
 
   insertLine(TQString::fromLocal8Bit(KPIM::kFileToString( fileName, true, false )), -1);
   setAutoUpdate(true);
-  tqrepaint();
+  repaint();
 }
 
 void KMEdit::slotExternalEditorDone( KProcess * proc ) {
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index 4441b861..28a64633 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -113,7 +113,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const
 
     if ( FilterLog::instance()->isLogging() ) {
       TQString logText( i18n( "<b>Applying filter action:</b> %1" )
-                       .tqarg( (*it)->displayString() ) );
+                       .arg( (*it)->displayString() ) );
       FilterLog::instance()->add( logText, FilterLog::appliedAction );
     }
 
@@ -123,7 +123,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const
     case KMFilterAction::CriticalError:
       if ( FilterLog::instance()->isLogging() ) {
         TQString logText = TQString( "<font color=#FF0000>%1</font>" )
-          .tqarg( i18n( "A critical error occurred. Processing stops here." ) );
+          .arg( i18n( "A critical error occurred. Processing stops here." ) );
         FilterLog::instance()->add( logText, FilterLog::appliedAction );
       }
       // in case it's a critical error: return immediately!
@@ -131,7 +131,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const
     case KMFilterAction::ErrorButGoOn:
       if ( FilterLog::instance()->isLogging() ) {
         TQString logText = TQString( "<font color=#FF0000>%1</font>" )
-          .tqarg( i18n( "A problem was found while applying this action." ) );
+          .arg( i18n( "A problem was found while applying this action." ) );
         FilterLog::instance()->add( logText, FilterLog::appliedAction );
       }
     default:
@@ -262,7 +262,7 @@ void KMFilter::readConfig(KConfig* config)
     numActions = config->readNumEntry("actions",0);
     if (numActions > FILTER_MAX_ACTIONS) {
       numActions = FILTER_MAX_ACTIONS ;
-      KMessageBox::information( 0, i18n("<qt>Too many filter actions in filter rule <b>%1</b>.</qt>").tqarg( mPattern.name() ) );
+      KMessageBox::information( 0, i18n("<qt>Too many filter actions in filter rule <b>%1</b>.</qt>").arg( mPattern.name() ) );
     }
 
     for ( i=0 ; i < numActions ; i++ ) {
@@ -287,7 +287,7 @@ void KMFilter::readConfig(KConfig* config)
       } else
         KMessageBox::information( 0 /* app-global modal dialog box */,
                                   i18n("<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring it.</qt>")
-                                       .tqarg( config->readEntry( actName ) ).tqarg( mPattern.name() ) );
+                                       .arg( config->readEntry( actName ) ).arg( mPattern.name() ) );
     }
 
     mAccounts = config->readIntListEntry( "accounts-set" );
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp
index 86a7a3e4..6ea0dd9f 100644
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@@ -185,7 +185,7 @@ const TQString KMFilterActionWithUOID::argsAsString() const
 const TQString KMFilterActionWithUOID::displayString() const
 {
   // FIXME after string freeze:
-  // return i18n("").tqarg( );
+  // return i18n("").arg( );
   return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
 }
 
@@ -236,7 +236,7 @@ const TQString KMFilterActionWithString::argsAsString() const
 const TQString KMFilterActionWithString::displayString() const
 {
   // FIXME after string freeze:
-  // return i18n("").tqarg( );
+  // return i18n("").arg( );
   return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
 }
 
@@ -483,11 +483,11 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs
       }
       tf->close();
     }
-    // TQString( "%0 and %1 and %1" ).tqarg( 0 ).tqarg( 1 )
+    // TQString( "%0 and %1 and %1" ).arg( 0 ).arg( 1 )
     // returns "0 and 1 and %1", so we must call .arg as
     // many times as there are %n's, regardless of their multiplicity.
     if ((*it) == -1) result.replace( "%-1", tempFileName );
-    else result = result.tqarg( tempFileName );
+    else result = result.arg( tempFileName );
   }
 
   // And finally, replace the %{foo} with the content of the foo
@@ -810,7 +810,7 @@ KMFilterAction::ReturnCode KMFilterActionSeStatus::process(KMMessage* msg) const
   if ( idx < 1 ) return ErrorButGoOn;
 
   KMMsgStatus status = stati[idx-1] ;
-  msg->seStatus( status );
+  msg->setStatus( status );
   return GoOn;
 }
 
@@ -843,7 +843,7 @@ const TQString KMFilterActionSeStatus::argsAsString() const
 const TQString KMFilterActionSeStatus::displayString() const
 {
   // FIXME after string freeze:
-  // return i18n("").tqarg( );
+  // return i18n("").arg( );
   return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
 }
 
@@ -938,7 +938,7 @@ const TQString KMFilterActionFakeDisposition::argsAsString() const
 const TQString KMFilterActionFakeDisposition::displayString() const
 {
   // FIXME after string freeze:
-  // return i18n("").tqarg( );
+  // return i18n("").arg( );
   return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
 }
 
@@ -1123,7 +1123,7 @@ const TQString KMFilterActionAddHeader::argsAsString() const
 const TQString KMFilterActionAddHeader::displayString() const
 {
   // FIXME after string freeze:
-  // return i18n("").tqarg( );
+  // return i18n("").arg( );
   return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
 }
 
@@ -1299,7 +1299,7 @@ const TQString KMFilterActionRewriteHeader::argsAsString() const
 const TQString KMFilterActionRewriteHeader::displayString() const
 {
   // FIXME after string freeze:
-  // return i18n("").tqarg( );
+  // return i18n("").arg( );
   return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
 }
 
@@ -1617,9 +1617,9 @@ const TQString KMFilterActionForward::argsAsString() const
 const TQString KMFilterActionForward::displayString() const
 {
   if ( mTemplate.isEmpty() )
-    return i18n( "Forward to %1 with default template " ).tqarg( mParameter );
+    return i18n( "Forward to %1 with default template " ).arg( mParameter );
   else
-    return i18n( "Forward to %1 with template %2" ).tqarg( mParameter, mTemplate );
+    return i18n( "Forward to %1 with template %2" ).arg( mParameter, mTemplate );
 }
 
 //=============================================================================
@@ -1878,7 +1878,7 @@ const TQString KMFilterActionWithTest::argsAsString() const
 const TQString KMFilterActionWithTest::displayString() const
 {
   // FIXME after string freeze:
-  // return i18n("").tqarg( );
+  // return i18n("").arg( );
   return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
 }
 
@@ -1955,7 +1955,7 @@ const TQString KMFilterActionWithUrl::argsAsString() const
 const TQString KMFilterActionWithUrl::displayString() const
 {
   // FIXME after string freeze:
-  // return i18n("").tqarg( );
+  // return i18n("").arg( );
   return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
 }
 
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 5a9ed317..d484102a 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -339,11 +339,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
   connect( this, TQT_SIGNAL(finished()),
 	   this, TQT_SLOT(slotFinished()) );
 
-  KConfigGroup tqgeometry( KMKernel::config(), "Geometry");
+  KConfigGroup geometry( KMKernel::config(), "Geometry");
   const char * configKey
     = bPopFilter ? "popFilterDialogSize" : "filterDialogSize";
-  if ( tqgeometry.hasKey( configKey ) )
-    resize( tqgeometry.readSizeEntry( configKey ) );
+  if ( geometry.hasKey( configKey ) )
+    resize( geometry.readSizeEntry( configKey ) );
   else
     adjustSize();
 
@@ -356,8 +356,8 @@ void KMFilterDlg::slotFinished() {
 }
 
 void KMFilterDlg::slotSaveSize() {
-  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
-  tqgeometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
+  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  geometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
 }
 
 /** Set action of popFilter */
@@ -558,7 +558,7 @@ void KMFilterDlg::slotUpdateAccountList()
     TQCheckListItem *listItem =
       new TQCheckListItem( mAccountList, top, a->name(), TQCheckListItem::CheckBox );
     listItem->setText( 1, a->type() );
-    listItem->setText( 2, TQString( "%1" ).tqarg( a->id() ) );
+    listItem->setText( 2, TQString( "%1" ).arg( a->id() ) );
     if ( mFilter )
       listItem->setOn( mFilter->applyOnAccount( a->id() ) );
     top = listItem;
@@ -682,7 +682,7 @@ void KMFilterListBox::createFilter( const TQCString & field,
 
   KMFilter *newFilter = new KMFilter(0, bPopFilter);
   newFilter->pattern()->append( newRule );
-  newFilter->pattern()->setName( TQString("<%1>:%2").tqarg( TQString(field) ).tqarg( TQString(value) ) );
+  newFilter->pattern()->setName( TQString("<%1>:%2").arg( TQString(field) ).arg( TQString(value) ) );
 
   KMFilterActionDesc *desc = (*kmkernel->filterActionDict())["transfer"];
   if ( desc )
@@ -712,7 +712,7 @@ void KMFilterListBox::slotUpdateFilterName()
   if ( mFilterList.at(mIdxSelItem)->isAutoNaming() ) {
     // auto-naming of patterns
     if ( !p->isEmpty() && p->first() && !p->first()->field().stripWhiteSpace().isEmpty() )
-      shouldBeName = TQString( "<%1>: %2" ).tqarg( TQString(p->first()->field()) ).tqarg( TQString(p->first()->contents()) );
+      shouldBeName = TQString( "<%1>: %2" ).arg( TQString(p->first()->field()) ).arg( TQString(p->first()->contents()) );
     else
       shouldBeName = "<" + i18n("unnamed") + ">";
     p->setName( shouldBeName );
@@ -946,7 +946,7 @@ void KMFilterListBox::slotRename()
     (
      i18n("Rename Filter"),
      i18n("Rename filter \"%1\" to:\n(leave the field empty for automatic naming)")
-        .tqarg( filter->pattern()->name() ) /*label*/,
+        .arg( filter->pattern()->name() ) /*label*/,
      filter->pattern()->name() /* initial value */,
      &okPressed, topLevelWidget(), 0, validator
      );
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 3315c99e..de6814ca 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -80,7 +80,7 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName,
   dirinfo.setFile( mStorage->location() );
   if ( !dirinfo.exists() ) {
     int rc = mStorage->create();
-    TQString msg = i18n("<qt>Error while creating file <b>%1</b>:<br>%2</qt>").tqarg(aFolderName).tqarg(strerror(rc));
+    TQString msg = i18n("<qt>Error while creating file <b>%1</b>:<br>%2</qt>").arg(aFolderName).arg(strerror(rc));
     if ( rc ) {
       KMessageBox::information(0, msg);
     }
@@ -272,7 +272,7 @@ KMFolderDir* KMFolder::createChildFolder()
   {
     if (mkdir(TQFile::encodeName(childDir), S_IRWXU) != 0
       && chmod(TQFile::encodeName(childDir), S_IRWXU) != 0) {
-      TQString wmsg = TQString(" '%1': %2").tqarg(childDir).tqarg(strerror(errno));
+      TQString wmsg = TQString(" '%1': %2").arg(childDir).arg(strerror(errno));
       KMessageBox::information(0,i18n("Failed to create folder") + wmsg);
       return 0;
     }
@@ -828,15 +828,15 @@ int KMFolder::writeIndex( bool createEmptyIndex )
   return mStorage->writeIndex( createEmptyIndex );
 }
 
-void KMFolder::seStatus( int idx, KMMsgStatus status, bool toggle )
+void KMFolder::setStatus( int idx, KMMsgStatus status, bool toggle )
 {
-  mStorage->seStatus( idx, status, toggle );
+  mStorage->setStatus( idx, status, toggle );
 }
 
-void KMFolder::seStatus( TQValueList<int>& ids, KMMsgStatus status,
+void KMFolder::setStatus( TQValueList<int>& ids, KMMsgStatus status,
                           bool toggle )
 {
-  mStorage->seStatus( ids, status, toggle);
+  mStorage->setStatus( ids, status, toggle);
 }
 
 void KMFolder::setIconPaths( const TQString &normalPath,
@@ -929,7 +929,7 @@ bool KMFolder::isValidName( const TQString &folderName, TQString &message )
       }
     }
     if ( !delimiter.isEmpty() && folderName.find( delimiter ) != -1 ) {
-      message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).tqarg( delimiter );
+      message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).arg( delimiter );
       return false;
     }
   }
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index 82d586a2..abf0a2da 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -60,7 +60,7 @@ typedef TQValueList<TQ_UINT32> SerNumList;
  *
  * @section Accounts
  *   The accounts (of KMail) that are fed into the folder are
- *   represented as the tqchildren of the folder. They are only stored here
+ *   represented as the children of the folder. They are only stored here
  *   during runtime to have a reference for which accounts point to a
  *   specific folder.
  */
@@ -169,10 +169,10 @@ public:
   /** Specify, that the folder can't contain mails. */
   void setNoContent(bool aNoContent);
 
-  /** Returns, if the folder can't have tqchildren */
+  /** Returns, if the folder can't have children */
   bool noChildren() const;
 
-  /** Specify, that the folder can't have tqchildren */
+  /** Specify, that the folder can't have children */
   void setNoChildren(bool aNoChildren);
 
   /** Read message at given index. Indexing starts at zero */
@@ -273,7 +273,7 @@ public:
       contained by this folder */
   int countUnreadRecursive();
 
-  /** Called by KMMsgBase::seStatus when status of a message has changed
+  /** Called by KMMsgBase::setStatus when status of a message has changed
       required to keep the number unread messages variable current. */
   void msgStatusChanged( const KMMsgStatus oldStatus,
                          const KMMsgStatus newStatus,
@@ -490,10 +490,10 @@ public:
   int writeIndex( bool createEmptyIndex = false );
 
   /** Set the status of the message at index @p idx to @p status. */
-  void seStatus(int idx, KMMsgStatus status, bool toggle=false);
+  void setStatus(int idx, KMMsgStatus status, bool toggle=false);
 
   /** Set the status of the message(s) in the TQValueList @p ids to @p status. */
-  void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
+  void setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
 
   /** Icon related methods */
   bool useCustomIcons() const { return mUseCustomIcons; }
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index a55d2256..02bec8ed 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -215,7 +215,7 @@ KMFolderCachedImap::KMFolderCachedImap( KMFolder* folder, const char* aName )
         KMessageBox::error( 0,
         i18n( "The UID cache file for folder %1 could not be read. There "
               "could be a problem with file system permission, or it is corrupted."
-              ).tqarg( folder->prettyURL() ) );
+              ).arg( folder->prettyURL() ) );
         // try to unlink it, in case it was corruped. If it couldn't be read
         // because of permissions, this will fail, which is fine
         unlink( TQFile::encodeName( uidCacheLocation() ) );
@@ -486,7 +486,7 @@ int KMFolderCachedImap::writeUidCache()
   }
   KMessageBox::error( 0,
         i18n( "The UID cache file for folder %1 could not be written. There "
-              "could be a problem with file system permission." ).tqarg( folder()->prettyURL() ) );
+              "could be a problem with file system permission." ).arg( folder()->prettyURL() ) );
 
   return -1;
 }
@@ -739,7 +739,7 @@ void KMFolderCachedImap::slotTroubleshoot()
     TQString str = i18n("Are you sure you want to refresh the IMAP cache of "
                        "the folder %1 and all its subfolders?\nThis will "
                        "remove all changes you have done locally to your "
-                       "folders.").tqarg( label() );
+                       "folders.").arg( label() );
     TQString s1 = i18n("Refresh IMAP Cache");
     TQString s2 = i18n("&Refresh");
     if( KMessageBox::warningContinueCancel( 0, str, s1, s2 ) ==
@@ -774,7 +774,7 @@ void KMFolderCachedImap::slotTroubleshoot()
 void KMFolderCachedImap::serverSync( bool recurse, bool quotaOnly )
 {
   if( mSyncState != SYNC_STATE_INITIAL ) {
-    if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).tqarg( imapPath() ).tqarg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) {
+    if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).arg( imapPath() ).arg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) {
       mSyncState = SYNC_STATE_INITIAL;
     } else return;
   }
@@ -899,14 +899,14 @@ void KMFolderCachedImap::serverSyncInternal()
       // Cancelled by user, or slave can't start
       // kdDebug(5006) << "makeConnection said Error, aborting." << endl;
       // We stop here. We're already in SYNC_STATE_INITIAL for the next time.
-      newState( mProgress, i18n( "Error connecting to server %1" ).tqarg( mAccount->host() ) );
+      newState( mProgress, i18n( "Error connecting to server %1" ).arg( mAccount->host() ) );
       close("cachedimap");
       emit folderComplete(this, false);
       break;
     } else if ( cs == ImapAccountBase::Connecting ) {
       mAccount->setAnnotationCheckPassed( false );
       // kdDebug(5006) << "makeConnection said Connecting, waiting for signal." << endl;
-      newState( mProgress, i18n("Connecting to %1").tqarg( mAccount->host() ) );
+      newState( mProgress, i18n("Connecting to %1").arg( mAccount->host() ) );
       // We'll wait for the connectionResult signal from the account.
       connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
                this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
@@ -1478,7 +1478,7 @@ void KMFolderCachedImap::uploadNewMessages()
          && !(mUserRights & KMail::ACLJobs::Insert) ) {
       // write access revoked
       KMessageBox::information( 0, i18n("<p>Your access rights to folder <b>%1</b> have been restricted, "
-          "it will no longer be possible to add messages to this folder.</p>").tqarg( folder()->prettyURL() ),
+          "it will no longer be possible to add messages to this folder.</p>").arg( folder()->prettyURL() ),
           i18n("Acces rights revoked"), "KMailACLRevocationNotification" );
     }
   }
@@ -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::seStatus( int idx, KMMsgStatus status, bool toggle)
+void KMFolderCachedImap::setStatus( int idx, KMMsgStatus status, bool toggle)
 {
-  KMFolderMaildir::seStatus( idx, status, toggle );
+  KMFolderMaildir::setStatus( idx, status, toggle );
   const KMMsgBase *msg = getMsgBase( idx );
   Q_ASSERT( msg );
   if ( msg )
     mUIDsOfLocallyChangedStatuses.insert( msg->UID() );
 }
 
-void KMFolderCachedImap::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
+void KMFolderCachedImap::setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
 {
-  KMFolderMaildir::seStatus(ids, status, toggle);
+  KMFolderMaildir::setStatus(ids, status, toggle);
   for (TQValueList<int>::iterator it = ids.begin(); it != ids.end(); it++ ) {
     const KMMsgBase *msg = getMsgBase( *it );
     Q_ASSERT( msg );
@@ -1706,7 +1706,7 @@ bool KMFolderCachedImap::deleteMessages()
       if ( KMessageBox::warningYesNo(
              0, i18n( "<qt><p>Mails on the server in folder <b>%1</b> were deleted. "
                  "Do you want to delete them locally?<br>UIDs: %2</p></qt>" )
-             .tqarg( folder()->prettyURL() ).tqarg( uids.join(",") ) ) == KMessageBox::Yes )
+             .arg( folder()->prettyURL() ).arg( uids.join(",") ) ) == KMessageBox::Yes )
 #endif
         removeMsg( msgsForDeletion );
   }
@@ -2055,7 +2055,7 @@ void KMFolderCachedImap::listNamespaces()
   mNamespacesToList.pop_front();
 
   mSyncState = SYNC_STATE_LIST_SUBFOLDERS2;
-  newState( mProgress, i18n("Retrieving folders for namespace %1").tqarg(ns));
+  newState( mProgress, i18n("Retrieving folders for namespace %1").arg(ns));
   KMail::ListJob* job = new KMail::ListJob( mAccount, type, this,
       mAccount->addPathToNamespace( ns ) );
   job->setNamespace( ns );
@@ -2297,7 +2297,7 @@ void KMFolderCachedImap::listDirectory2()
       // (could be that the folder was deleted & recreated meanwhile from another client...)
       if ( !locallyDeleted && mAccount->isPreviouslyDeletedFolder( subfolderPath ) ) {
            locallyDeleted = KMessageBox::warningYesNo(
-             0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).tqarg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes;
+             0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).arg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes;
       }
 
       if ( locallyDeleted ) {
@@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState()
   KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem();
   TQString str = i18n("Aborted");
   if (progressItem)
-     progressItem->seStatus( str );
+     progressItem->setStatus( str );
   emit statusMsg( str );
   emit syncStateChanged();
 }
@@ -2618,9 +2618,9 @@ void KMFolderCachedImap::newState( int progress, const TQString& syncStatus )
     if ( mAccount->imapFolder() == this )
       str = syncStatus;
     else
-      str = TQString( "%1: %2" ).tqarg( label() ).tqarg( syncStatus );
+      str = TQString( "%1: %2" ).arg( label() ).arg( syncStatus );
     if( progressItem )
-      progressItem->seStatus( str );
+      progressItem->setStatus( str );
     emit statusMsg( str );
   }
   if( progressItem )
@@ -2809,7 +2809,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
       // that's when the imap server doesn't support annotations
       if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
            && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
-	KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).tqarg( mAccount->host() ) );
+	KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).arg( mAccount->host() ) );
       mAccount->setHasNoAnnotationSupport();
     }
     else
@@ -2837,7 +2837,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
       // that's when the imap server doesn't support annotations
       if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
            && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
-        KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).tqarg( mAccount->host() ) );
+        KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).arg( mAccount->host() ) );
       mAccount->setHasNoAnnotationSupport();
     }
     else
@@ -3063,7 +3063,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
   bool manualMove = true;
   while ( GlobalSettings::autoLostFoundMove() ) {
     // find the inbox of this account
-    KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").tqarg( account()->id() ) );
+    KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").arg( account()->id() ) );
     if ( !inboxFolder ) {
       kdWarning(5006) << k_funcinfo << "inbox not found!" << endl;
       break;
@@ -3119,7 +3119,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
           "on the server or you do not "
           "have sufficient access rights on the folder to upload them.</p>"
           "<p>All affected messages will therefore be moved to <b>%2</b> "
-          "to avoid data loss.</p>").tqarg( folder()->prettyURL() ).tqarg( dest->prettyURL() ),
+          "to avoid data loss.</p>").arg( folder()->prettyURL() ).arg( dest->prettyURL() ),
           i18n("Insufficient access rights") );
     manualMove = false;
     break;
@@ -3132,7 +3132,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
           "have sufficient access rights on the folder now to upload them. "
           "Please contact your administrator to allow upload of new messages "
           "to you, or move them out of this folder.</p> "
-          "<p>Do you want to move these messages to another folder now?</p>").tqarg( folder()->prettyURL() ) );
+          "<p>Do you want to move these messages to another folder now?</p>").arg( folder()->prettyURL() ) );
     if ( KMessageBox::warningYesNo( 0, msg, TQString(), i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) {
       KMail::KMFolderSelDlg dlg( kmkernel->getKMMainWidget(),
           i18n("Move Messages to Folder"), true );
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index bd084f00..a25637b3 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -285,8 +285,8 @@ public:
   void setACLList( const ACLList& arr );
 
   // Reimplemented so the mStatusChangedLocally bool can be set
-  virtual void seStatus( int id, KMMsgStatus status, bool toggle );
-  virtual void seStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle );
+  virtual void setStatus( int id, KMMsgStatus status, bool toggle );
+  virtual void setStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle );
 
   TQString annotationFolderType() const { return mAnnotationFolderType; }
 
@@ -590,7 +590,7 @@ private:
   bool mSharedSeenFlagsChanged;
 
  /**
-  * UIDs added by seStatus. Indicates that the client has changed
+  * UIDs added by setStatus. Indicates that the client has changed
   * the status of those mails. The mail flags for changed mails will be
   * uploaded to the server, overwriting the server's notion of the status
   * of the mails in this folder.
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 6e7b6b34..dead2a98 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -100,7 +100,7 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir,
 
   TQStringList folderNames;
   TQValueList<TQGuardedPtr<KMFolder> > folders;
-  // get all folders but search and folders that can not have tqchildren
+  // get all folders but search and folders that can not have children
   aParent->createFolderList(&folderNames, &folders, true, true,
                             true, false, true, false);
 
diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp
index 0c88bd2d..980d0b14 100644
--- a/kmail/kmfolderdir.cpp
+++ b/kmail/kmfolderdir.cpp
@@ -206,7 +206,7 @@ bool KMFolderDir::reload(void)
 
   if (!dir.cd(fldPath, TRUE))
   {
-    TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").tqarg(fldPath);
+    TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").arg(fldPath);
     KMessageBox::information(0, msg);
     return FALSE;
   }
@@ -214,7 +214,7 @@ bool KMFolderDir::reload(void)
   TQFileInfoList* fiList=(TQFileInfoList*)dir.entryInfoList();
   if (!fiList)
   {
-    TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").tqarg(fldPath);
+    TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").arg(fldPath);
     KMessageBox::information(0, msg);
     return FALSE;
   }
@@ -258,7 +258,7 @@ bool KMFolderDir::reload(void)
           // For this to be a cached IMAP folder, it must be in the KMail dimap
           // subdir and must be have a uidcache file or be a maildir folder
           TQString maildir(fname + "/new");
-          TQString imapcachefile = TQString::fromLatin1(".%1.uidcache").tqarg(fname);
+          TQString imapcachefile = TQString::fromLatin1(".%1.uidcache").arg(fname);
           if ( dir.exists( imapcachefile) || dir.exists( maildir ) )
           {
              folder = new KMFolder( this, fname, KMFolderTypeCachedImap );
diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h
index 687f9563..6d33add3 100644
--- a/kmail/kmfolderdir.h
+++ b/kmail/kmfolderdir.h
@@ -55,7 +55,7 @@ public:
   /** Returns the folder manager that manages this folder */
   virtual KMFolderMgr* manager() const;
 
-  /** Returns the folder whose tqchildren we are holding */
+  /** Returns the folder whose children we are holding */
   KMFolder* owner() const { return mOwner; }
 
   virtual KMFolderDirType type() const { return mDirType; }
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index 51e5762e..6d3d468e 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -245,7 +245,7 @@ void KMFolderImap::remove()
   jd.progressItem = ProgressManager::createProgressItem(
                       "ImapFolderRemove" + ProgressManager::getUniqueID(),
                       i18n("Removing folder"),
-                      i18n( "URL: %1" ).tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ),
+                      i18n( "URL: %1" ).arg( TQStyleSheet::escape( folder()->prettyURL() ) ),
                       false,
                       account()->useSSL() || account()->useTLS() );
   account()->insertJob(job, jd);
@@ -488,7 +488,7 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex
       mAddMessageProgressItem = ProgressManager::createProgressItem(
           "Uploading"+ProgressManager::getUniqueID(),
           i18n("Uploading message data"),
-          i18n("Destination folder: %1").tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ),
+          i18n("Destination folder: %1").arg( TQStyleSheet::escape( folder()->prettyURL() ) ),
           true,
           account()->useSSL() || account()->useTLS() );
       mAddMessageProgressItem->setTotalItems( msgList.count() );
@@ -849,7 +849,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames,
       // update progress
       account()->listDirProgressItem()->incCompletedItems();
       account()->listDirProgressItem()->updateProgress();
-      account()->listDirProgressItem()->seStatus( folder()->prettyURL() + i18n(" completed") );
+      account()->listDirProgressItem()->setStatus( folder()->prettyURL() + i18n(" completed") );
 
       f->initializeFrom( this, subfolderPaths[i], subfolderMimeTypes[i] );
       f->setChildrenState( subfolderAttributes[i] );
@@ -1003,11 +1003,11 @@ bool KMFolderImap::mailCheckInProgress() const
 //-----------------------------------------------------------------------------
 void KMFolderImap::setChildrenState( TQString attributes )
 {
-  // update tqchildren state
-  if ( attributes.find( "hastqchildren", 0, false ) != -1 )
+  // update children state
+  if ( attributes.find( "haschildren", 0, false ) != -1 )
   {
     setHasChildren( FolderStorage::HasChildren );
-  } else if ( attributes.find( "hasnotqchildren", 0, false ) != -1 ||
+  } else if ( attributes.find( "hasnochildren", 0, false ) != -1 ||
               attributes.find( "noinferiors", 0, false ) != -1 )
   {
     setHasChildren( FolderStorage::HasNoChildren );
@@ -1073,7 +1073,7 @@ void KMFolderImap::checkValidity()
     mMailCheckProgressItem->setProgress(0);
   }
   if ( account()->mailCheckProgressItem() ) {
-    account()->mailCheckProgressItem()->seStatus( folder()->prettyURL() );
+    account()->mailCheckProgressItem()->setStatus( folder()->prettyURL() );
   }
   ImapAccountBase::jobData jd( url.url() );
   KIO::SimpleJob *job = KIO::get(url, false, false);
@@ -1231,7 +1231,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
   if (startUid.isEmpty())
   {
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->seStatus( i18n("Retrieving message status") );
+      mMailCheckProgressItem->setStatus( i18n("Retrieving message status") );
     url.setPath(imapPath() + ";SECTION=UID FLAGS");
     KIO::SimpleJob *job = KIO::listDir(url, false);
     KIO::Scheduler::assignJobToSlave(account()->slave(), job);
@@ -1246,7 +1246,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
   } else {
     mContentState = imapDownloadInProgress;
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
+      mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
     url.setPath(imapPath() + ";UID=" + startUid
       + ":*;SECTION=ENVELOPE");
     KIO::SimpleJob *newJob = KIO::get(url, false, false);
@@ -1271,7 +1271,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
   if (job->error())
   {
     account()->handleJobError( job,
-         i18n("Error while listing the contents of the folder %1.").tqarg( label() ) );
+         i18n("Error while listing the contents of the folder %1.").arg( label() ) );
     account()->removeJob(it);
     finishMailCheck( "listfolder", imapNoInformation );
     return;
@@ -1341,7 +1341,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
     mMailCheckProgressItem->setCompletedItems( 0 );
     mMailCheckProgressItem->setTotalItems( jd.total );
     mMailCheckProgressItem->setProgress( 0 );
-    mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
+    mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
   }
 
   TQStringList sets;
@@ -1460,7 +1460,7 @@ void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg)
 
   const KMMsgStatus oldStatus = msg->status();
   if ( (flags & 1) && (oldStatus & KMMsgStatusOld) == 0 )
-    msg->seStatus( KMMsgStatusOld );
+    msg->setStatus( KMMsgStatusOld );
 
   // In case the message does not have the seen flag set, override our local
   // notion that it is read. Otherwise the count of unread messages and the
@@ -1468,10 +1468,10 @@ void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg)
   if ( msg->isOfUnknownStatus() || (!(flags&1) && !(oldStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) {
     if (newMsg) {
       if ( (oldStatus & KMMsgStatusNew) == 0 )
-        msg->seStatus( KMMsgStatusNew );
+        msg->setStatus( KMMsgStatusNew );
     } else {
       if ( (oldStatus & KMMsgStatusUnread) == 0 )
-        msg->seStatus( KMMsgStatusUnread );
+        msg->setStatus( KMMsgStatusUnread );
     }
   }
 }
@@ -1596,14 +1596,14 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
         }
         // Transfer the status, if it is cached.
         if ( md ) {
-          msg->seStatus( md->status() );
+          msg->setStatus( md->status() );
         } else if ( !account()->hasCapability("uidplus") ) {
           // see if we have cached the msgIdMD5 and get the status +
           // serial number from there
           TQString id = msg->msgIdMD5();
           if ( mMetaDataMap.find( id ) ) {
             md =  mMetaDataMap[id];
-            msg->seStatus( md->status() );
+            msg->setStatus( md->status() );
             if ( md->serNum() != 0 && serNum == 0 ) {
               msg->setMsgSerNum( md->serNum() );
             }
@@ -1880,15 +1880,15 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::seStatus(int idx, KMMsgStatus status, bool toggle)
+void KMFolderImap::setStatus(int idx, KMMsgStatus status, bool toggle)
 {
   TQValueList<int> ids; ids.append(idx);
-  seStatus(ids, status, toggle);
+  setStatus(ids, status, toggle);
 }
 
-void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle)
+void KMFolderImap::setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle)
 {
-  FolderStorage::seStatus(_ids, status, toggle);
+  FolderStorage::setStatus(_ids, status, toggle);
   TQValueList<int> ids;
   if ( mUploadAllFlags ) {
     kdDebug(5006) << k_funcinfo << "Migrating all flags to the server" << endl;
@@ -2284,7 +2284,7 @@ void KMFolderImap::setSubfolderState( imapState state )
   mSubfolderState = state;
   if ( state == imapNoInformation && folder()->child() )
   {
-    // pass through to tqchildren
+    // pass through to children
     KMFolderNode* node;
     TQPtrListIterator<KMFolderNode> it( *folder()->child() );
     for ( ; (node = it.current()); )
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 47ddfbdf..14b7d3b9 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -184,12 +184,12 @@ public:
    * Change the status of the message indicated by @p index
    * Overloaded function for the following one
    */
-  virtual void seStatus(int idx, KMMsgStatus status, bool toggle);
+  virtual void setStatus(int idx, KMMsgStatus status, bool toggle);
 
   /**
    * Change the status of several messages indicated by @p ids
    */
-  virtual void seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle);
+  virtual void setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle);
 
   /** generates sets of uids */
   static TQStringList makeSets( TQValueList<ulong>&, bool sort = true);
@@ -290,7 +290,7 @@ public:
   /**
    * Mark the folder as already removed from the server
    * If set to true the folder will only be deleted locally
-   * This will recursively be applied to all tqchildren
+   * This will recursively be applied to all children
    */
   void setAlreadyRemoved(bool removed);
 
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index 21e51fcb..e1c1b811 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -288,7 +288,7 @@ bool KMFolderIndex::readIndex()
 #ifdef OBSOLETE
     else if (mi->isNew())
     {
-      mi->seStatus(KMMsgStatusUnread);
+      mi->setStatus(KMMsgStatusUnread);
       mi->setDirty(false);
     }
 #endif
@@ -369,7 +369,7 @@ bool KMFolderIndex::readIndexHeader(int *gv)
 					    "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 					    "This index can be regenerated from your mail folder, but some "
 					    "information, including status flags, may be lost. Do you wish "
-					    "to downgrade your index file?") .tqarg(name()) .tqarg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") );
+					    "to downgrade your index file?") .arg(name()) .arg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") );
       kapp->restoreOverrideCursor();
       if (r == KMessageBox::Yes)
 	  createIndexFromContents();
@@ -527,7 +527,7 @@ void KMFolderIndex::recreateIndex( bool readIndexAfterwards )
   kapp->setOverrideCursor(KCursor::arrowCursor());
   KMessageBox::information(0,
        i18n("The mail index for '%1' is corrupted and will be regenerated now, "
-            "but some information, like status flags, might get lost.").tqarg(name()));
+            "but some information, like status flags, might get lost.").arg(name()));
   kapp->restoreOverrideCursor();
   createIndexFromContents();
   if ( readIndexAfterwards ) {
@@ -562,10 +562,10 @@ void KMFolderIndex::updateInvitationAndAddressFieldsFromContents()
         msg.fromDwString( msgString, false );
         msg.updateInvitationState();
         if ( msg.status() & KMMsgStatusHasInvitation ) {
-          msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasInvitation );
+          msgInfo->setStatus( msgInfo->status() | KMMsgStatusHasInvitation );
         }
         if ( msg.status() & KMMsgStatusHasNoInvitation ) {
-          msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasNoInvitation );
+          msgInfo->setStatus( msgInfo->status() | KMMsgStatusHasNoInvitation );
         }
         msgInfo->setFrom( msg.from() );
         msgInfo->setTo( msg.to() );
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 61f40e8b..2b4d155d 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -87,11 +87,11 @@ int KMFolderMaildir::canAccess()
     KCursorSaver idle(KBusyPtr::idle());
     if ( nRetVal == ENOENT )
       KMessageBox::sorry(0, i18n("Error opening %1; this folder is missing.")
-                         .tqarg(sBadFolderName));
+                         .arg(sBadFolderName));
     else
       KMessageBox::sorry(0, i18n("Error opening %1; either this is not a valid "
                                  "maildir folder, or you do not have sufficient access permissions.")
-                         .tqarg(sBadFolderName));
+                         .arg(sBadFolderName));
     return nRetVal;
   }
 
@@ -122,7 +122,7 @@ int KMFolderMaildir::open(const char *)
       TQString str;
       mIndexStream = 0;
       str = i18n("Folder `%1' changed; recreating index.")
-		  .tqarg(name());
+		  .arg(name());
       emit statusMsg(str);
     } else {
       mIndexStream = fopen(TQFile::encodeName(indexLocation()), "r+"); // index file
@@ -310,7 +310,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS
     // we can't have any New messages at this point
     if (mi->isNew())
     {
-      mi->seStatus(KMMsgStatusUnread);
+      mi->setStatus(KMMsgStatusUnread);
       setDirty( true );
     }
 #endif
@@ -385,7 +385,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
     msgParent->getMsg( idx );
   }
 
-  aMsg->seStatusFields();
+  aMsg->setStatusFields();
   if (aMsg->headerField("Content-Type").isEmpty())  // This might be added by
     aMsg->removeHeaderField("Content-Type");        // the line above
 
@@ -506,7 +506,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
       error |= appendToFolderIdsFile( idx );
 
     if (error) {
-      kdDebug(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl;
+      kdDebug(5006) << "Error: Could not add message to folder (No space left on device?)" << endl;
       if (ftell(mIndexStream) > revert) {
 	kdDebug(5006) << "Undoing changes" << endl;
 	truncate( TQFile::encodeName(indexLocation()), revert );
@@ -519,7 +519,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
       if (busy) kmkernel->kbp()->idle();
       KMessageBox::sorry(0,
         i18n("Unable to add message to folder.\n"
-	     "(No space left on tqdevice or insufficient quota?)\n"
+	     "(No space left on device or insufficient quota?)\n"
 	     "Free space and sufficient quota are required to continue safely."));
       if (busy) kmkernel->kbp()->busy();
       */
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index c16d64f0..1f8dc6ab 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -56,7 +56,7 @@ public:
   virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE)
   { return KMFolderIndex::removeMsg(msgList, imapQuiet); }
 
-  // Called by KMMsgBase::seStatus when status of a message has changed
+  // Called by KMMsgBase::setStatus when status of a message has changed
   // required to keep the number unread messages variable current.
   virtual void msgStatusChanged( const KMMsgStatus oldStatus,
                                  const KMMsgStatus newStatus,
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index c876e9a1..b82c3a29 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -109,7 +109,7 @@ int KMFolderMbox::open(const char *owner)
   if (!mStream)
   {
     KNotifyClient::event( 0, "warning",
-    i18n("Cannot open file \"%1\":\n%2").tqarg(location()).tqarg(strerror(errno)));
+    i18n("Cannot open file \"%1\":\n%2").arg(location()).arg(strerror(errno)));
     kdDebug(5006) << "Cannot open folder `" << location() << "': " << strerror(errno) << endl;
     mOpenCount = 0;
     return errno;
@@ -137,8 +137,8 @@ int KMFolderMbox::open(const char *owner)
                            "of KMail</a> for "
                            "information about how to prevent this "
                            "problem from happening again.</p></qt>")
-                      .tqarg("help:/kmail/faq.html#faq-index-regeneration")
-                      .tqarg(name());
+                      .arg("help:/kmail/faq.html#faq-index-regeneration")
+                      .arg(name());
         // When KMail is starting up we have to show a non-blocking message
         // box so that the initialization can continue. We don't show a
         // queued message box when KMail isn't starting up because queued
@@ -164,7 +164,7 @@ int KMFolderMbox::open(const char *owner)
        TQString str;
        mIndexStream = 0;
        str = i18n("Folder `%1' changed. Recreating index.")
-             .tqarg(name());
+             .arg(name());
        emit statusMsg(str);
      } else {
        mIndexStream = fopen(TQFile::encodeName(indexLocation()), "r+"); // index file
@@ -297,7 +297,7 @@ void KMFolderMbox::sync()
   if (mOpenCount > 0)
     if (!mStream || fsync(fileno(mStream)) ||
         !mIndexStream || fsync(fileno(mIndexStream))) {
-    kmkernel->emergencyExit( i18n("Could not sync index file <b>%1</b>: %2").tqarg( indexLocation() ).tqarg(errno ? TQString::fromLocal8Bit(strerror(errno)) : i18n("Internal error. Please copy down the details and report a bug.")));
+    kmkernel->emergencyExit( i18n("Could not sync index file <b>%1</b>: %2").arg( indexLocation() ).arg(errno ? TQString::fromLocal8Bit(strerror(errno)) : i18n("Internal error. Please copy down the details and report a bug.")));
     }
 }
 
@@ -682,7 +682,7 @@ int KMFolderMbox::createIndexFromContents()
                     replyToIdStr, replyToAuxIdStr, msgIdStr,
                     KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown,
                     KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid );
-          mi->seStatus(status, xstatus);
+          mi->setStatus(status, xstatus);
           mi->setDate( dateStr.stripWhiteSpace().data() );
           mi->setDirty(false);
           mMsgList.append(mi, mExportsSernums );
@@ -979,7 +979,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
     fileD0.close();  // If data is 0 we just create a zero length file.
 }
 */
-    aMsg->seStatusFields();
+    aMsg->setStatusFields();
 /*
 TQFile fileD1( "testdat_xx-kmfoldermbox-1" );
 if( fileD1.open( IO_WriteOnly ) ) {
@@ -1047,7 +1047,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
     if (busy) kmkernel->kbp()->idle();
     KMessageBox::sorry(0,
           i18n("Unable to add message to folder.\n"
-               "(No space left on tqdevice or insufficient quota?)\n"
+               "(No space left on device or insufficient quota?)\n"
                "Free space and sufficient quota are required to continue safely."));
     if (busy) kmkernel->kbp()->busy();
     kmkernel->kbp()->idle();
@@ -1118,7 +1118,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
       error |= appendToFolderIdsFile( idx );
 
     if (error) {
-      kdWarning(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl;
+      kdWarning(5006) << "Error: Could not add message to folder (No space left on device?)" << endl;
       if (ftell(mIndexStream) > revert) {
         kdWarning(5006) << "Undoing changes" << endl;
         truncate( TQFile::encodeName(indexLocation()), revert );
@@ -1126,14 +1126,14 @@ if( fileD1.open( IO_WriteOnly ) ) {
       if ( errno )
         kmkernel->emergencyExit( i18n("Could not add message to folder:") + TQString::fromLocal8Bit(strerror(errno)));
       else
-        kmkernel->emergencyExit( i18n("Could not add message to folder (No space left on tqdevice?)") );
+        kmkernel->emergencyExit( i18n("Could not add message to folder (No space left on device?)") );
 
       /* This code may not be 100% reliable
       bool busy = kmkernel->kbp()->isBusy();
       if (busy) kmkernel->kbp()->idle();
       KMessageBox::sorry(0,
         i18n("Unable to add message to folder.\n"
-             "(No space left on tqdevice or insufficient quota?)\n"
+             "(No space left on device or insufficient quota?)\n"
              "Free space and sufficient quota are required to continue safely."));
       if (busy) kmkernel->kbp()->busy();
       */
@@ -1240,7 +1240,7 @@ int KMFolderMbox::compact( bool silent )
   // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it
   TQString statusMsg = BroadcastStatus::instance()->statusMsg();
   emit changed();
-  BroadcastStatus::instance()->seStatusMsg( statusMsg );
+  BroadcastStatus::instance()->setStatusMsg( statusMsg );
   return rc;
 }
 
diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h
index 8cc8830b..68b52aca 100644
--- a/kmail/kmfoldermbox.h
+++ b/kmail/kmfoldermbox.h
@@ -39,7 +39,7 @@ using KMail::AttachmentStrategy;
  *
  * Accounts:
  *   The accounts (of KMail) that are fed into the folder are
- *   represented as the tqchildren of the folder. They are only stored here
+ *   represented as the children of the folder. They are only stored here
  *   during runtime to have a reference for which accounts point to a
  *   specific folder.
  */
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index c4df4904..34958e5a 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -146,7 +146,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath)
    if ( !info.isDir() ) {
       KMessageBox::sorry(0, i18n("'%1' does not appear to be a folder.\n"
                                  "Please move the file out of the way.")
-                            .tqarg( mBasePath ) );
+                            .arg( mBasePath ) );
       ::exit(-1);
     }
     if ( !info.isReadable() || !info.isWritable() ) {
@@ -154,7 +154,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath)
                                "incorrect;\n"
                                "please make sure that you can view and modify "
                                "the content of this folder.")
-                            .tqarg( mBasePath ) );
+                            .arg( mBasePath ) );
       ::exit(-1);
     }
    } else {
@@ -163,7 +163,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath)
       KMessageBox::sorry(0, i18n("KMail could not create folder '%1';\n"
                                  "please make sure that you can view and "
                                  "modify the content of the folder '%2'.")
-                            .tqarg( mBasePath ).tqarg( TQDir::homeDirPath() ) );
+                            .arg( mBasePath ).arg( TQDir::homeDirPath() ) );
       ::exit(-1);
     }
   }
@@ -326,7 +326,7 @@ KMFolder* KMFolderMgr::findOrCreate(const TQString& aFolderName, bool sysFldr,
 
     folder = createFolder(aFolderName, sysFldr, type);
     if (!folder) {
-      KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").tqarg(aFolderName).tqarg(mBasePath)));
+      KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").arg(aFolderName).arg(mBasePath)));
       exit(-1);
     }
     if ( id > 0 )
@@ -402,7 +402,7 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success)
   // aFolder will be deleted by the next call!
   aFolder->parent()->remove(aFolder);
 
-  // update the tqchildren state
+  // update the children state
   if ( parentF )
   {
     if ( parentF != aFolder )
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 2c59b398..a0fe190d 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -267,14 +267,14 @@ void KMFolderTreeItem::slotIconsChanged()
   else
     setPixmap( 0, normalIcon( iconSize() ) );
   emit iconChanged( this );
-  tqrepaint();
+  repaint();
 }
 
 void KMFolderTreeItem::slotNameChanged()
 {
   setText( 0, mFolder->label() );
   emit nameChanged( this );
-  tqrepaint();
+  repaint();
 }
 
 void KMFolderTreeItem::slotNoContentChanged()
@@ -556,7 +556,7 @@ void KMFolderTree::reload(bool openFolders)
 
   int top = contentsY();
   mLastItem = 0;
-  // tqinvalidate selected drop item
+  // invalidate selected drop item
   oldSelected = 0;
   // remember last
   KMFolder* last = currentFolder();
@@ -743,7 +743,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
 
       // create new child
       fti = new KMFolderTreeItem( parent, folder->label(), folder );
-      // set folders explicitely to exandable when they have tqchildren
+      // set folders explicitely to exandable when they have children
       // this way we can do a listing for IMAP folders when the user expands them
       // even when the child folders are not created yet
       if ( folder->storage()->hasChildren() == FolderStorage::HasChildren ) {
@@ -800,7 +800,7 @@ void KMFolderTree::delayedUpdate()
         continue;
 
       if ( fti->needsRepaint() ) {
-        fti->tqrepaint();
+        fti->repaint();
         fti->setNeedsRepaint( false );
       }
     }
@@ -918,7 +918,7 @@ bool KMFolderTree::checkUnreadFolder (KMFolderTreeItem* fti, bool confirm)
       //  parameter (kept in the config file for kmail)
       if ( KMessageBox::questionYesNo( this,
             i18n( "<qt>Go to the next unread message in folder <b>%1</b>?</qt>" )
-            .tqarg( fti->folder()->label() ),
+            .arg( fti->folder()->label() ),
             i18n( "Go to Next Unread Message" ),
             i18n("Go To"), i18n("Do Not Go To"), // defaults
             "AskNextFolder",
@@ -1280,7 +1280,7 @@ void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent )
       const TQString message = i18n( "<qt>Cannot create folder under <b>%1</b> because of insufficient "
                                     "permissions on the server. If you think you should be able to create "
                                     "subfolders here, ask your administrator to grant you rights to do so."
-                                    "</qt> " ).tqarg(aFolder->label());
+                                    "</qt> " ).arg(aFolder->label());
       KMessageBox::error( this, message );
       return;
     }
@@ -1419,7 +1419,7 @@ void KMFolderTree::openFolder()
     autoopen_timer.stop();
     if ( dropItem && !dropItem->isOpen() ) {
         dropItem->setOpen( true );
-        dropItem->tqrepaint();
+        dropItem->repaint();
     }
 }
 
@@ -1987,7 +1987,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
 
     if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( sourceFolderName ) ) {
       KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same name already exists.</qt>")
-          .tqarg( sourceFolderName ) );
+          .arg( sourceFolderName ) );
       setDragEnabled( true );
       return;
     }
@@ -1998,7 +1998,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
     while ( f ) {
       if ( f->moveInProgress() ) {
         KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied itself.</qt>")
-            .tqarg( sourceFolderName ) );
+            .arg( sourceFolderName ) );
         setDragEnabled( true );
         return;
       }
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 1e9e5d13..7b5d2a3c 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -719,7 +719,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       disconnect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ),
-                  BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
+                  BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
       disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
       writeSortOrder();
       mFolder->close("kmheaders");
@@ -752,7 +752,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       connect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)),
-              BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
+              BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
       connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
           this, TQT_SLOT(setFolderInfoStatus()));
       connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
@@ -935,9 +935,9 @@ void KMHeaders::msgAdded(int id)
     }
 
     if (parent && mFolder->getMsgBase(parent->id())->isWatched())
-      mFolder->getMsgBase(id)->seStatus( KMMsgStatusWatched );
+      mFolder->getMsgBase(id)->setStatus( KMMsgStatusWatched );
     else if (parent && mFolder->getMsgBase(parent->id())->isIgnored())
-      mFolder->getMsgBase(id)->seStatus( KMMsgStatusIgnored );
+      mFolder->getMsgBase(id)->setStatus( KMMsgStatusIgnored );
     if (parent)
       hi = new HeaderItem( parent->item(), id );
     else
@@ -1115,7 +1115,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
     if ( mSubjThreading && removedItem->sortCacheItem()->subjectThreadingList() )
       removedItem->sortCacheItem()->subjectThreadingList()->removeRef( removedItem->sortCacheItem() );
 
-    // Reparent tqchildren of item.
+    // Reparent children of item.
     TQListViewItem *myParent = removedItem;
     TQListViewItem *myChild = myParent->firstChild();
     TQListViewItem *threadRoot = myParent;
@@ -1214,7 +1214,7 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId)
   HeaderItem *item = mItems[msgId];
   if (item) {
     item->irefresh();
-    item->tqrepaint();
+    item->repaint();
   }
 }
 
@@ -1399,11 +1399,11 @@ void KMHeaders::setFolderInfoStatus ()
   else
     str = unread ? i18n( "1 unread", "%n unread", unread ) : i18n( "0 unread" );
   const int count = mFolder->count();
-  str = count ? i18n( "1 message, %1.", "%n messages, %1.", count ).tqarg( str )
+  str = count ? i18n( "1 message, %1.", "%n messages, %1.", count ).arg( str )
               : i18n( "0 messages" ); // no need for "0 unread" to be added here
   if ( mFolder->isReadOnly() )
-    str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").tqarg( str );
-  BroadcastStatus::instance()->seStatusMsg(str);
+    str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").arg( str );
+  BroadcastStatus::instance()->setStatusMsg(str);
 }
 
 //-----------------------------------------------------------------------------
@@ -1451,8 +1451,8 @@ void KMHeaders::applyFiltersOnMsg()
       if ( msgCountToFilter - msgCount < 10 || !( msgCount % 20 ) || msgCount <= 10 ) {
         progressItem->updateProgress();
         TQString statusMsg = i18n("Filtering message %1 of %2");
-        statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter );
-        KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg );
+        statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
+        KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
         KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
       }
 
@@ -1523,7 +1523,7 @@ void KMHeaders::deleteMsg ()
            this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) );
   command->start();
 
-  BroadcastStatus::instance()->seStatusMsg("");
+  BroadcastStatus::instance()->setStatusMsg("");
   //  triggerUpdate();
 }
 
@@ -1620,11 +1620,11 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
   if ( command->result() == KMCommand::OK ) {
     // make sure the current item is shown
     makeHeaderVisible();
-    BroadcastStatus::instance()->seStatusMsg(
+    BroadcastStatus::instance()->setStatusMsg(
        deleted ? i18n("Messages deleted successfully.") : i18n("Messages moved successfully") );
   } else {
     /* The move failed or the user canceled it; reset the state of all
-     * messages involved and tqrepaint.
+     * messages involved and repaint.
      *
      * Note: This potentially resets too many items if there is more than one
      *       move going on. Oh well, I suppose no animals will be harmed.
@@ -1643,10 +1643,10 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
     }
     triggerUpdate();
     if ( command->result() == KMCommand::Failed )
-      BroadcastStatus::instance()->seStatusMsg(
+      BroadcastStatus::instance()->setStatusMsg(
            deleted ? i18n("Deleting messages failed.") : i18n("Moving messages failed.") );
     else
-      BroadcastStatus::instance()->seStatusMsg(
+      BroadcastStatus::instance()->setStatusMsg(
            deleted ? i18n("Deleting messages canceled.") : i18n("Moving messages canceled.") );
  }
  mOwner->updateMessageActions();
@@ -1714,7 +1714,7 @@ void KMHeaders::setSelected( TQListViewItem *item, bool selected )
     KListView::setSelected( item, selected );
 
   // If the item is the parent of a closed thread recursively select
-  // tqchildren .
+  // children .
   if ( isThreaded() && !item->isOpen() && item->firstChild() ) {
       TQListViewItem *nextRoot = item->itemBelow();
       TQListViewItemIterator it( item->firstChild() );
@@ -1828,7 +1828,7 @@ void KMHeaders::selectNextMessage()
         temp->firstChild();
         temp = temp->parent();
       }
-      lvi->tqrepaint();
+      lvi->repaint();
       /* test to see if we need to unselect messages on back track */
       (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true));
       setCurrentItem(below);
@@ -1866,7 +1866,7 @@ void KMHeaders::selectPrevMessage()
         temp->firstChild();
         temp = temp->parent();
       }
-      lvi->tqrepaint();
+      lvi->repaint();
       /* test to see if we need to unselect messages on back track */
       (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true));
       setCurrentItem(above);
@@ -1997,7 +1997,7 @@ int KMHeaders::findUnread(bool aDirNext, int aStartAt, bool onlyNew, bool accept
   // first unread item.
   //
   // Find the ancestor of the unread item closest to the
-  // root and recursively sort all of that ancestors tqchildren.
+  // root and recursively sort all of that ancestors children.
   if (item) {
     TQListViewItem *next = item;
     while (next->parent())
@@ -2135,10 +2135,10 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread)
     return;
   }
 
-  BroadcastStatus::instance()->seStatusMsg("");
+  BroadcastStatus::instance()->setStatusMsg("");
   if (markitread && idx >= 0) setMsgRead(idx);
   mItems[idx]->irefresh();
-  mItems[idx]->tqrepaint();
+  mItems[idx]->repaint();
   emit selected( msg );
   setFolderInfoStatus();
 }
@@ -2151,7 +2151,7 @@ void KMHeaders::highlightCurrentThread()
   for ( it.toFirst() ; it.current() ; ++it ) {
       TQListViewItem *lvi = *it;
       lvi->setSelected( true );
-      lvi->tqrepaint();
+      lvi->repaint();
   }
 }
 
@@ -2192,7 +2192,7 @@ void KMHeaders::updateMessageList( bool set_selection, bool forceJumpToUnread )
   noRepaint = false;
   KListView::setSorting( mSortCol, !mSortDescending );
   if (!mFolder) {
-    tqrepaint();
+    repaint();
     return;
   }
   readSortOrder( set_selection, forceJumpToUnread );
@@ -2290,7 +2290,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
      if ( rootDecoClicked ) {
         // Check if our item is the parent of a closed thread and if so, if the root
         // decoration of the item was clicked (i.e. the +/- sign) which would expand
-        // the thread. In that case, deselect all tqchildren, so opening the thread
+        // the thread. In that case, deselect all children, so opening the thread
         // doesn't cause a flicker.
         if ( !lvi->isOpen() && lvi->firstChild() ) {
            TQListViewItem *nextRoot = lvi->itemBelow();
@@ -2315,7 +2315,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
   }
 
   if ( rootDecoClicked ) {
-      // select the thread's tqchildren after closing if the parent is selected
+      // select the thread's children after closing if the parent is selected
      if ( lvi && !lvi->isOpen() && lvi->isSelected() )
         setSelected( lvi, true );
   }
@@ -2324,7 +2324,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
     if ( lvi != currentItem() )
       highlightMessage( lvi );
     /* Explicitely set selection state. This is necessary because we want to
-     * also select all tqchildren of closed threads when the parent is selected. */
+     * also select all children of closed threads when the parent is selected. */
 
     // unless ctrl mask, set selected if it isn't already
     if ( !( e->state() & ControlButton ) && !wasSelected )
@@ -2813,9 +2813,9 @@ bool KMHeaders::writeSortOrder()
     if (sortStream && ferror(sortStream)) {
         fclose(sortStream);
         unlink(TQFile::encodeName(sortFile));
-        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl;
+        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl;
         kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
-        kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").tqarg( sortFile ));
+        kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile ));
     }
     fclose(sortStream);
     ::rename(TQFile::encodeName(tempName), TQFile::encodeName(sortFile));
@@ -2853,9 +2853,9 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi)
     if (sortStream && ferror(sortStream)) {
         fclose(sortStream);
         unlink(TQFile::encodeName(sortFile));
-        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl;
+        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl;
         kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
-        kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").tqarg( sortFile ));
+        kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile ));
     }
     fclose(sortStream);
   } else {
@@ -3321,7 +3321,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
             qsort(unsorted, unsorted_count, sizeof(SortCacheItem *), //sort
                   compare_SortCacheItem);
 
-        /* The sorted list now contains all sorted tqchildren of this item, while
+        /* The sorted list now contains all sorted children of this item, while
          * the (aptly named) unsorted array contains all as of yet unsorted
          * ones. It has just been qsorted, so it is in itself sorted. These two
          * sorted lists are now merged into one. */
@@ -3353,11 +3353,11 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
 
             if(threaded && i->item()) {
                 // If the parent is watched or ignored, propagate that to it's
-                // tqchildren
+                // children
                 if (mFolder->getMsgBase(i->id())->isWatched())
-                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusWatched);
+                  mFolder->getMsgBase(new_kci->id())->setStatus(KMMsgStatusWatched);
                 if (mFolder->getMsgBase(i->id())->isIgnored())
-                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusIgnored);
+                  mFolder->getMsgBase(new_kci->id())->setStatus(KMMsgStatusIgnored);
                 khi = new HeaderItem(i->item(), new_kci->id(), new_kci->key());
             } else {
                 khi = new HeaderItem(this, new_kci->id(), new_kci->key());
@@ -3499,7 +3499,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
         if ( sortStream )
             fclose(sortStream);
         unlink(TQFile::encodeName(sortFile));
-        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl;
+        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl;
         kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
 
         return true;
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index 6541d4a9..3dce0a66 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -286,12 +286,12 @@ public slots:
   virtual void ensureCurrentItemVisible();
 
   /** Select an item and if it is the parent of a closed thread, also
-    recursively select its tqchildren. */
+    recursively select its children. */
   virtual void setSelected(TQListViewItem *item, bool selected);
 
   /** Select several items by message index
    * and if they are the parent of a closed thread, also
-   * recursively select their tqchildren. */
+   * recursively select their children. */
   void setSelectedByIndex(TQValueList<int> items, bool selected);
 
   /** switch a column with the given id (see KPaintInfo enum)
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index a7624d84..ef6ee4f7 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -947,7 +947,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
 
         if ( !MsgStatusFlags.isEmpty() ) {
           KMMsgStatus status = strToStatus(MsgStatusFlags);
-          if (status) msg->seStatus(status);
+          if (status) msg->setStatus(status);
         }
 
         int index;
@@ -1060,7 +1060,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
 
       if( !MsgStatusFlags.isEmpty() ) {
         KMMsgStatus status = strToStatus(MsgStatusFlags);
-        if (status) msg->seStatus(status);
+        if (status) msg->setStatus(status);
       }
 
       if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) {
@@ -1211,9 +1211,9 @@ TQString KMKernel::debugSernum( TQ_UINT32 serialNumber )
       msg = folder->getMsgBase( idx );
       if (msg) {
         res.append( TQString( " subject %s,\n sender %s,\n date %s.\n" )
-                             .tqarg( msg->subject() )
-                             .tqarg( msg->fromStrip() )
-                             .tqarg( msg->dateStr() ) );
+                             .arg( msg->subject() )
+                             .arg( msg->fromStrip() )
+                             .arg( msg->dateStr() ) );
       } else {
         res.append( TQString( "Invalid serial number." ) );
       }
@@ -1243,7 +1243,7 @@ void KMKernel::stopNetworkJobs()
     return;
 
   GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Offline );
-  BroadcastStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
+  BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
   emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
 }
 
@@ -1253,7 +1253,7 @@ void KMKernel::resumeNetworkJobs()
     return;
 
   GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Online );
-  BroadcastStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
+  BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
   emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
 
   if ( kmkernel->msgSender()->sendImmediate() ) {
@@ -1360,7 +1360,7 @@ void KMKernel::testDir(const char *_name)
       KMessageBox::sorry(0, i18n("KMail could not create folder '%1';\n"
                                  "please make sure that you can view and "
                                  "modify the content of the folder '%2'.")
-                            .tqarg( foldersPath ).tqarg( TQDir::homeDirPath() ) );
+                            .arg( foldersPath ).arg( TQDir::homeDirPath() ) );
       ::exit(-1);
     }
   }
@@ -1369,7 +1369,7 @@ void KMKernel::testDir(const char *_name)
                                "incorrect;\n"
                                "please make sure that you can view and modify "
                                "the content of this folder.")
-                          .tqarg( foldersPath ) );
+                          .arg( foldersPath ) );
     ::exit(-1);
   }
 }
@@ -1673,7 +1673,7 @@ void KMKernel::cleanupImapFolders()
       cfld = static_cast<KMFolderCachedImap*>(the_dimapFolderMgr->createFolder(TQString::number(acct->id()),
             false, KMFolderTypeCachedImap)->storage());
       if (!cfld) {
-        KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").tqarg(acct->name()).tqarg(the_dimapFolderMgr->basePath())));
+        KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").arg(acct->name()).arg(the_dimapFolderMgr->basePath())));
         exit(-1);
       }
       cfld->folder()->setId( acct->id() );
@@ -1884,8 +1884,8 @@ bool KMKernel::transferMail( TQString & destinationDir )
                 "the same name in <i>%7</i>.<p>"
                 "<strong>Would you like %3 to move the mail "
                 "files now?</strong></qt>" )
-          .tqarg( kmailName, kmailName, kmailName )
-          .tqarg( dir, destinationDir, dir, destinationDir );
+          .arg( kmailName, kmailName, kmailName )
+          .arg( dir, destinationDir, dir, destinationDir );
   } else {
     msg = i18n( "%1-%3 is the application name, %4-%6 are folder path",
                 "<qt>The <i>%4</i> folder exists. "
@@ -1894,8 +1894,8 @@ bool KMKernel::transferMail( TQString & destinationDir )
                 "this folder for you.<p>"
                 "<strong>Would you like %3 to move the mail "
                 "files now?</strong></qt>" )
-          .tqarg( kmailName, kmailName, kmailName )
-          .tqarg( dir, destinationDir, dir );
+          .arg( kmailName, kmailName, kmailName )
+          .arg( dir, destinationDir, dir );
   }
   TQString title = i18n( "Migrate Mail Files?" );
   TQString buttonText = i18n( "Move" );
@@ -2047,7 +2047,7 @@ void KMKernel::slotResult(KIO::Job *job)
     {
       if (KMessageBox::warningContinueCancel(0,
         i18n("File %1 exists.\nDo you want to replace it?")
-        .tqarg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace"))
+        .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue)
         byteArrayToRemoteFile((*it).data, (*it).url, true);
     }
@@ -2135,7 +2135,7 @@ void KMKernel::emergencyExit( const TQString& reason )
     mesg = i18n("KMail encountered a fatal error and will terminate now");
   } else {
     mesg = i18n("KMail encountered a fatal error and will "
-                      "terminate now.\nThe error was:\n%1").tqarg( reason );
+                      "terminate now.\nThe error was:\n%1").arg( reason );
   }
 
   kdWarning() << mesg << endl;
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index db2763b9..c078cfe7 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -132,7 +132,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
           KIO::NetAccess::removeTempFile( fileName );
         } else {
           TQString caption( i18n( "vCard Import Failed" ) );
-          TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).tqarg( (*it).url() );
+          TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).arg( (*it).url() );
           KMessageBox::error( parentWidget(), text, caption );
         }
       }
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 36556a1d..392f348b 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -287,13 +287,13 @@ void KMMainWidget::destruct()
 //-----------------------------------------------------------------------------
 void KMMainWidget::readPreConfig(void)
 {
-  const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
   const KConfigGroup reader( KMKernel::config(), "Reader" );
 
-  mLongFolderList = tqgeometry.readEntry( "FolderList", "long" ) != "short";
-  mReaderWindowActive = tqgeometry.readEntry( "readerWindowMode", "below" ) != "hide";
-  mReaderWindowBelow = tqgeometry.readEntry( "readerWindowMode", "below" ) == "below";
-  mThreadPref = tqgeometry.readBoolEntry( "nestedMessages", false );
+  mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short";
+  mReaderWindowActive = geometry.readEntry( "readerWindowMode", "below" ) != "hide";
+  mReaderWindowBelow = geometry.readEntry( "readerWindowMode", "below" ) == "below";
+  mThreadPref = geometry.readBoolEntry( "nestedMessages", false );
 
   mHtmlPref = reader.readBoolEntry( "htmlMail", false );
   mHtmlLoadExtPref = reader.readBoolEntry( "htmlLoadExternal", false );
@@ -516,7 +516,7 @@ void KMMainWidget::writeConfig(void)
 {
   TQString s;
   KConfig *config = KMKernel::config();
-  KConfigGroup tqgeometry( config, "Geometry" );
+  KConfigGroup geometry( config, "Geometry" );
 
   if (mMsgView)
     mMsgView->writeConfig();
@@ -527,24 +527,24 @@ void KMMainWidget::writeConfig(void)
   if ( mFavoriteFolderView )
     mFavoriteFolderView->writeConfig();
 
-  tqgeometry.writeEntry( "MainWin", this->tqgeometry().size() );
+  geometry.writeEntry( "MainWin", this->geometry().size() );
 
   const TQValueList<int> widths = ( mLongFolderList ? mPanner1 : mPanner2 )->sizes();
   const TQValueList<int> heights = ( mLongFolderList ? mPanner2 : mPanner1 )->sizes();
 
-  tqgeometry.writeEntry( "FolderPaneWidth", widths[0] );
-  tqgeometry.writeEntry( "HeaderPaneWidth", widths[1] );
+  geometry.writeEntry( "FolderPaneWidth", widths[0] );
+  geometry.writeEntry( "HeaderPaneWidth", widths[1] );
 
   // Only save when the widget is shown (to avoid saving a wrong value)
   if ( mSearchAndHeaders && mSearchAndHeaders->isShown() ) {
-    tqgeometry.writeEntry( "HeaderPaneHeight", heights[0] );
-    tqgeometry.writeEntry( "ReaderPaneHeight", heights[1] );
+    geometry.writeEntry( "HeaderPaneHeight", heights[0] );
+    geometry.writeEntry( "ReaderPaneHeight", heights[1] );
   }
 
   // save the state of the unread/total-columns
-  tqgeometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() );
-  tqgeometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() );
-  tqgeometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() );
+  geometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() );
+  geometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() );
+  geometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() );
 }
 
 
@@ -950,7 +950,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
         summary += "<br>" + i18n( "1 new message in %1",
                                   "%n new messages in %1",
                                   newInFolder.find( *it ).data() )
-                            .tqarg( folder->prettyURL() );
+                            .arg( folder->prettyURL() );
       }
     }
   }
@@ -965,7 +965,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
   if ( GlobalSettings::self()->verboseNewMailNotification() ) {
     summary = i18n( "%1 is a list of the number of new messages per folder",
                     "<b>New mail arrived</b><br>%1" )
-              .tqarg( summary );
+              .arg( summary );
   }
   else {
     summary = i18n( "New mail arrived" );
@@ -1097,7 +1097,7 @@ void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem )
   KMFolder* folder = folderItem->folder();
   KMFolderTree* folderTree = static_cast<KMFolderTree *>( folderItem->listView() );
   KMFolderDialog props( folder, folder->parent(), folderTree,
-                        i18n("Properties of Folder %1").tqarg( folder->label() ) );
+                        i18n("Properties of Folder %1").arg( folder->label() ) );
   props.exec();
   updateFolderMenu();
   //Kolab issue 2152
@@ -1129,7 +1129,7 @@ void KMMainWidget::slotExpireFolder()
   KConfigGroupSaver saver(config, "General");
 
   if (config->readBoolEntry("warn-before-expire", true)) {
-    str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape( mFolder->label() ));
+    str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").arg(TQStyleSheet::escape( mFolder->label() ));
     if (KMessageBox::warningContinueCancel(this, str, i18n("Expire Folder"),
 					   i18n("&Expire"))
 	!= KMessageBox::Continue) return;
@@ -1152,7 +1152,7 @@ void KMMainWidget::slotEmptyFolder()
     TQString text = (isTrash) ?
       i18n("Are you sure you want to empty the trash folder?") :
       i18n("<qt>Are you sure you want to move all messages from "
-           "folder <b>%1</b> to the trash?</qt>").tqarg( TQStyleSheet::escape( mFolder->label() ) );
+           "folder <b>%1</b> to the trash?</qt>").arg( TQStyleSheet::escape( mFolder->label() ) );
 
     if (KMessageBox::warningContinueCancel(this, text, title, KGuiItem( title, "edittrash"))
       != KMessageBox::Continue) return;
@@ -1170,7 +1170,7 @@ void KMMainWidget::slotEmptyFolder()
   if (mMsgView) mMsgView->clearCache();
 
   if ( !isTrash )
-    BroadcastStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash"));
+    BroadcastStatus::instance()->setStatusMsg(i18n("Moved all messages to the trash"));
 
   updateMessageActions();
 
@@ -1209,14 +1209,14 @@ void KMMainWidget::slotRemoveFolder()
     title = i18n("Delete Search");
     str = i18n("<qt>Are you sure you want to delete the search <b>%1</b>?<br>"
                 "Any messages it shows will still be available in their original folder.</qt>")
-           .tqarg( TQStyleSheet::escape( mFolder->label() ) );
+           .arg( TQStyleSheet::escape( mFolder->label() ) );
   } else {
     title = i18n("Delete Folder");
     if ( mFolder->count() == 0 ) {
       if ( !mFolder->child() || mFolder->child()->isEmpty() ) {
         str = i18n("<qt>Are you sure you want to delete the empty folder "
                    "<b>%1</b>?</qt>")
-              .tqarg( TQStyleSheet::escape( mFolder->label() ) );
+              .arg( TQStyleSheet::escape( mFolder->label() ) );
       }
       else {
         str = i18n("<qt>Are you sure you want to delete the empty folder "
@@ -1224,7 +1224,7 @@ void KMMainWidget::slotRemoveFolder()
                    "not be empty and their contents will be discarded as well. "
                    "<p><b>Beware</b> that discarded messages are not saved "
                    "into your Trash folder and are permanently deleted.</qt>")
-              .tqarg( TQStyleSheet::escape( mFolder->label() ) );
+              .arg( TQStyleSheet::escape( mFolder->label() ) );
       }
     } else {
       if ( !mFolder->child() || mFolder->child()->isEmpty() ) {
@@ -1232,14 +1232,14 @@ void KMMainWidget::slotRemoveFolder()
                    "<b>%1</b>, discarding its contents? "
                    "<p><b>Beware</b> that discarded messages are not saved "
                    "into your Trash folder and are permanently deleted.</qt>")
-              .tqarg( TQStyleSheet::escape( mFolder->label() ) );
+              .arg( TQStyleSheet::escape( mFolder->label() ) );
       }
       else {
         str = i18n("<qt>Are you sure you want to delete the folder <b>%1</b> "
                    "and all its subfolders, discarding their contents? "
                    "<p><b>Beware</b> that discarded messages are not saved "
                    "into your Trash folder and are permanently deleted.</qt>")
-            .tqarg( TQStyleSheet::escape( mFolder->label() ) );
+            .arg( TQStyleSheet::escape( mFolder->label() ) );
       }
     }
   }
@@ -1270,7 +1270,7 @@ void KMMainWidget::slotCompactFolder()
     // setCurrentItemByIndex will override the statusbar message, so save/restore it
     TQString statusMsg = BroadcastStatus::instance()->statusMsg();
     mHeaders->setCurrentItemByIndex(idx);
-    BroadcastStatus::instance()->seStatusMsg( statusMsg );
+    BroadcastStatus::instance()->setStatusMsg( statusMsg );
   }
 }
 
@@ -1636,7 +1636,7 @@ void KMMainWidget::updateListFilterAction()
     mListFilterAction->setEnabled( false );
   else {
     mListFilterAction->setEnabled( true );
-    mListFilterAction->setText( i18n( "Filter on Mailing-List %1..." ).tqarg( lname ) );
+    mListFilterAction->setText( i18n( "Filter on Mailing-List %1..." ).arg( lname ) );
   }
 }
 
@@ -3514,8 +3514,8 @@ void KMMainWidget::slotMemInfo() {
 		      "Memory allocated, not used: %3\n"
 		      "Memory total allocated    : %4\n"
 		      "Max. freeable memory      : %5\n")
-    .tqarg(mi.hblks).tqarg(fmt(mi.uordblks)).tqarg(fmt(mi.fordblks))
-    .tqarg(fmt(mi.arena)).tqarg(fmt(mi.keepcost));
+    .arg(mi.hblks).arg(fmt(mi.uordblks)).arg(fmt(mi.fordblks))
+    .arg(fmt(mi.arena)).arg(fmt(mi.keepcost));
   KMessageBox::information(0, s, "Malloc information", s);
 #endif
 }
@@ -3649,7 +3649,7 @@ void KMMainWidget::removeDuplicates()
                "Removed %n duplicate messages.", numDuplicates );
     else
       msg = i18n("No duplicate messages found.");
-  BroadcastStatus::instance()->seStatusMsg( msg );
+  BroadcastStatus::instance()->setStatusMsg( msg );
 }
 
 
@@ -3712,13 +3712,13 @@ void KMMainWidget::initializeFilterActions()
   TQValueListConstIterator<KMFilter*> it = kmkernel->filterMgr()->filters().constBegin();
   for ( ;it != kmkernel->filterMgr()->filters().constEnd(); ++it ) {
     if (!(*it)->isEmpty() && (*it)->configureShortcut()) {
-      filterName = TQString("Filter %1").tqarg((*it)->name());
+      filterName = TQString("Filter %1").arg((*it)->name());
       normalizedName = filterName.replace(" ", "_");
       if (action(normalizedName.utf8()))
         continue;
       filterCommand = new KMMetaFilterActionCommand(*it, mHeaders, this);
       mFilterCommands.append(filterCommand);
-      TQString as = i18n("Filter %1").tqarg((*it)->name());
+      TQString as = i18n("Filter %1").arg((*it)->name());
       TQString icon = (*it)->icon();
       if ( icon.isEmpty() )
         icon = "gear";
@@ -3801,8 +3801,8 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder )
   FolderShortcutCommand *c = new FolderShortcutCommand( this, folder );
   mFolderShortcutCommands.insert( folder->idString(), c );
 
-  TQString actionlabel = TQString( "FolderShortcut %1").tqarg( folder->prettyURL() );
-  TQString actionname = TQString( "FolderShortcut %1").tqarg( folder->idString() );
+  TQString actionlabel = TQString( "FolderShortcut %1").arg( folder->prettyURL() );
+  TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() );
   TQString normalizedName = actionname.replace(" ", "_");
   KAction* action =
     new KAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()),
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index ecf1e763..469858a4 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -351,7 +351,7 @@ void KMMessage::removePrivateHeaderFields() {
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::seStatusFields()
+void KMMessage::setStatusFields()
 {
   char str[2] = { 0, 0 };
 
@@ -394,8 +394,8 @@ DwMediaType& KMMessage::dwContentType()
   return mMsg->Headers().ContentType();
 }
 
-void KMMessage::fromByteArray( const TQByteArray & ba, bool seStatus ) {
-  return fromDwString( DwString( ba.data(), ba.size() ), seStatus );
+void KMMessage::fromByteArray( const TQByteArray & ba, bool setStatus ) {
+  return fromDwString( DwString( ba.data(), ba.size() ), setStatus );
 }
 
 void KMMessage::fromString( const TQCString & str, bool aSeStatus ) {
@@ -410,10 +410,10 @@ void KMMessage::fromDwString(const DwString& str, bool aSeStatus)
   mMsg->Parse();
 
   if (aSeStatus) {
-    seStatus(headerField("Status").latin1(), headerField("X-Status").latin1());
+    setStatus(headerField("Status").latin1(), headerField("X-Status").latin1());
     setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) );
     setSignatureStateChar(  headerField("X-KMail-SignatureState").at(0) );
-    setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").tqat(0).latin1() ) );
+    setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").at(0).latin1() ) );
   }
   if ( invitationState() == KMMsgInvitationUnknown && readyToShow() )
     updateInvitationState();
@@ -1081,7 +1081,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
        parser.process( this );
      }
   }
-  // seStatus(KMMsgStatusReplied);
+  // setStatus(KMMsgStatusReplied);
   msg->link(this, KMMsgStatusReplied);
 
   if ( parent() && parent()->putRepliesInSameFolder() )
@@ -1141,14 +1141,14 @@ KMMessage* KMMessage::createRedirect( const TQString &toStr )
 
   // X-KMail-Redirect-From: content
   TQString strByWayOf = TQString("%1 (by way of %2 <%3>)")
-    .tqarg( from() )
-    .tqarg( ident.fullName() )
-    .tqarg( ident.primaryEmailAddress() );
+    .arg( from() )
+    .arg( ident.fullName() )
+    .arg( ident.primaryEmailAddress() );
 
   // Resent-From: content
   TQString strFrom = TQString("%1 <%2>")
-    .tqarg( ident.fullName() )
-    .tqarg( ident.primaryEmailAddress() );
+    .arg( ident.fullName() )
+    .arg( ident.primaryEmailAddress() );
 
   // format the current date to be used in Resent-Date:
   TQString origDate = msg->headerField( "Date" );
@@ -3160,7 +3160,7 @@ void KMMessage::bodyPart(int aIdx, KMMessagePart* aPart) const
   if ( DwBodyPart *part = dwBodyPart( aIdx ) ) {
     KMMessage::bodyPart(part, aPart);
     if( aPart->name().isEmpty() )
-      aPart->setName( i18n("Attachment: %1").tqarg( aIdx ) );
+      aPart->setName( i18n("Attachment: %1").arg( aIdx ) );
   }
 }
 
@@ -3193,7 +3193,7 @@ bool KMMessage::deleteBodyPart( int partIndex )
   dummyPart.duplicate( part );
   TQString comment = i18n("This attachment has been deleted.");
   if ( !part.fileName().isEmpty() )
-    comment = i18n( "The attachment '%1' has been deleted." ).tqarg( part.fileName() );
+    comment = i18n( "The attachment '%1' has been deleted." ).arg( part.fileName() );
   dummyPart.setContentDescription( comment );
   dummyPart.setBodyEncodedBinary( TQByteArray() );
   TQCString cd = dummyPart.contentDisposition();
@@ -4037,7 +4037,7 @@ void KMMessage::readConfig()
   int languageNr = config->readNumEntry("reply-current-language",0);
 
   { // area for config group "KMMessage #n"
-    KConfigGroupSaver saver(config, TQString("KMMessage #%1").tqarg(languageNr));
+    KConfigGroupSaver saver(config, TQString("KMMessage #%1").arg(languageNr));
     sReplyLanguage = config->readEntry("language",KGlobal::locale()->language());
     sReplyStr = config->readEntry("phrase-reply",
       i18n("On %D, you wrote:"));
@@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity )
 
 
 //-----------------------------------------------------------------------------
-void KMMessage::seStatus(const KMMsgStatus aStatus, int idx)
+void KMMessage::setStatus(const KMMsgStatus aStatus, int idx)
 {
   if (mStatus == aStatus)
     return;
-  KMMsgBase::seStatus(aStatus, idx);
+  KMMsgBase::setStatus(aStatus, idx);
 }
 
 void KMMessage::setEncryptionState(const KMMsgEncryptionState s, int idx)
@@ -4347,11 +4347,11 @@ void KMMessage::updateInvitationState()
     cntType += '/';
     cntType += mMsg->Headers().ContentType().SubtypeStr().c_str();
     if ( cntType.lower() == "text/calendar" ) {
-      seStatus( KMMsgStatusHasInvitation );
+      setStatus( KMMsgStatusHasInvitation );
       return;
     }
   }
-  seStatus( KMMsgStatusHasNoInvitation );
+  setStatus( KMMsgStatusHasNoInvitation );
   return;
 }
 
@@ -4364,7 +4364,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( !part )
   {
     // kdDebug(5006) << "updateAttachmentState - no part!" << endl;
-    seStatus( KMMsgStatusHasNoAttach );
+    setStatus( KMMsgStatusHasNoAttach );
     return;
   }
 
@@ -4404,7 +4404,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
            part->Headers().ContentType().Subtype() != DwMime::kSubtypePgpSignature &&
            part->Headers().ContentType().Subtype() != DwMime::kSubtypePkcs7Signature ) )
     {
-      seStatus( KMMsgStatusHasAttach );
+      setStatus( KMMsgStatusHasAttach );
     }
     return;
   }
@@ -4429,7 +4429,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( part->Next() )
     updateAttachmentState( part->Next() );
   else if ( attachmentState() == KMMsgAttachmentUnknown )
-    seStatus( KMMsgStatusHasNoAttach );
+    setStatus( KMMsgStatusHasNoAttach );
 }
 
 void KMMessage::setBodyFromUnicode( const TQString &str, DwEntity *entity )
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index ffae3ff0..dbf34b1c 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -150,13 +150,13 @@ public:
   }
 
   /** Mark the message as deleted */
-  void del() { seStatus(KMMsgStatusDeleted); }
+  void del() { setStatus(KMMsgStatusDeleted); }
 
   /** Undelete the message. Same as touch */
-  void undel() { seStatus(KMMsgStatusOld); }
+  void undel() { setStatus(KMMsgStatusOld); }
 
   /** Touch the message - mark it as read */
-  void touch() { seStatus(KMMsgStatusOld); }
+  void touch() { setStatus(KMMsgStatusOld); }
 
   /** Create a new message that is a reply to this message, filling all
       required header fields with the proper values. The returned message
@@ -210,9 +210,9 @@ public:
   void sanitizeHeaders( const TQStringList& whiteList = TQStringList() );
 
   /** Parse the string and create this message from it. */
-  void fromDwString(const DwString& str, bool seStatus=false);
-  void fromString(const TQCString& str, bool seStatus=false);
-  void fromByteArray(const TQByteArray & ba, bool seStatus=false);
+  void fromDwString(const DwString& str, bool setStatus=false);
+  void fromString(const TQCString& str, bool setStatus=false);
+  void fromByteArray(const TQByteArray & ba, bool setStatus=false);
 
   /** Return the entire message contents in the DwString. This function
       is *fast* even for large message since it does *not* involve a
@@ -669,7 +669,7 @@ public:
 
   /** Set "Status" and "X-Status" fields of the message from the
    * internal message status. */
-  void seStatusFields();
+  void setStatusFields();
 
   /** Generates the Message-Id. It uses either the Message-Id suffix
    * defined by the user or the given email address as suffix. The address
@@ -825,8 +825,8 @@ public:
   /** Status of the message. */
   KMMsgStatus status() const { return mStatus; }
   /** Set status and mark dirty. */
-  void seStatus(const KMMsgStatus status, int idx = -1);
-  void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); }
+  void setStatus(const KMMsgStatus status, int idx = -1);
+  void setStatus(const char* s1, const char* s2=0) { KMMsgBase::setStatus(s1, s2); }
 
   /** Set encryption status of the message. */
   void setEncryptionState(const KMMsgEncryptionState, int idx = -1);
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index db57a1bf..0f7e2890 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -150,7 +150,7 @@ void KMMsgBase::toggleStatus(const KMMsgStatus aStatus, int idx)
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx)
+void KMMsgBase::setStatus(const KMMsgStatus aStatus, int idx)
 {
   mDirty = true;
   KMMsgStatus oldStatus = status();
@@ -267,40 +267,40 @@ void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx)
 
 
 //-----------------------------------------------------------------------------
-void KMMsgBase::seStatus(const char* aStatusStr, const char* aXStatusStr)
+void KMMsgBase::setStatus(const char* aStatusStr, const char* aXStatusStr)
 {
   // first try to find status from "X-Status" field if given
   if (aXStatusStr) {
-    if (strchr(aXStatusStr, 'N')) seStatus(KMMsgStatusNew);
-    if (strchr(aXStatusStr, 'U')) seStatus(KMMsgStatusUnread);
-    if (strchr(aXStatusStr, 'O')) seStatus(KMMsgStatusOld);
-    if (strchr(aXStatusStr, 'R')) seStatus(KMMsgStatusRead);
-    if (strchr(aXStatusStr, 'D')) seStatus(KMMsgStatusDeleted);
-    if (strchr(aXStatusStr, 'A')) seStatus(KMMsgStatusReplied);
-    if (strchr(aXStatusStr, 'F')) seStatus(KMMsgStatusForwarded);
-    if (strchr(aXStatusStr, 'Q')) seStatus(KMMsgStatusQueued);
-    if (strchr(aXStatusStr, 'K')) seStatus(KMMsgStatusTodo);
-    if (strchr(aXStatusStr, 'S')) seStatus(KMMsgStatusSent);
-    if (strchr(aXStatusStr, 'G')) seStatus(KMMsgStatusFlag);
-    if (strchr(aXStatusStr, 'P')) seStatus(KMMsgStatusSpam);
-    if (strchr(aXStatusStr, 'H')) seStatus(KMMsgStatusHam);
-    if (strchr(aXStatusStr, 'T')) seStatus(KMMsgStatusHasAttach);
-    if (strchr(aXStatusStr, 'C')) seStatus(KMMsgStatusHasNoAttach);
+    if (strchr(aXStatusStr, 'N')) setStatus(KMMsgStatusNew);
+    if (strchr(aXStatusStr, 'U')) setStatus(KMMsgStatusUnread);
+    if (strchr(aXStatusStr, 'O')) setStatus(KMMsgStatusOld);
+    if (strchr(aXStatusStr, 'R')) setStatus(KMMsgStatusRead);
+    if (strchr(aXStatusStr, 'D')) setStatus(KMMsgStatusDeleted);
+    if (strchr(aXStatusStr, 'A')) setStatus(KMMsgStatusReplied);
+    if (strchr(aXStatusStr, 'F')) setStatus(KMMsgStatusForwarded);
+    if (strchr(aXStatusStr, 'Q')) setStatus(KMMsgStatusQueued);
+    if (strchr(aXStatusStr, 'K')) setStatus(KMMsgStatusTodo);
+    if (strchr(aXStatusStr, 'S')) setStatus(KMMsgStatusSent);
+    if (strchr(aXStatusStr, 'G')) setStatus(KMMsgStatusFlag);
+    if (strchr(aXStatusStr, 'P')) setStatus(KMMsgStatusSpam);
+    if (strchr(aXStatusStr, 'H')) setStatus(KMMsgStatusHam);
+    if (strchr(aXStatusStr, 'T')) setStatus(KMMsgStatusHasAttach);
+    if (strchr(aXStatusStr, 'C')) setStatus(KMMsgStatusHasNoAttach);
   }
 
   // Merge the contents of the "Status" field
   if (aStatusStr) {
     if ((aStatusStr[0]== 'R' && aStatusStr[1]== 'O') ||
         (aStatusStr[0]== 'O' && aStatusStr[1]== 'R')) {
-      seStatus( KMMsgStatusOld );
-      seStatus( KMMsgStatusRead );
+      setStatus( KMMsgStatusOld );
+      setStatus( KMMsgStatusRead );
     }
     else if (aStatusStr[0] == 'R')
-      seStatus(KMMsgStatusRead);
+      setStatus(KMMsgStatusRead);
     else if (aStatusStr[0] == 'D')
-      seStatus(KMMsgStatusDeleted);
+      setStatus(KMMsgStatusDeleted);
     else
-      seStatus(KMMsgStatusNew);
+      setStatus(KMMsgStatusNew);
   }
 }
 
@@ -587,8 +587,8 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok)
   TQString result = _str;
   int len = result.length();
   for (int i = 0; i < len; i++)
-    if (result.tqat(i).tqunicode() >= 128) {
-      result.tqat(i) = '?';
+    if (result.at(i).tqunicode() >= 128) {
+      result.at(i) = '?';
       all_ok = false;
     }
   if (ok)
@@ -800,7 +800,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
   unsigned int nonAscii = 0;
   unsigned int strLength(_str.length());
   for (unsigned int i = 0; i < strLength; i++)
-    if (_str.tqat(i).tqunicode() >= 128) nonAscii++;
+    if (_str.at(i).tqunicode() >= 128) nonAscii++;
   bool useBase64 = (nonAscii * 6 > strLength);
 
   unsigned int start, stop, p, pos = 0, encLength;
@@ -813,17 +813,17 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
     start = pos; p = pos;
     while (p < strLength)
     {
-      if (!breakLine && (_str.tqat(p) == ' ' || dontQuote.find(_str.tqat(p)) != -1))
+      if (!breakLine && (_str.at(p) == ' ' || dontQuote.find(_str.at(p)) != -1))
         start = p + 1;
-      if (_str.tqat(p).tqunicode() >= 128 || _str.tqat(p).tqunicode() < 32)
+      if (_str.at(p).tqunicode() >= 128 || _str.at(p).tqunicode() < 32)
         break;
       p++;
     }
     if (breakLine || p < strLength)
     {
-      while (dontQuote.find(_str.tqat(start)) != -1) start++;
+      while (dontQuote.find(_str.at(start)) != -1) start++;
       stop = start;
-      while (stop < strLength && dontQuote.find(_str.tqat(stop)) == -1)
+      while (stop < strLength && dontQuote.find(_str.at(stop)) == -1)
         stop++;
       result += _str.mid(pos, start - pos).latin1();
       encLength = encodeRFC2047Quoted(codec->fromUnicode(_str.
@@ -843,7 +843,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
         stop = start + dif;
       }
       p = stop;
-      while (p > start && _str.tqat(p) != ' ') p--;
+      while (p > start && _str.at(p) != ' ') p--;
       if (p > start) stop = p;
       if (result.right(3) == "?= ") start--;
       if (result.right(5) == "?=\n  ") {
@@ -956,13 +956,13 @@ TQString KMMsgBase::decodeRFC2231String(const TQCString& _str)
   p = 0;
   while (p < (int)st.length())
   {
-    if (st.tqat(p) == 37)
+    if (st.at(p) == 37)
     {
-      ch = st.tqat(p+1) - 48;
+      ch = st.at(p+1) - 48;
       if (ch > 16) ch -= 7;
-      ch2 = st.tqat(p+2) - 48;
+      ch2 = st.at(p+2) - 48;
       if (ch2 > 16) ch2 -= 7;
-      st.tqat(p) = ch * 16 + ch2;
+      st.at(p) = ch * 16 + ch2;
       st.remove( p+1, 2 );
     }
     p++;
@@ -1193,7 +1193,7 @@ retry:
     }
     if(type == t) {
         // This works because the TQString constructor does a memcpy.
-        // Otherwise we would need to be concerned about the tqalignment.
+        // Otherwise we would need to be concerned about the alignment.
 	if(l)
 	    ret = TQString((TQChar *)(g_chunk + g_chunk_offset), l/2);
 	break;
@@ -1477,7 +1477,7 @@ TQString KMMsgBase::replacePrefixes( const TQString& str,
   // 1. is anchored to the beginning of str (sans whitespace)
   // 2. matches at least one of the part regexps in prefixRegExps
   TQString bigRegExp = TQString::fromLatin1("^(?:\\s+|(?:%1))+\\s*")
-                      .tqarg( prefixRegExps.join(")|(?:") );
+                      .arg( prefixRegExps.join(")|(?:") );
   TQRegExp rx( bigRegExp, false /*case insens.*/ );
   if ( !rx.isValid() ) {
     kdWarning(5006) << "KMMessage::replacePrefixes(): bigRegExp = \""
diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h
index 6ad1315d..a135edc5 100644
--- a/kmail/kmmsgbase.h
+++ b/kmail/kmmsgbase.h
@@ -220,9 +220,9 @@ public:
 
   /** Set status and mark dirty.  Optional optimization: @p idx may
    * specify the index of this message within the parent folder. */
-  virtual void seStatus(const KMMsgStatus status, int idx = -1);
+  virtual void setStatus(const KMMsgStatus status, int idx = -1);
   virtual void toggleStatus(const KMMsgStatus status, int idx = -1);
-  virtual void seStatus(const char* statusField, const char* xstatusField=0);
+  virtual void setStatus(const char* statusField, const char* xstatusField=0);
 
   /** Encryption status of the message. */
   virtual KMMsgEncryptionState encryptionState() const = 0;
diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp
index c2ce0958..bcea4679 100644
--- a/kmail/kmmsginfo.cpp
+++ b/kmail/kmmsginfo.cpp
@@ -666,11 +666,11 @@ void KMMsgInfo::setFileName(const TQString& file)
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgInfo::seStatus(const KMMsgStatus aStatus, int idx)
+void KMMsgInfo::setStatus(const KMMsgStatus aStatus, int idx)
 {
     if(aStatus == status())
         return;
-    KMMsgBase::seStatus(aStatus, idx); //base does more "stuff"
+    KMMsgBase::setStatus(aStatus, idx); //base does more "stuff"
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h
index ce15e312..8f557f25 100644
--- a/kmail/kmmsginfo.h
+++ b/kmail/kmmsginfo.h
@@ -91,7 +91,7 @@ public:
   void setMsgSizeServer(size_t sz);
   void setFolderOffset(off_t offs);
   void setFileName(const TQString& file);
-  virtual void seStatus(const KMMsgStatus status, int idx = -1);
+  virtual void setStatus(const KMMsgStatus status, int idx = -1);
   virtual void setDate(time_t aUnixTime);
   virtual void setSubject(const TQString&);
   virtual void setXMark(const TQString&);
@@ -107,7 +107,7 @@ public:
   virtual void setTo( const TQString &to );
 
   /** Grr.. c++! */
-  virtual void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); }
+  virtual void setStatus(const char* s1, const char* s2=0) { KMMsgBase::setStatus(s1, s2); }
   virtual void setDate(const char* s1) { KMMsgBase::setDate(s1); }
 
   virtual bool dirty(void) const;
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index 16d188d7..3af55f52 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -89,7 +89,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
 	     "<p>normally, you do not need to touch this setting, since the "
 	     "type of the file is automatically checked; but, sometimes, %1 "
 	     "may not detect the type correctly -- here is where you can fix "
-	     "that.</p></qt>").tqarg( kapp->aboutData()->programName() );
+	     "that.</p></qt>").arg( kapp->aboutData()->programName() );
   TQWhatsThis::add( mMimeType, msg );
 
   // row 1: Size label:
@@ -102,7 +102,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
 	     "because calculating the exact size would take too much time; "
 	     "when this is the case, it will be made visible by adding "
 	     "\"(est.)\" to the size displayed.</p></qt>")
-    .tqarg( kapp->aboutData()->programName() );
+    .arg( kapp->aboutData()->programName() );
   TQWhatsThis::add( mSize, msg );
 
   // row 2: "Name" lineedit and label:
@@ -148,7 +148,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
 	     "binary data, but consists of pure text -- in this case, choosing "
 	     "\"quoted-printable\" over the default \"base64\" will save up "
 	     "to 25% in resulting message size.</p></qt>")
-    .tqarg( kapp->aboutData()->programName() );
+    .arg( kapp->aboutData()->programName() );
   TQWhatsThis::add( label, msg );
   TQWhatsThis::add( mEncoding, msg );
 
@@ -210,7 +210,7 @@ void KMMsgPartDialog::setMimeType( const TQString & mimeType ) {
 
 void KMMsgPartDialog::setMimeType( const TQString & type,
 				   const TQString & subtype ) {
-  setMimeType( TQString::fromLatin1("%1/%2").tqarg(type).tqarg(subtype) );
+  setMimeType( TQString::fromLatin1("%1/%2").arg(type).arg(subtype) );
 }
 
 void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) {
@@ -221,7 +221,7 @@ void KMMsgPartDialog::setSize( KIO::filesize_t size, bool estimated ) {
   TQString text = KIO::convertSize( size );
   if ( estimated )
     text = i18n("%1: a filesize incl. unit (e.g. \"1.3 KB\")",
-		"%1 (est.)").tqarg( text );
+		"%1 (est.)").arg( text );
   mSize->setText( text );
 }
 
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index 2cd29768..ed406209 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -292,7 +292,7 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons
 
   TQLabel *l = new TQLabel(i18n("Messages to filter found on POP Account: <b>%1</b><p>"
       "The messages shown exceed the maximum size limit you defined for this account.<br>You can select "
-      "what you want to do with them by checking the appropriate button.").tqarg(aAccount), w);
+      "what you want to do with them by checking the appropriate button.").arg(aAccount), w);
   vbl->addWidget(l);
 
   TQVGroupBox *upperBox = new TQVGroupBox(i18n("Messages Exceeding Size"), w);
@@ -360,7 +360,7 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons
   }
 
   if(rulesetCount)
-      lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").tqarg(rulesetCount));
+      lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").arg(rulesetCount));
 
   // connect signals and slots
   connect(lv, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)),
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index e7eee344..0892fbf3 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -150,7 +150,7 @@ NewByteArray& NewByteArray::appendNULL()
 {
     TQByteArray::detach();
     uint len1 = size();
-    if ( !TQByteArray::tqresize( len1 + 1 ) )
+    if ( !TQByteArray::resize( len1 + 1 ) )
         return *this;
     *(data() + len1) = '\0';
     return *this;
@@ -162,7 +162,7 @@ NewByteArray& NewByteArray::operator+=( const char * newData )
     TQByteArray::detach();
     uint len1 = size();
     uint len2 = tqstrlen( newData );
-    if ( !TQByteArray::tqresize( len1 + len2 ) )
+    if ( !TQByteArray::resize( len1 + len2 ) )
         return *this;
     memcpy( data() + len1, newData, len2 );
     return *this;
@@ -174,7 +174,7 @@ NewByteArray& NewByteArray::operator+=( const TQByteArray & newData )
     TQByteArray::detach();
     uint len1 = size();
     uint len2 = newData.size();
-    if ( !TQByteArray::tqresize( len1 + len2 ) )
+    if ( !TQByteArray::resize( len1 + len2 ) )
         return *this;
     memcpy( data() + len1, newData.data(), len2 );
     return *this;
@@ -186,7 +186,7 @@ NewByteArray& NewByteArray::operator+=( const TQCString & newData )
     TQByteArray::detach();
     uint len1 = size();
     uint len2 = newData.length(); // forget about the trailing 0x00 !
-    if ( !TQByteArray::tqresize( len1 + len2 ) )
+    if ( !TQByteArray::resize( len1 + len2 ) )
         return *this;
     memcpy( data() + len1, newData.data(), len2 );
     return *this;
@@ -207,7 +207,7 @@ void KMReaderWin::objectTreeToDecryptedMsg( partNode* node,
                                             int recCount )
 {
   kdDebug(5006) << TQString("-------------------------------------------------" ) << endl;
-  kdDebug(5006) << TQString("KMReaderWin::objectTreeToDecryptedMsg( %1 )  START").tqarg( recCount ) << endl;
+  kdDebug(5006) << TQString("KMReaderWin::objectTreeToDecryptedMsg( %1 )  START").arg( recCount ) << endl;
   if( node ) {
 
     kdDebug(5006) << node->typeString() << '/' << node->subTypeString() << endl;
@@ -309,10 +309,10 @@ kdDebug(5006) << "              new Content-Type = " << headers->ContentType(
 
       // B) Store the body of this part.
       if( headers && bIsMultipart && dataNode->firstChild() )  {
-kdDebug(5006) << "is valid Multipart, processing tqchildren:" << endl;
+kdDebug(5006) << "is valid Multipart, processing children:" << endl;
         TQCString boundary = headers->ContentType().Boundary().c_str();
         curNode = dataNode->firstChild();
-        // store tqchildren of multipart
+        // store children of multipart
         while( curNode ) {
 kdDebug(5006) << "--boundary" << endl;
           if( resultingData.size() &&
@@ -323,7 +323,7 @@ kdDebug(5006) << "--boundary" << endl;
           resultingData += boundary;
           resultingData += "\n";
           // note: We are processing a harmless multipart that is *not*
-          //       to be replaced by one of it's tqchildren, therefor
+          //       to be replaced by one of it's children, therefor
           //       we set their doStoreHeaders to true.
           objectTreeToDecryptedMsg( curNode,
                                     resultingData,
@@ -336,7 +336,7 @@ kdDebug(5006) << "--boundary--" << endl;
         resultingData += "\n--";
         resultingData += boundary;
         resultingData += "--\n\n";
-kdDebug(5006) << "Multipart processing tqchildren - DONE" << endl;
+kdDebug(5006) << "Multipart processing children - DONE" << endl;
       } else if( part ){
         // store simple part
 kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE" << endl;
@@ -360,7 +360,7 @@ kdDebug(5006) << "                      Root node will NOT be replaced." << endl
                                 recCount + 1 );
     }
   }
-  kdDebug(5006) << TQString("\nKMReaderWin::objectTreeToDecryptedMsg( %1 )  END").tqarg( recCount ) << endl;
+  kdDebug(5006) << TQString("\nKMReaderWin::objectTreeToDecryptedMsg( %1 )  END").arg( recCount ) << endl;
 }
 
 
@@ -1285,11 +1285,11 @@ void KMReaderWin::displaySplashPage( const TQString &info )
 
   TQString location = locate("data", "kmail/about/main.html");
   TQString content = KPIM::kFileToString(location);
-  content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
+  content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
   if ( kapp->reverseLayout() )
-    content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
+    content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
   else
-    content = content.tqarg( "" );
+    content = content.arg( "" );
 
   mViewer->begin(KURL( location ));
 
@@ -1297,7 +1297,7 @@ void KMReaderWin::displaySplashPage( const TQString &info )
   TQString appTitle = i18n("KMail");
   TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite");
   TQString quickDescription = i18n("The email client for the K Desktop Environment.");
-  mViewer->write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info));
+  mViewer->write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info));
   mViewer->end();
 }
 
@@ -1345,41 +1345,41 @@ void KMReaderWin::displayAboutPage()
 	 "<p>We hope that you will enjoy KMail.</p>\n"
 	 "<p>Thank you,</p>\n"
 	     "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>")
-    .tqarg(KMAIL_VERSION) // KMail version
-    .tqarg("help:/kmail/index.html") // KMail help:// URL
-    .tqarg("http://kontact.kde.org/kmail/") // KMail homepage URL
-    .tqarg("1.8").tqarg("3.4"); // prior KMail and KDE version
+    .arg(KMAIL_VERSION) // KMail version
+    .arg("help:/kmail/index.html") // KMail help:// URL
+    .arg("http://kontact.kde.org/kmail/") // KMail homepage URL
+    .arg("1.8").arg("3.4"); // prior KMail and KDE version
 
   TQString featureItems;
   for ( int i = 0 ; i < numKMailNewFeatures ; i++ )
-    featureItems += i18n("<li>%1</li>\n").tqarg( i18n( kmailNewFeatures[i] ) );
+    featureItems += i18n("<li>%1</li>\n").arg( i18n( kmailNewFeatures[i] ) );
 
-  info = info.tqarg( featureItems );
+  info = info.arg( featureItems );
 
   if( kmkernel->firstStart() ) {
-    info = info.tqarg( i18n("<p>Please take a moment to fill in the KMail "
+    info = info.arg( i18n("<p>Please take a moment to fill in the KMail "
 			  "configuration panel at Settings-&gt;Configure "
 			  "KMail.\n"
 			  "You need to create at least a default identity and "
 			  "an incoming as well as outgoing mail account."
 			  "</p>\n") );
   } else {
-    info = info.tqarg( TQString() );
+    info = info.arg( TQString() );
   }
 
   if ( ( numKMailChanges > 1 ) || ( numKMailChanges == 1 && strlen(kmailChanges[0]) > 0 ) ) {
     TQString changesText =
       i18n("<p><span style='font-size:125%; font-weight:bold;'>"
            "Important changes</span> (compared to KMail %1):</p>\n")
-      .tqarg("1.8");
+      .arg("1.8");
     changesText += "<ul>\n";
     for ( int i = 0 ; i < numKMailChanges ; i++ )
-      changesText += i18n("<li>%1</li>\n").tqarg( i18n( kmailChanges[i] ) );
+      changesText += i18n("<li>%1</li>\n").arg( i18n( kmailChanges[i] ) );
     changesText += "</ul>\n";
-    info = info.tqarg( changesText );
+    info = info.arg( changesText );
   }
   else
-    info = info.tqarg(""); // remove the %8
+    info = info.arg(""); // remove the %8
 
   displaySplashPage( info );
 }
@@ -2142,7 +2142,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML,
       }
       htmlWriter()->queue("</body></html>");
       htmlWriter()->flush();
-      mMainWindow->setCaption(i18n("View Attachment: %1").tqarg(pname));
+      mMainWindow->setCaption(i18n("View Attachment: %1").arg(pname));
   } else if (kasciistricmp(aMsgPart->typeStr(), "image")==0 ||
              (kasciistricmp(aMsgPart->typeStr(), "application")==0 &&
               kasciistricmp(aMsgPart->subtypeStr(), "postscript")==0))
@@ -2178,7 +2178,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML,
                            "\" border=\"0\">\n"
                            "</body></html>\n" );
       htmlWriter()->end();
-      setCaption( i18n("View Attachment: %1").tqarg( pname ) );
+      setCaption( i18n("View Attachment: %1").arg( pname ) );
       show();
       delete iio;
   } else {
@@ -2198,7 +2198,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML,
     htmlWriter()->queue( "</pre>" );
     htmlWriter()->queue("</body></html>");
     htmlWriter()->flush();
-    mMainWindow->setCaption(i18n("View Attachment: %1").tqarg(pname));
+    mMainWindow->setCaption(i18n("View Attachment: %1").arg(pname));
   }
   // ---Sven's view text, html and image attachments in html widget end ---
 }
@@ -2287,14 +2287,14 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
   if ( filenameText.isEmpty() )
     filenameText = msgPart.name();
   if ( offer ) {
-    open_text = i18n("&Open with '%1'").tqarg( offer->name() );
+    open_text = i18n("&Open with '%1'").arg( offer->name() );
   } else {
     open_text = i18n("&Open With...");
   }
   const TQString text = i18n("Open attachment '%1'?\n"
                             "Note that opening an attachment may compromise "
                             "your system's security.")
-                       .tqarg( filenameText );
+                       .arg( filenameText );
   const int choice = KMessageBox::questionYesNoCancel( this, text,
       i18n("Open Attachment?"), KStdGuiItem::saveAs(), open_text,
       TQString::fromLatin1("askSave") + mimetype->name() ); // dontAskAgainName
@@ -2738,7 +2738,7 @@ void KMReaderWin::fillCommandInfo( partNode *node, KMMessage **msg, int *nodeId
 void KMReaderWin::slotDeleteAttachment(partNode * node)
 {
   if ( KMessageBox::warningContinueCancel( this,
-       i18n("Deleting an attachment might tqinvalidate any digital signature on this message."),
+       i18n("Deleting an attachment might invalidate any digital signature on this message."),
        i18n("Delete Attachment"), KStdGuiItem::del(), "DeleteAttachmentSignatureWarning" )
      != KMessageBox::Continue ) {
     return;
@@ -2794,7 +2794,7 @@ void KMReaderWin::disconnectMsgAdded()
 void KMReaderWin::slotEditAttachment(partNode * node)
 {
   if ( KMessageBox::warningContinueCancel( this,
-        i18n("Modifying an attachment might tqinvalidate any digital signature on this message."),
+        i18n("Modifying an attachment might invalidate any digital signature on this message."),
         i18n("Edit Attachment"), KGuiItem( i18n("Edit"), "edit" ), "EditAttachmentSignatureWarning" )
         != KMessageBox::Continue ) {
     return;
@@ -2828,12 +2828,12 @@ void KMReaderWin::scrollToAttachment( const partNode *node )
   DOM::Document doc = mViewer->htmlDocument();
 
   // The anchors for this are created in ObjectTreeParser::parseObjectTree()
-  mViewer->gotoAnchor( TQString::fromLatin1( "att%1" ).tqarg( node->nodeId() ) );
+  mViewer->gotoAnchor( TQString::fromLatin1( "att%1" ).arg( node->nodeId() ) );
 
   // Remove any old color markings which might be there
   const partNode *root = node->topLevelParent();
   for ( int i = 0; i <= root->totalChildCount() + 1; i++ ) {
-    DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).tqarg( i + 1 ) );
+    DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).arg( i + 1 ) );
     if ( !attachmentDiv.isNull() )
       attachmentDiv.removeAttribute( "style" );
   }
@@ -2845,14 +2845,14 @@ void KMReaderWin::scrollToAttachment( const partNode *node )
   // Now, color the div of the attachment in yellow, so that the user sees what happened.
   // We created a special marked div for this in writeAttachmentMarkHeader() in ObjectTreeParser,
   // find and modify that now.
-  DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).tqarg( node->nodeId() ) );
+  DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).arg( node->nodeId() ) );
   if ( attachmentDiv.isNull() ) {
     kdWarning( 5006 ) << "Could not find attachment div for attachment " << node->nodeId() << endl;
     return;
   }
 
   attachmentDiv.setAttribute( "style", TQString( "border:2px solid %1" )
-      .tqarg( cssHelper()->pgpWarnColor().name() ) );
+      .arg( cssHelper()->pgpWarnColor().name() ) );
 
   // Update rendering, otherwise the rendering is not updated when the user clicks on an attachment
   // that causes scrolling and the open attachment dialog
@@ -2931,8 +2931,8 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor
         align = "right";
       if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode )
         html += TQString::fromLatin1("<div style=\"background:%1; %2"
-                "vertical-align:middle; float:%3; %4\">").tqarg( bgColor.name() ).tqarg( margin )
-                                                         .tqarg( align ).tqarg( visibility );
+                "vertical-align:middle; float:%3; %4\">").arg( bgColor.name() ).arg( margin )
+                                                         .arg( align ).arg( visibility );
       html += subHtml;
       if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode )
         html += "</div>";
@@ -2941,7 +2941,7 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor
     partNode::AttachmentDisplayInfo info = node->attachmentDisplayInfo();
     if ( info.displayInHeader ) {
       html += "<div style=\"float:left;\">";
-      html += TQString::fromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).tqarg( bgColor.name() );
+      html += TQString::fromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).arg( bgColor.name() );
       TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() );
       TQString href = node->asHREF( "header" );
       html += TQString::fromLatin1( "<a href=\"" ) + href +
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index 8870976f..eec0d6e0 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -77,10 +77,10 @@ KMSender::~KMSender()
 }
 
 //-----------------------------------------------------------------------------
-void KMSender::seStatusMsg(const TQString &msg)
+void KMSender::setStatusMsg(const TQString &msg)
 {
   if ( mProgressItem )
-    mProgressItem->seStatus(msg);
+    mProgressItem->setStatus(msg);
 }
 
 //-----------------------------------------------------------------------------
@@ -164,7 +164,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow)
   KMFolder * const outbox = kmkernel->outboxFolder();
   const KMFolderOpener openOutbox( outbox, "outbox" );
 
-  aMsg->seStatus(KMMsgStatusQueued);
+  aMsg->setStatus(KMMsgStatusQueued);
 
   if ( const int err = outbox->addMsg(aMsg) ) {
     Q_UNUSED( err );
@@ -314,8 +314,8 @@ void KMSender::doSendMsg()
         mCurrentMsg->addBodyPart( &msgPart );
       }
     }
-    mCurrentMsg->seStatus(KMMsgStatusSent);
-    mCurrentMsg->seStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
+    mCurrentMsg->setStatus(KMMsgStatusSent);
+    mCurrentMsg->setStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
     mCurrentMsg->updateAttachmentState();
     mCurrentMsg->updateInvitationState();
 
@@ -387,7 +387,7 @@ void KMSender::doSendMsg()
           "\"outbox\" to the \"sent-mail\" folder failed.\n"
           "Possible reasons are lack of disk space or write permission. "
           "Please try to fix the problem and move the message manually.")
-          .tqarg(mCurrentMsg->subject()));
+          .arg(mCurrentMsg->subject()));
         cleanup();
         return;
       }
@@ -400,7 +400,7 @@ void KMSender::doSendMsg()
     default:
       break;
     }
-    seStatusByLink( mCurrentMsg );
+    setStatusByLink( mCurrentMsg );
     if (mCurrentMsg->parent() && !imapSentFolder) {
       // for speed optimization, this code assumes that mCurrentMsg is the
       // last one in it's parent folder; make sure that's really the case:
@@ -435,7 +435,7 @@ void KMSender::doSendMsg()
                                    "identity '%1' in the Identities "
                                    "section of the configuration dialog "
                                    "and then try again." )
-                             .tqarg( id.identityName() ) );
+                             .arg( id.identityName() ) );
       mOutboxFolder->unGetMsg( mFailedMessages );
       mCurrentMsg = 0;
     }
@@ -450,12 +450,12 @@ void KMSender::doSendMsg()
         sentFolder->close("sentFolder");
     if ( someSent ) {
       if ( mSentMessages == mTotalMessages ) {
-        seStatusMsg(i18n("%n queued message successfully sent.",
+        setStatusMsg(i18n("%n queued message successfully sent.",
                           "%n queued messages successfully sent.",
                           mSentMessages));
       } else {
-        seStatusMsg(i18n("%1 of %2 queued messages successfully sent.")
-            .tqarg(mSentMessages).tqarg( mTotalMessages ));
+        setStatusMsg(i18n("%1 of %2 queued messages successfully sent.")
+            .arg(mSentMessages).arg( mTotalMessages ));
       }
     }
     cleanup();
@@ -536,7 +536,7 @@ void KMSender::doSendMsg()
 }
 
 bool KMSender::runPrecommand( const TQString & cmd ) {
-  seStatusMsg( i18n("Executing precommand %1").tqarg( cmd ) );
+  setStatusMsg( i18n("Executing precommand %1").arg( cmd ) );
   mPrecommand = new KMPrecommand( cmd );
   connect( mPrecommand, TQT_SIGNAL(finished(bool)),
            TQT_SLOT(slotPrecommandFinished(bool)) );
@@ -554,7 +554,7 @@ void KMSender::sendProcStarted(bool success)
     if (mSendProc)
        mSendProc->finish();
     else
-      seStatusMsg(i18n("Unrecognized transport protocol. Unable to send message."));
+      setStatusMsg(i18n("Unrecognized transport protocol. Unable to send message."));
     mSendProc = 0;
     mSendProcStarted = false;
     cleanup();
@@ -595,9 +595,9 @@ void KMSender::doSendMsgAux()
 
   // start sending the current message
 
-  seStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3")
-	       .tqarg(mSentMessages+mFailedMessages+1).tqarg(mTotalMessages)
-	       .tqarg(mCurrentMsg->subject()));
+  setStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3")
+	       .arg(mSentMessages+mFailedMessages+1).arg(mTotalMessages)
+	       .arg(mCurrentMsg->subject()));
   TQStringList to, cc, bcc;
   TQString sender;
   extractSenderToCCAndBcc( mCurrentMsg, &sender, &to, &cc, &bcc );
@@ -614,7 +614,7 @@ void KMSender::doSendMsgAux()
       mOutboxFolder->unGetMsg( mFailedMessages );
     mCurrentMsg = 0;
     cleanup();
-    seStatusMsg(i18n("Failed to send (some) queued messages."));
+    setStatusMsg(i18n("Failed to send (some) queued messages."));
     return;
   }
   // Do *not* add code here, after send(). It can happen that this method
@@ -696,10 +696,10 @@ void KMSender::slotIdle()
         "fix the problem (e.g. a broken address) or remove the message "
         "from the 'outbox' folder.\n"
         "The following transport protocol was used:\n  %2")
-      .tqarg(errString)
-      .tqarg(mMethodStr);
+      .arg(errString)
+      .arg(mMethodStr);
     if (!errString.isEmpty()) KMessageBox::error(0,msg);
-    seStatusMsg( i18n( "Sending aborted." ) );
+    setStatusMsg( i18n( "Sending aborted." ) );
   } else {
     if (!mSendProc->sendOk()) {
       if ( mCurrentMsg )
@@ -724,8 +724,8 @@ void KMSender::slotIdle()
             "from the 'outbox' folder.</p>"
             "<p>The following transport protocol was used:  %2</p>"
             "<p>Do you want me to continue sending the remaining messages?</p>")
-            .tqarg(errString)
-            .tqarg(mMethodStr);
+            .arg(errString)
+            .arg(mMethodStr);
           res = KMessageBox::warningYesNo( 0 , msg ,
                   i18n( "Continue Sending" ), i18n( "&Continue Sending" ),
                   i18n("&Abort Sending") );
@@ -735,8 +735,8 @@ void KMSender::slotIdle()
             "fix the problem (e.g. a broken address) or remove the message "
             "from the 'outbox' folder.\n"
             "The following transport protocol was used:\n %2")
-            .tqarg(errString)
-            .tqarg(mMethodStr);
+            .arg(errString)
+            .arg(mMethodStr);
           KMessageBox::error(0,msg);
         }
         if (res == KMessageBox::Yes) {
@@ -744,7 +744,7 @@ void KMSender::slotIdle()
           doSendMsg();
           return;
         } else {
-          seStatusMsg( i18n( "Sending aborted." ) );
+          setStatusMsg( i18n( "Sending aborted." ) );
         }
       }
     } else {
@@ -845,7 +845,7 @@ KMSendProc* KMSender::createSendProcFromString( const TQString & transport )
 }
 
 //-----------------------------------------------------------------------------
-void KMSender::seStatusByLink(const KMMessage *aMsg)
+void KMSender::setStatusByLink(const KMMessage *aMsg)
 {
   int n = 0;
   while (1) {
@@ -867,7 +867,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg)
           new KMDeleteMsgCommand( folder, folder->getMsg( index ) );
         cmd->start();
       } else {
-        folder->seStatus(index, status);
+        folder->setStatus(index, status);
       }
     } else {
       kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl;
@@ -905,7 +905,7 @@ void KMSendProc::failed(const TQString &aMsg)
 //-----------------------------------------------------------------------------
 void KMSendProc::statusMsg(const TQString& aMsg)
 {
-  if (mSender) mSender->seStatusMsg(aMsg);
+  if (mSender) mSender->setStatusMsg(aMsg);
 }
 
 //=============================================================================
@@ -934,8 +934,8 @@ bool KMSendSendmail::doStart() {
                              "Please remove it from there if you do not want the message to "
                              "be resent.\n"
                              "The following transport protocol was used:\n  %2")
-                        .tqarg(str + "\n")
-                        .tqarg("sendmail://");
+                        .arg(str + "\n")
+                        .arg("sendmail://");
     KMessageBox::information(0,msg);
     return false;
   }
@@ -978,7 +978,7 @@ bool KMSendSendmail::doSend( const TQString & sender, const TQStringList & to, c
 
   if ( !mMailerProc->start( KProcess::NotifyOnExit, KProcess::All ) ) {
     KMessageBox::information( 0, i18n("Failed to execute mailer program %1")
-                              .tqarg( mSender->transportInfo()->host ) );
+                              .arg( mSender->transportInfo()->host ) );
     return false;
   }
   mMsgPos  = mMsgStr.data();
diff --git a/kmail/kmsender.h b/kmail/kmsender.h
index a9405976..36153a2a 100644
--- a/kmail/kmsender.h
+++ b/kmail/kmsender.h
@@ -105,10 +105,10 @@ public:
 
 private:
   /** sets a status msg and emits statusMsg() */
-  void seStatusMsg(const TQString&);
+  void setStatusMsg(const TQString&);
 
   /** sets replied/forwarded status in the linked message for @p aMsg. */
-  void seStatusByLink(const KMMessage *aMsg);
+  void setStatusByLink(const KMMessage *aMsg);
 
   /** Emit progress info - calculates a percent value based on the amount of bytes sent */
   void emitProgressInfo( int currentFileProgress );
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index a6ac8476..264e4b05 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -165,7 +165,7 @@ void lockOrDie() {
           // On linux with /proc we can even check that it's really kmail and not something else
           char path_buffer[MAXPATHLEN + 1];
           path_buffer[MAXPATHLEN] = 0;
-          const TQString procPath = TQString("/proc/%1/exe").tqarg(oldPid);
+          const TQString procPath = TQString("/proc/%1/exe").arg(oldPid);
           const int length = readlink (procPath.latin1(), path_buffer, MAXPATHLEN);
           if ( length == -1 ) // not such pid
               first_instance = true;
@@ -199,17 +199,17 @@ void lockOrDie() {
                    "this machine. Running %2 more than once "
                    "can cause the loss of mail. You should not start %1 "
                    "unless you are sure that it is not already running.")
-              .tqarg( programName, programName );
+              .arg( programName, programName );
               // TQString::arg( st ) only replaces the first occurrence of %1
               // with st while TQString::arg( s1, s2 ) replacess all occurrences
               // of %1 with s1 and all occurrences of %2 with s2. So don't
-              // even think about changing the above to .tqarg( programName ).
+              // even think about changing the above to .arg( programName ).
       else
         msg = i18n("%1 seems to be running on another display on this "
                    "machine. Running %1 and %2 at the same "
                    "time can cause the loss of mail. You should not start %2 "
                    "unless you are sure that %1 is not running.")
-              .tqarg( oldProgramName, programName );
+              .arg( oldProgramName, programName );
     }
     else {
       if ( oldAppName == appName )
@@ -217,19 +217,19 @@ void lockOrDie() {
                    "than once can cause the loss of mail. You should not "
                    "start %1 on this computer unless you are sure that it is "
                    "not already running on %2.")
-              .tqarg( programName, oldHostName );
+              .arg( programName, oldHostName );
       else
         msg = i18n("%1 seems to be running on %3. Running %1 and %2 at the "
                    "same time can cause the loss of mail. You should not "
                    "start %2 on this computer unless you are sure that %1 is "
                    "not running on %3.")
-              .tqarg( oldProgramName, programName, oldHostName );
+              .arg( oldProgramName, programName, oldHostName );
     }
 
     KCursorSaver idle( KBusyPtr::idle() );
     if ( KMessageBox::No ==
          KMessageBox::warningYesNo( 0, msg, TQString(),
-                                    i18n("Start %1").tqarg( programName ),
+                                    i18n("Start %1").arg( programName ),
                                     i18n("Exit") ) ) {
       exit(1);
     }
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index 407a0bd9..c9efd8a3 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -145,7 +145,7 @@ void KMTransportInfo::writeConfig(int id)
               "but should not be considered secure from decryption efforts "
               "if access to the configuration file is obtained.\n"
               "Do you want to store the password for account '%1' in the "
-              "configuration file?").tqarg( name ),
+              "configuration file?").arg( name ),
          i18n("KWallet Not Available"),
          KGuiItem( i18n("Store Password") ),
          KGuiItem( i18n("Do Not Store Password") ) )
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index e9e4a936..67a21fc6 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -118,7 +118,7 @@ void ListJob::execute()
         i18n("retrieving folders"),
         false,
         mAccount->useSSL() || mAccount->useTLS() );
-    mParentProgressItem->seStatus( escapedStatus );
+    mParentProgressItem->setStatus( escapedStatus );
   }
 
   // make the URL
@@ -174,7 +174,7 @@ void ListJob::slotListResult( KIO::Job* job )
   if ( job->error() )
   {
     mAccount->handleJobError( job,
-        i18n( "Error while listing folder %1: " ).tqarg((*it).path),
+        i18n( "Error while listing folder %1: " ).arg((*it).path),
         true );
   } else
   {
diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp
index ca5f2cc9..3b6f55dc 100644
--- a/kmail/localsubscriptiondialog.cpp
+++ b/kmail/localsubscriptiondialog.cpp
@@ -72,7 +72,7 @@ void LocalSubscriptionDialog::processFolderListing()
   uint done = 0;
   for (uint i = mCount; i < mFolderNames.count(); ++i)
   {
-    // give the dialog a chance to tqrepaint
+    // give the dialog a chance to repaint
     if (done == 1000)
     {
       emit listChanged();
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index ba32c008..3af5d742 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -253,7 +253,7 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() {
 
   u.setFileName( mContextMenuItem->text( 0 ) );
 
-  if ( KMessageBox::warningContinueCancel( this, i18n( "Really delete script \"%1\" from the server?" ).tqarg( u.fileName() ),
+  if ( KMessageBox::warningContinueCancel( this, i18n( "Really delete script \"%1\" from the server?" ).arg( u.fileName() ),
                                    i18n( "Delete Sieve Script Confirmation" ),
                                    KStdGuiItem::del() )
        != KMessageBox::Continue )
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index d3a0233d..f1436618 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -2038,7 +2038,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL,
                           i18n( "<qt><p>Error: The backend did not return "
                                 "any encoded data.</p>"
                                 "<p>Please report this bug:<br>%2</p></qt>" )
-                          .tqarg( bugURL ) );
+                          .arg( bugURL ) );
       bOk = false;
     }
     resultingPart.setBodyEncodedBinary( resultingBody );
diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 23ebea55..145ab2b2 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -224,7 +224,7 @@ namespace KMail {
                 "but should not be considered secure from decryption efforts "
                 "if access to the configuration file is obtained.\n"
                 "Do you want to store the password for account '%1' in the "
-                "configuration file?").tqarg( name() ),
+                "configuration file?").arg( name() ),
            i18n("KWallet Not Available"),
            KGuiItem( i18n("Store Password") ),
            KGuiItem( i18n("Do Not Store Password") ) )
diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp
index b5848dcc..12c5cb00 100644
--- a/kmail/newfolderdialog.cpp
+++ b/kmail/newfolderdialog.cpp
@@ -66,7 +66,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
 {
   setWFlags( getWFlags() | WDestructiveClose );
   if ( mFolder ) {
-    setCaption( i18n("New Subfolder of %1").tqarg( mFolder->prettyURL() ) );
+    setCaption( i18n("New Subfolder of %1").arg( mFolder->prettyURL() ) );
   }
   TQWidget* privateLayoutWidget = new TQWidget( this, "mTopLevelLayout" );
   privateLayoutWidget->setGeometry( TQRect( 10, 10, 260, 80 ) );
@@ -213,14 +213,14 @@ void NewFolderDialog::slotOk()
           && ( selectedFolderDir == mFolder->parent() )
           && ( mFolder->storage()->name() == fldName ) ) ) )
   {
-    const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).tqarg(fldName);
+    const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).arg(fldName);
     KMessageBox::error( this, message );
     return;
   }
 
   /* Ok, obvious errors caught, let's try creating it for real. */
   const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>."
-            "</qt> " ).tqarg(fldName);
+            "</qt> " ).arg(fldName);
 
   TQString namespaceName;
   if ( mNamespacesComboBox ) {
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 518610d9..0b974a53 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -272,7 +272,7 @@ namespace KMail {
       ProcessResult processResult;
 
       if ( mReader ) {
-        htmlWriter()->queue( TQString::fromLatin1("<a name=\"att%1\"/>").tqarg( node->nodeId() ) );
+        htmlWriter()->queue( TQString::fromLatin1("<a name=\"att%1\"/>").arg( node->nodeId() ) );
       }
 
       if ( const Interface::BodyPartFormatter * formatter
@@ -686,11 +686,11 @@ namespace KMail {
           switch ( cryptPlugError ) {
           case NOT_INITIALIZED:
             errorMsg = i18n( "Crypto plug-in \"%1\" is not initialized." )
-                       .tqarg( cryptPlugLibName );
+                       .arg( cryptPlugLibName );
             break;
           case CANT_VERIFY_SIGNATURES:
             errorMsg = i18n( "Crypto plug-in \"%1\" cannot verify signatures." )
-                       .tqarg( cryptPlugLibName );
+                       .arg( cryptPlugLibName );
             break;
           case NO_PLUGIN:
             if ( cryptPlugDisplayName.isEmpty() )
@@ -698,14 +698,14 @@ namespace KMail {
             else
               errorMsg = i18n( "%1 is either 'OpenPGP' or 'S/MIME'",
                                "No %1 plug-in was found." )
-                           .tqarg( cryptPlugDisplayName );
+                           .arg( cryptPlugDisplayName );
             break;
           }
           messagePart.errorText = i18n( "The message is signed, but the "
                                         "validity of the signature cannot be "
                                         "verified.<br />"
                                         "Reason: %1" )
-                                  .tqarg( errorMsg );
+                                  .arg( errorMsg );
         }
 
         if ( mReader )
@@ -887,9 +887,9 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
                       + "</div>";
         if ( !passphraseError )
           aErrorText = i18n("Crypto plug-in \"%1\" could not decrypt the data.")
-                        .tqarg( cryptPlugLibName )
+                        .arg( cryptPlugLibName )
                     + "<br />"
-                    + i18n("Error: %1").tqarg( aErrorText );
+                    + i18n("Error: %1").arg( aErrorText );
       }
     }
   }
@@ -901,11 +901,11 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
     switch ( cryptPlugError ) {
     case NOT_INITIALIZED:
       aErrorText = i18n( "Crypto plug-in \"%1\" is not initialized." )
-                     .tqarg( cryptPlugLibName );
+                     .arg( cryptPlugLibName );
       break;
     case CANT_DECRYPT:
       aErrorText = i18n( "Crypto plug-in \"%1\" cannot decrypt messages." )
-                     .tqarg( cryptPlugLibName );
+                     .arg( cryptPlugLibName );
       break;
     case NO_PLUGIN:
       aErrorText = i18n( "No appropriate crypto plug-in was found." );
@@ -1656,7 +1656,7 @@ namespace KMail {
       const GpgME::ImportResult res = import->exec( certData );
       if ( res.error() ) {
         htmlWriter()->queue( i18n( "Sorry, certificate could not be imported.<br>"
-                                   "Reason: %1").tqarg( TQString::fromLocal8Bit( res.error().asString() ) ) );
+                                   "Reason: %1").arg( TQString::fromLocal8Bit( res.error().asString() ) ) );
         return true;
       }
 
@@ -1696,14 +1696,14 @@ namespace KMail {
       for ( std::vector<GpgME::Import>::const_iterator it = imports.begin() ; it != imports.end() ; ++it ) {
         if ( (*it).error() )
           htmlWriter()->queue( i18n( "Failed: %1 (%2)" )
-                               .tqarg( (*it).fingerprint(),
+                               .arg( (*it).fingerprint(),
                                      TQString::fromLocal8Bit( (*it).error().asString() ) ) );
         else if ( (*it).status() & ~GpgME::Import::ContainedSecretKey ) {
           if ( (*it).status() & GpgME::Import::ContainedSecretKey ) {
-            htmlWriter()->queue( i18n( "New or changed: %1 (secret key available)" ).tqarg( (*it).fingerprint() ) );
+            htmlWriter()->queue( i18n( "New or changed: %1 (secret key available)" ).arg( (*it).fingerprint() ) );
           }
           else {
-            htmlWriter()->queue( i18n( "New or changed: %1" ).tqarg( (*it).fingerprint() ) );
+            htmlWriter()->queue( i18n( "New or changed: %1" ).arg( (*it).fingerprint() ) );
           }
         }
         htmlWriter()->queue( "<br>" );
@@ -2054,7 +2054,7 @@ bool ObjectTreeParser::processApplicationMsTnefSubtype( partNode *node, ProcessR
 
     TQString fileName = mReader->writeMessagePartToTempFile( msgPart, partNum );
 
-    TQString href = TQString( "attachment:%1?place=body" ).tqarg( partNum );
+    TQString href = TQString( "attachment:%1?place=body" ).arg( partNum );
 
     TQString iconName;
     if( inlineImage )
@@ -2280,7 +2280,7 @@ static TQString writeSimpleSigstatHeader( const PartMetaData &block )
     if ( addr.isEmpty() ) {
       html += i18n( "Signature is valid." );
     } else {
-      html += i18n( "Signed by <a href=\"mailto:%1\">%2</a>." ).tqarg( addr, name );
+      html += i18n( "Signed by <a href=\"mailto:%1\">%2</a>." ).arg( addr, name );
     }
   } else {
     // should not happen
@@ -2307,7 +2307,7 @@ static TQString makeShowAuditLogLink( const GpgME::Error & err, const TQString &
       //kdDebug(5006) << "makeShowAuditLogLink: not showing link (not available)" << endl;
       return i18n("No Audit Log available");
     } else {
-      return i18n("Error Retrieving Audit Log: %1").tqarg( TQString::fromLocal8Bit( err.asString() ) );
+      return i18n("Error Retrieving Audit Log: %1").arg( TQString::fromLocal8Bit( err.asString() ) );
     }
   }
 
@@ -2371,7 +2371,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
         else {
             htmlStr += i18n("Encrypted message (decryption not possible)");
             if( !block.errorText.isEmpty() )
-                htmlStr += "<br />" + i18n("Reason: %1").tqarg( block.errorText );
+                htmlStr += "<br />" + i18n("Reason: %1").arg( block.errorText );
         }
         htmlStr += "</td></tr><tr class=\"encrB\"><td>";
     }
@@ -2428,13 +2428,13 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
         if( isSMIME )
             startKeyHREF =
                 TQString("<a href=\"kmail:showCertificate#%1 ### %2 ### %3\">")
-                .tqarg( cryptProto->displayName(),
+                .arg( cryptProto->displayName(),
                       cryptProto->name(),
                       block.keyId );
         TQString keyWithWithoutURL
             = isSMIME
             ? TQString("%1%2</a>")
-                .tqarg( startKeyHREF,
+                .arg( startKeyHREF,
                       cannotCheckSignature ? i18n("[Details]") : ("0x" + block.keyId) )
             : "0x" + TQString::fromUtf8( block.keyId );
 
@@ -2486,7 +2486,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
                                 i18n("Warning:") +
                                 "</u> " +
                                 i18n("Sender's mail address is not stored "
-                                     "in the %1 used for signing.").tqarg(certificate) +
+                                     "in the %1 used for signing.").arg(certificate) +
                                 "<br />" +
                                 i18n("sender: ") +
                                 msgFrom +
@@ -2512,7 +2512,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
                             "</u> " +
                             i18n("No mail address is stored in the %1 used for signing, "
                                  "so we cannot compare it to the sender's address %2.")
-                            .tqarg(certificate,msgFrom);
+                            .arg(certificate,msgFrom);
                     }
                     if( !greenCaseWarning.isEmpty() ) {
                         if( !statusStr.isEmpty() )
@@ -2535,7 +2535,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
                 if( cannotCheckSignature ) {
                     htmlStr += i18n( "Not enough information to check "
                                      "signature. %1" )
-                                .tqarg( keyWithWithoutURL );
+                                .arg( keyWithWithoutURL );
                 }
                 else {
 
@@ -2553,26 +2553,26 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
                             htmlStr += i18n( "Message was signed with unknown key." );
                         else
                             htmlStr += i18n( "Message was signed by %1." )
-                                    .tqarg( signer );
+                                    .arg( signer );
                     } else {
                         TQDateTime created = block.creationTime;
                         if( created.isValid() ) {
                             if( signer.isEmpty() ) {
                                 if( onlyShowKeyURL )
                                     htmlStr += i18n( "Message was signed with key %1." )
-                                                .tqarg( keyWithWithoutURL );
+                                                .arg( keyWithWithoutURL );
                                 else
                                     htmlStr += i18n( "Message was signed on %1 with key %2." )
-                                                .tqarg( KGlobal::locale()->formatDateTime( created ),
+                                                .arg( KGlobal::locale()->formatDateTime( created ),
                                                       keyWithWithoutURL );
                             }
                             else {
                                 if( onlyShowKeyURL )
                                     htmlStr += i18n( "Message was signed with key %1." )
-                                            .tqarg( keyWithWithoutURL );
+                                            .arg( keyWithWithoutURL );
                                 else
                                     htmlStr += i18n( "Message was signed by %3 on %1 with key %2" )
-                                            .tqarg( KGlobal::locale()->formatDateTime( created ),
+                                            .arg( KGlobal::locale()->formatDateTime( created ),
                                                   keyWithWithoutURL,
                                                   signer );
                             }
@@ -2580,10 +2580,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
                         else {
                             if( signer.isEmpty() || onlyShowKeyURL )
                                 htmlStr += i18n( "Message was signed with key %1." )
-                                        .tqarg( keyWithWithoutURL );
+                                        .arg( keyWithWithoutURL );
                             else
                                 htmlStr += i18n( "Message was signed by %2 with key %1." )
-                                        .tqarg( keyWithWithoutURL,
+                                        .arg( keyWithWithoutURL,
                                               signer );
                         }
                     }
@@ -2621,11 +2621,11 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
                     TQDateTime created = block.creationTime;
                     if ( created.isValid() )
                         htmlStr += i18n( "Message was signed on %1 with unknown key %2." )
-                                .tqarg( KGlobal::locale()->formatDateTime( created ),
+                                .arg( KGlobal::locale()->formatDateTime( created ),
                                       keyWithWithoutURL );
                     else
                         htmlStr += i18n( "Message was signed with unknown key %1." )
-                                .tqarg( keyWithWithoutURL );
+                                .arg( keyWithWithoutURL );
                   }
                   else
                     htmlStr += i18n( "Message was signed with unknown key." );
@@ -2663,10 +2663,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
                     simpleHtmlStr += writeSimpleSigstatHeader( block );
                     if( !block.keyId.isEmpty() )
                         htmlStr += i18n( "Message was signed by %2 (Key ID: %1)." )
-                                   .tqarg( keyWithWithoutURL,
+                                   .arg( keyWithWithoutURL,
                                          signer );
                     else
-                        htmlStr += i18n( "Message was signed by %1." ).tqarg( signer );
+                        htmlStr += i18n( "Message was signed by %1." ).arg( signer );
                     htmlStr += "<br />";
 
                     switch( block.keyTrust )
@@ -2707,10 +2707,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
                     simpleHtmlStr += writeSimpleSigstatHeader( block );
                     if( !block.keyId.isEmpty() )
                         htmlStr += i18n( "Message was signed by %2 (Key ID: %1)." )
-                        .tqarg( keyWithWithoutURL,
+                        .arg( keyWithWithoutURL,
                               signer );
                     else
-                        htmlStr += i18n( "Message was signed by %1." ).tqarg( signer );
+                        htmlStr += i18n( "Message was signed by %1." ).arg( signer );
                     htmlStr += "<br />";
                     htmlStr += i18n("Warning: The signature is bad.");
                     frame = "</td></tr>"
@@ -2763,7 +2763,7 @@ void ObjectTreeParser::writeAttachmentMarkHeader( partNode *node )
   if ( !mReader )
     return;
 
-  htmlWriter()->queue( TQString( "<div id=\"attachmentDiv%1\">\n" ).tqarg( node->nodeId() ) );
+  htmlWriter()->queue( TQString( "<div id=\"attachmentDiv%1\">\n" ).arg( node->nodeId() ) );
 }
 
 //-----------------------------------------------------------------------------
@@ -2798,7 +2798,7 @@ void ObjectTreeParser::writeBodyStr( const TQCString& aStr, const TQTextCodec *a
   bool isPgpMessage = false; // true if the message contains at least one
                              // PGP MESSAGE or one PGP SIGNED MESSAGE block
   TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
-  TQString headerStr = TQString("<div dir=\"%1\">").tqarg(dir);
+  TQString headerStr = TQString("<div dir=\"%1\">").arg(dir);
 
   inlineSignatureState  = KMMsgNotSigned;
   inlineEncryptionState = KMMsgNotEncrypted;
@@ -2970,7 +2970,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
   const unsigned int length = s.length();
 
   // skip leading empty lines
-  for ( pos = 0; pos < length && s.tqat(pos) <= TQChar(' '); pos++ ) { ; }
+  for ( pos = 0; pos < length && s.at(pos) <= TQChar(' '); pos++ ) { ; }
   while (pos > 0 && (s[pos-1] == ' ' || s[pos-1] == '\t')) pos--;
   beg = pos;
 
@@ -3051,8 +3051,8 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
               htmlStr += "<div class=\"quotelevelmark\" >" ;
               htmlStr += TQString( "<a href=\"kmail:levelquote?%1 \">"
                   "<img src=\"%2\" alt=\"\" title=\"\"/></a>" )
-                .tqarg(-1)
-                .tqarg( mExpandIcon );
+                .arg(-1)
+                .arg( mExpandIcon );
               htmlStr += "</div><br/>";
               htmlStr += quoteEnd;
             }
@@ -3060,8 +3060,8 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
             htmlStr += "<div class=\"quotelevelmark\" >" ;
             htmlStr += TQString( "<a href=\"kmail:levelquote?%1 \">"
                 "<img src=\"%2\" alt=\"\" title=\"\"/></a>" )
-              .tqarg(actQuoteLevel)
-              .tqarg( mCollapseIcon);
+              .arg(actQuoteLevel)
+              .arg( mCollapseIcon);
             htmlStr += "</div>";
             if ( actQuoteLevel < 3 )
               htmlStr += quoteFontTag[actQuoteLevel];
@@ -3085,7 +3085,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
       // ignore ^M DOS linebreaks
       if( !line.replace('\015', "").isEmpty() )
       {
-         htmlStr +=TQString( "<div dir=\"%1\">" ).tqarg( line.isRightToLeft() ? "rtl":"ltr" );
+         htmlStr +=TQString( "<div dir=\"%1\">" ).arg( line.isRightToLeft() ? "rtl":"ltr" );
          htmlStr += LinkLocator::convertToHtml( line, convertFlags );
          htmlStr += TQString( "</div>" );
       }
diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h
index b864ea61..f9e71427 100644
--- a/kmail/objecttreeparser.h
+++ b/kmail/objecttreeparser.h
@@ -169,13 +169,13 @@ namespace KMail {
     KMail::CSSHelper * cssHelper() const { return mCSSHelper; }
 
     /** Parse beginning at a given node and recursively parsing
-        the tqchildren of that node and it's next sibling. */
+        the children of that node and it's next sibling. */
     //  Function is called internally by "parseMsg(KMMessage* msg)"
     //  and it will be replaced once KMime is alive.
     void parseObjectTree( partNode * node );
 
   private:
-    /** Standard tqchildren handling a.k.a. multipart/mixed (w/o
+    /** Standard children handling a.k.a. multipart/mixed (w/o
         kroupware hacks) */
     void stdChildHandling( partNode * child );
 
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index 29cdac07..705a0e2c 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -209,7 +209,7 @@ void partNode::buildObjectTree( bool processSiblings )
                      && curNode->dwPart()->Next() ) ) {
             curNode = curNode->mRoot;
         }
-        // we might have to leave when all tqchildren have been processed
+        // we might have to leave when all children have been processed
         if( this == curNode && !processSiblings )
             return;
         // store next node
@@ -279,7 +279,7 @@ KMMsgEncryptionState partNode::overallEncryptionState() const
 {
     KMMsgEncryptionState myState = KMMsgEncryptionStateUnknown;
     if( mEncryptionState == KMMsgNotEncrypted ) {
-        // NOTE: tqchildren are tested ONLY when parent is not encrypted
+        // NOTE: children are tested ONLY when parent is not encrypted
         if( mChild )
             myState = mChild->overallEncryptionState();
         else
@@ -320,7 +320,7 @@ KMMsgSignatureState  partNode::overallSignatureState() const
 {
     KMMsgSignatureState myState = KMMsgSignatureStateUnknown;
     if( mSignatureState == KMMsgNotSigned ) {
-        // tqchildren are tested ONLY when parent is not signed
+        // children are tested ONLY when parent is not signed
         if( mChild )
             myState = mChild->overallSignatureState();
         else
@@ -746,7 +746,7 @@ void partNode::setDisplayedHidden( bool displayedHidden )
 
 TQString partNode::asHREF( const TQString &place ) const
 {
-  return TQString( "attachment:%1?place=%2" ).tqarg( nodeId() ).tqarg( place );
+  return TQString( "attachment:%1?place=%2" ).arg( nodeId() ).arg( place );
 }
 
 partNode::AttachmentDisplayInfo partNode::attachmentDisplayInfo() const
diff --git a/kmail/partNode.h b/kmail/partNode.h
index a043e140..242223a3 100644
--- a/kmail/partNode.h
+++ b/kmail/partNode.h
@@ -150,10 +150,10 @@ public:
         return mEncryptionState;
     }
 
-    // look at the encryption states of all tqchildren and return result
+    // look at the encryption states of all children and return result
     KMMsgEncryptionState overallEncryptionState() const ;
 
-    // look at the signature states of all tqchildren and return result
+    // look at the signature states of all children and return result
     KMMsgSignatureState  overallSignatureState() const ;
 
     void setSignatureState( KMMsgSignatureState state ) {
diff --git a/kmail/partnodebodypart.cpp b/kmail/partnodebodypart.cpp
index d7e6c95d..45ce2862 100644
--- a/kmail/partnodebodypart.cpp
+++ b/kmail/partnodebodypart.cpp
@@ -49,8 +49,8 @@ TQString KMail::PartNodeBodyPart::makeLink( const TQString & path ) const {
   static const int utf8 = 106;
   // FIXME: use a PRNG for the first arg, instead of a serial number
   return TQString( "x-kmail:/bodypart/%1/%2/%3" )
-    .tqarg( serial++ ).tqarg( mPartNode.nodeId() )
-    .tqarg( KURL::encode_string_no_slash( path, utf8 ) );
+    .arg( serial++ ).arg( mPartNode.nodeId() )
+    .arg( KURL::encode_string_no_slash( path, utf8 ) );
 }
 
 TQString KMail::PartNodeBodyPart::asText() const {
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index 15efb0e8..8caba1e4 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -167,7 +167,7 @@ void PopAccount::processNewMail(bool _interactive)
     }
 
     TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" +
-                                       mHost + ":" + TQString("%1").tqarg(mPort) );
+                                       mHost + ":" + TQString("%1").arg(mPort) );
     KConfig config( seenUidList );
     TQStringList uidsOfSeenMsgs = config.readListEntry( "seenUidList" );
     TQValueList<int> timeOfSeenMsgs = config.readIntListEntry( "seenUidTimeList" );
@@ -370,7 +370,7 @@ void PopAccount::startJob()
   if (!runPrecommand(precommand()))
     {
       KMessageBox::sorry(0,
-                         i18n("Could not execute precommand: %1").tqarg(precommand()),
+                         i18n("Could not execute precommand: %1").arg(precommand()),
                          i18n("KMail Error Message"));
       checkDone( false, CheckError );
       return;
@@ -401,7 +401,7 @@ void PopAccount::startJob()
   mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem(
     "MailCheck" + mName,
     escapedName,
-    i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ),
+    i18n("Preparing transmission from \"%1\"...").arg( escapedName ),
     true, // can be canceled
     useSSL() || useTLS() );
   connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
@@ -496,7 +496,7 @@ void PopAccount::slotJobFinished() {
       "the UIDL command: this command is required to determine, in a reliable way, "
       "which of the mails on the server KMail has already seen before;\n"
       "the feature to leave the mails on the server will therefore not "
-      "work properly.").tqarg(NetworkAccount::name()) );
+      "work properly.").arg(NetworkAccount::name()) );
       // An attempt to work around buggy pop servers, these seem to be popular.
       mUidsOfNextSeenMsgsDict = mUidsOfSeenMsgsDict;
     }
@@ -747,21 +747,21 @@ void PopAccount::slotJobFinished() {
     if ( !idsOfMsgsToDelete.isEmpty() ) {
       stage = Dele;
       if ( mMailCheckProgressItem )
-        mMailCheckProgressItem->seStatus(
+        mMailCheckProgressItem->setStatus(
           i18n( "Fetched 1 message from %1. Deleting messages from server...",
                 "Fetched %n messages from %1. Deleting messages from server...",
                 numMsgs )
-          .tqarg( mHost ) );
+          .arg( mHost ) );
       url.setPath("/remove/" + idsOfMsgsToDelete.join(","));
       kdDebug(5006) << "url: " << url.prettyURL() << endl;
     } else {
       stage = Quit;
       if ( mMailCheckProgressItem )
-        mMailCheckProgressItem->seStatus(
+        mMailCheckProgressItem->setStatus(
           i18n( "Fetched 1 message from %1. Terminating transmission...",
                 "Fetched %n messages from %1. Terminating transmission...",
                 numMsgs )
-          .tqarg( mHost ) );
+          .arg( mHost ) );
       url.setPath(TQString("/commit"));
       kdDebug(5006) << "url: " << url.prettyURL() << endl;
     }
@@ -777,11 +777,11 @@ void PopAccount::slotJobFinished() {
     }
     idsOfMsgsToDelete.clear();
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->seStatus(
+      mMailCheckProgressItem->setStatus(
         i18n( "Fetched 1 message from %1. Terminating transmission...",
               "Fetched %n messages from %1. Terminating transmission...",
               numMsgs )
-        .tqarg( mHost ) );
+        .arg( mHost ) );
     KURL url = getUrl();
     url.setPath(TQString("/commit"));
     job = KIO::get( url, false, false );
@@ -798,7 +798,7 @@ void PopAccount::slotJobFinished() {
     if( mMailCheckProgressItem ) { // do this only once...
       bool canceled = !kmkernel || kmkernel->mailCheckAborted() || mMailCheckProgressItem->canceled();
       int numMessages = canceled ? indexOfCurrentMsg : idsOfMsgs.count();
-      BroadcastStatus::instance()->seStatusMsgTransmissionCompleted(
+      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
         this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, mLeaveOnServer, mMailCheckProgressItem );
       // set mMailCheckProgressItem = 0 before calling setComplete() to prevent
       // a race condition
@@ -841,7 +841,7 @@ void PopAccount::saveUidList()
     seenUidTimeList.append( mTimeOfNextSeenMsgsMap[it.currentKey()] );
   }
   TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" +
-                                      mHost + ":" + TQString("%1").tqarg(mPort) );
+                                      mHost + ":" + TQString("%1").arg(mPort) );
   KConfig config( seenUidList );
   config.writeEntry( "seenUidList", uidsOfNextSeenMsgs );
   config.writeEntry( "seenUidTimeList", seenUidTimeList );
@@ -867,7 +867,7 @@ void PopAccount::slotGetNextMsg()
     curMsgStrm = new TQDataStream( curMsgData, IO_WriteOnly );
     curMsgLen = nextLen;
     ++indexOfCurrentMsg;
-    kdDebug(5006) << TQString("Length of message about to get %1").tqarg( nextLen ) << endl;
+    kdDebug(5006) << TQString("Length of message about to get %1").arg( nextLen ) << endl;
     mMsgsPendingDownload.remove( next.key() );
   }
 }
@@ -904,16 +904,16 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
       {
         msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 "
                    "(%7 KB remain on the server).")
-          .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024)
-          .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost).tqarg(numBytes/1024);
+          .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
+          .arg(numBytesToRead/1024).arg(mLogin).arg(mHost).arg(numBytes/1024);
       }
       else
       {
         msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6.")
-          .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024)
-          .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost);
+          .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
+          .arg(numBytesToRead/1024).arg(mLogin).arg(mHost);
       }
-      mMailCheckProgressItem->seStatus( msg );
+      mMailCheckProgressItem->setStatus( msg );
       mMailCheckProgressItem->setProgress(
         (numBytesToRead <= 100) ? 50  // We never know what the server tells us
         // This way of dividing is required for > 21MB of mail
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index 58b2af57..e53a4f18 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -73,8 +73,8 @@ class QuotaInfo {
     if ( isValid() && !isEmpty() ) {
       readConfig();
       int factor = static_cast<int> ( pow( 1000, mFactor ) );
-      return i18n("%1 of %2 %3 used").tqarg( mCurrent.toInt() / factor )
-                                .tqarg( mMax.toInt() / factor ).tqarg( mUnits );
+      return i18n("%1 of %2 %3 used").arg( mCurrent.toInt() / factor )
+                                .arg( mMax.toInt() / factor ).arg( mUnits );
     }
     return TQString();
   }
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 1b39cee8..6b6b6819 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -742,9 +742,9 @@ void RecipientsToolTip::maybeTip( const TQPoint & p )
 
   text.append( "</qt>" );
 
-  TQRect tqgeometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) );
+  TQRect geometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) );
 
-  tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, tqgeometry );
+  tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, geometry );
 }
 
 
@@ -915,8 +915,8 @@ void RecipientsEditor::setRecipientString( const TQString &str,
     if ( count++ > GlobalSettings::self()->maximumRecipients() ) {
       KMessageBox::sorry( this,
         i18n("Truncating recipients list to %1 of %2 entries.")
-        .tqarg( GlobalSettings::self()->maximumRecipients() )
-        .tqarg( r.count() ) );
+        .arg( GlobalSettings::self()->maximumRecipients() )
+        .arg( r.count() ) );
       break;
     }
     addRecipient( *it, type );
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index dcf43f79..60ffffbe 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -783,7 +783,7 @@ void RecipientsPicker::pick( Recipient::Type type )
              "recipients is %1. Please adapt the selection.",
              "You selected %n recipients. The maximum supported number of "
              "recipients is %1. Please adapt the selection.", count)
-      .tqarg( GlobalSettings::self()->maximumRecipients() ) );
+      .arg( GlobalSettings::self()->maximumRecipients() ) );
     return;
   }
 
diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp
index ed8aa5cb..7715c587 100644
--- a/kmail/renamejob.cpp
+++ b/kmail/renamejob.cpp
@@ -220,7 +220,7 @@ void RenameJob::folderCopyComplete(bool success)
     config->writeEntry( it.key(), it.data() );
   }
   mNewFolder->readConfig( config );
-  // make sure the tqchildren state is correct
+  // make sure the children state is correct
   if ( mNewFolder->child() &&
         ( mNewFolder->storage()->hasChildren() == FolderStorage::HasNoChildren ) )
     mNewFolder->storage()->updateChildrenState();
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index 4dc7eb6b..fd5c811f 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -228,7 +228,7 @@ void KMail::RuleWidgetHandlerManager::unregisterHandler( const RuleWidgetHandler
 }
 
 namespace {
-  /** Returns the number of immediate tqchildren of parent with the given object
+  /** Returns the number of immediate children of parent with the given object
       name. Used by RuleWidgetHandlerManager::createWidgets().
   */
   int childCount( const TQObject *parent, const char *objName )
diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index 1a979d4f..154bfdfe 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -252,7 +252,7 @@ void SearchJob::slotSearchFolder()
       // so we need to download all messages and check
       TQString question = i18n("To execute your search all messages of the folder %1 "
           "have to be downloaded from the server. This may take some time. "
-          "Do you want to continue your search?").tqarg( mFolder->label() );
+          "Do you want to continue your search?").arg( mFolder->label() );
       if ( KMessageBox::warningContinueCancel( 0, question,
             i18n("Continue Search"), i18n("&Search"), 
             "continuedownloadingforsearch" ) != KMessageBox::Continue ) 
@@ -267,7 +267,7 @@ void SearchJob::slotSearchFolder()
     mProgress = ProgressManager::createProgressItem(
         "ImapSearchDownload" + ProgressManager::getUniqueID(),
         i18n("Downloading emails from IMAP server"),
-        i18n( "URL: %1" ).tqarg( TQStyleSheet::escape( mFolder->folder()->prettyURL() ) ),
+        i18n( "URL: %1" ).arg( TQStyleSheet::escape( mFolder->folder()->prettyURL() ) ),
         true,
         mAccount->useSSL() || mAccount->useTLS() );
     mProgress->setTotalItems( numMsgs );
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 1a5da268..eac72021 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -418,17 +418,17 @@ void SearchWindow::updStatus(void)
         if(!mStopped) {
             genMsg = i18n("Done.");
             detailMsg = i18n("%n match in %1", "%n matches in %1",
-                             numMatches).tqarg(procMsg);
+                             numMatches).arg(procMsg);
         } else {
             genMsg = i18n("Search canceled.");
             detailMsg = i18n("%n match so far in %1", "%n matches so far in %1",
-                             numMatches).tqarg(procMsg);
+                             numMatches).arg(procMsg);
         }
     } else {
         procMsg = i18n("%n message", "%n messages", numProcessed);
         genMsg = i18n("%n match", "%n matches", numMatches);
         detailMsg = i18n("Searching in %1. %2 searched so far")
-                    .tqarg(folderName).tqarg(procMsg);
+                    .arg(folderName).arg(procMsg);
     }
 
     mStatusBar->changeItem(genMsg, 0);
@@ -497,7 +497,7 @@ void SearchWindow::slotSearch()
       while ((folder = mgr->find(fullName))) {
         if (folder->storage()->inherits("KMFolderSearch"))
           break;
-        fullName = TQString("%1 %2").tqarg(baseName).tqarg(++count);
+        fullName = TQString("%1 %2").arg(baseName).arg(++count);
       }
 
       if (!folder)
diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp
index 1d33e2aa..bc5d2cca 100644
--- a/kmail/sievedebugdialog.cpp
+++ b/kmail/sievedebugdialog.cpp
@@ -253,7 +253,7 @@ void SieveDebugDialog::slotDiagNextAccount()
     KMAccount *acc = mAccountList.first();
     mAccountList.pop_front();
 
-    mEdit->append( i18n( "Collecting data for account '%1'...\n" ).tqarg( acc->name() ) );
+    mEdit->append( i18n( "Collecting data for account '%1'...\n" ).arg( acc->name() ) );
     mEdit->append( i18n( "------------------------------------------------------------\n" ) );
     mAccountBase = dynamic_cast<KMail::ImapAccountBase *>( acc );
     if ( mAccountBase )
@@ -295,7 +295,7 @@ void SieveDebugDialog::slotDiagNextScript()
     TQString scriptFile = mScriptList.first();
     mScriptList.pop_front();
 
-    mEdit->append( i18n( "Contents of script '%1':\n" ).tqarg( scriptFile ) );
+    mEdit->append( i18n( "Contents of script '%1':\n" ).arg( scriptFile ) );
 
     mUrl = urlFromAccount( mAccountBase );
     mUrl.setFileName( scriptFile );
@@ -324,7 +324,7 @@ void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success,
         mEdit->append( i18n(
             "------------------------------------------------------------\n"
             "%1\n"
-            "------------------------------------------------------------\n\n" ).tqarg( script ) );
+            "------------------------------------------------------------\n\n" ).arg( script ) );
     }
 
     // Fetch next script
@@ -363,7 +363,7 @@ void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success,
         for ( TQStringList::const_iterator it = scriptList.begin(); it != scriptList.end(); ++it )
             mEdit->append( "* " + *it + "\n" );
         mEdit->append( "\n" );
-        mEdit->append( i18n( "Active script: %1\n\n" ).tqarg( activeScript ) );
+        mEdit->append( i18n( "Active script: %1\n\n" ).arg( activeScript ) );
     }
 
     // Handle next job: dump scripts for this server
diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui
index 429b598b..f49212ad 100644
--- a/kmail/snippetdlgbase.ui
+++ b/kmail/snippetdlgbase.ui
@@ -110,7 +110,7 @@
                     <property name="text">
                         <string>&amp;Snippet:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index afa610df..2c81c6d2 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -145,7 +145,7 @@ void SnippetWidget::slotAdd()
 SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut )
 {
     SnippetItem * item = new SnippetItem(parent, name, text);
-    const TQString actionName = i18n("Snippet %1").tqarg(name);
+    const TQString actionName = i18n("Snippet %1").arg(name);
     const TQString normalizedName = TQString(actionName).replace(" ", "_");
     if ( !mActionCollection->action(normalizedName.utf8().data() ) ) {
         KAction * action = new KAction( actionName, shortcut, item,
@@ -352,8 +352,8 @@ void SnippetWidget::writeConfig()
     SnippetGroup * group = dynamic_cast<SnippetGroup*>(item);
     if (group) {
       //kdDebug(5006) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl;
-      strKeyName=TQString("snippetGroupName_%1").tqarg(iGroupCount);
-      strKeyId=TQString("snippetGroupId_%1").tqarg(iGroupCount);
+      strKeyName=TQString("snippetGroupName_%1").arg(iGroupCount);
+      strKeyId=TQString("snippetGroupId_%1").arg(iGroupCount);
 
       _cfg->writeEntry(strKeyName, group->getName());
       _cfg->writeEntry(strKeyId, group->getId());
@@ -361,9 +361,9 @@ void SnippetWidget::writeConfig()
       iGroupCount++;
     } else if (dynamic_cast<SnippetItem*>(item)) {
       //kdDebug(5006) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl;
-      strKeyName=TQString("snippetName_%1").tqarg(iSnipCount);
-      strKeyText=TQString("snippetText_%1").tqarg(iSnipCount);
-      strKeyId=TQString("snippetParent_%1").tqarg(iSnipCount);
+      strKeyName=TQString("snippetName_%1").arg(iSnipCount);
+      strKeyText=TQString("snippetText_%1").arg(iSnipCount);
+      strKeyId=TQString("snippetParent_%1").arg(iSnipCount);
 
       _cfg->writeEntry(strKeyName, item->getName());
       _cfg->writeEntry(strKeyText, item->getText());
@@ -373,7 +373,7 @@ void SnippetWidget::writeConfig()
       assert( action );
       const KShortcut& sc = action->shortcut();
       if (!sc.isNull() ) {
-          _cfg->writeEntry( TQString("snippetShortcut_%1").tqarg(iSnipCount), sc.toString() );
+          _cfg->writeEntry( TQString("snippetShortcut_%1").arg(iSnipCount), sc.toString() );
       }
       iSnipCount++;
     } else {
@@ -389,8 +389,8 @@ void SnippetWidget::writeConfig()
   for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) {  //write the saved variable values
     if (it.data().length()<=0) continue;  //is the saved value has no length -> no need to save it
 
-    strKeyName=TQString("snippetSavedName_%1").tqarg(iCount);
-    strKeyText=TQString("snippetSavedVal_%1").tqarg(iCount);
+    strKeyName=TQString("snippetSavedName_%1").arg(iCount);
+    strKeyText=TQString("snippetSavedVal_%1").arg(iCount);
 
     _cfg->writeEntry(strKeyName, it.key());
     _cfg->writeEntry(strKeyText, it.data());
@@ -434,8 +434,8 @@ void SnippetWidget::initConfig()
   int iCount = _cfg->readNumEntry("snippetGroupCount", -1);
 
   for ( int i=0; i<iCount; i++) {  //read the group-list
-    strKeyName=TQString("snippetGroupName_%1").tqarg(i);
-    strKeyId=TQString("snippetGroupId_%1").tqarg(i);
+    strKeyName=TQString("snippetGroupName_%1").arg(i);
+    strKeyId=TQString("snippetGroupId_%1").arg(i);
 
     TQString strNameVal="";
     int iIdVal=-1;
@@ -460,9 +460,9 @@ void SnippetWidget::initConfig()
   if (iCount != -1) {
     iCount = _cfg->readNumEntry("snippetCount", 0);
     for ( int i=0; i<iCount; i++) {  //read the snippet-list
-        strKeyName=TQString("snippetName_%1").tqarg(i);
-        strKeyText=TQString("snippetText_%1").tqarg(i);
-        strKeyId=TQString("snippetParent_%1").tqarg(i);
+        strKeyName=TQString("snippetName_%1").arg(i);
+        strKeyText=TQString("snippetText_%1").arg(i);
+        strKeyId=TQString("snippetParent_%1").arg(i);
 
         TQString strNameVal="";
         TQString strTextVal="";
@@ -474,7 +474,7 @@ void SnippetWidget::initConfig()
         //kdDebug(5006) << "Read item " << strNameVal << " " << iParentVal << endl;
 
         if (strNameVal != "" && strTextVal != "" && iParentVal != -1) {
-            KShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").tqarg(i), TQString() ) );
+            KShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").arg(i), TQString() ) );
             item = makeItem( SnippetItem::findGroupById(iParentVal, _list), strNameVal, strTextVal, shortcut );
             //kdDebug(5006) << "Created item " << item->getName() << " " << item->getParent() << endl;
             _list.append(item);
@@ -487,8 +487,8 @@ void SnippetWidget::initConfig()
   iCount = _cfg->readNumEntry("snippetSavedCount", 0);
 
   for ( int i=1; i<=iCount; i++) {  //read the saved-values and store in TQMap
-    strKeyName=TQString("snippetSavedName_%1").tqarg(i);
-    strKeyText=TQString("snippetSavedVal_%1").tqarg(i);
+    strKeyName=TQString("snippetSavedName_%1").arg(i);
+    strKeyText=TQString("snippetSavedVal_%1").arg(i);
 
     TQString strNameVal="";
     TQString strTextVal="";
@@ -586,7 +586,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
       if ( strName != del+del  ) {  //if not doubel-delimiter
         if (iInMeth == 0) { //if input-method "single" is selected
           if ( mapVar[strName].length() <= 0 ) {  // and not already in map
-            strMsg=i18n("Please enter the value for <b>%1</b>:").tqarg(strName);
+            strMsg=i18n("Please enter the value for <b>%1</b>:").arg(strName);
             strNew = showSingleVarDialog( strName, &_mapSaved, rSingle );
             if (strNew=="")
               return ""; //user clicked Cancle
@@ -729,7 +729,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   bool bReturn = false;
   //resize the textedits
   if (iWidth > 1) {
-    TQRect r = dlg.tqgeometry();
+    TQRect r = dlg.geometry();
     r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count());
     r.setWidth(iWidth);
     dlg.setGeometry(r);
@@ -750,9 +750,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
     }
     bReturn = true;
 
-    iBasicHeight = dlg.tqgeometry().height() - layoutVar->tqgeometry().height();
-    iOneHeight = layoutVar->tqgeometry().height() / mapVar2Te.count();
-    iWidth = dlg.tqgeometry().width();
+    iBasicHeight = dlg.geometry().height() - layoutVar->geometry().height();
+    iOneHeight = layoutVar->geometry().height() / mapVar2Te.count();
+    iWidth = dlg.geometry().width();
   }
 
   //do some cleanup
@@ -799,7 +799,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
 
   labTop = new TQLabel( &dlg, "label" );
   layoutTop->addWidget(labTop, 0, 0);
-  labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var ));
+  labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
   tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
 
 
@@ -849,7 +849,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
 
     strReturn = te->text();    //copy the entered values back the the given map
 
-    dlgSize = dlg.tqgeometry();
+    dlgSize = dlg.geometry();
   }
 
   //do some cleanup
diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp
index 5b9fbf7e..992ce2c4 100644
--- a/kmail/subscriptiondialog.cpp
+++ b/kmail/subscriptiondialog.cpp
@@ -374,7 +374,7 @@ void SubscriptionDialog::doSave()
   if( !a->onlySubscribedFolders() ) {
       int result = KMessageBox::questionYesNoCancel( this,
               i18n("Currently subscriptions are not used for server. %1\nDo you want to enable subscriptions?")
-              .tqarg( a->name() ),
+              .arg( a->name() ),
               i18n("Enable Subscriptions?"), i18n("Enable"), i18n("Do Not Enable"));
       switch(result) {
           case KMessageBox::Yes:
@@ -414,7 +414,7 @@ void SubscriptionDialog::processItems()
   uint done = 0;
   for (uint i = mCount; i < mFolderNames.count(); ++i)
   {
-    // give the dialog a chance to tqrepaint
+    // give the dialog a chance to repaint
     if (done == 1000)
     {
       emit listChanged();
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index f3d48fec..2feebf4e 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -261,7 +261,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         } else if ( mDebug ) {
           KMessageBox::error( 0,
                               i18n( "Cannot insert content from file %1: %2" ).
-                              tqarg( path ).tqarg( file.errorString() ) );
+                              arg( path ).arg( file.errorString() ) );
         }
 
       } else if ( cmd.startsWith( "SYSTEM=" ) ) {
@@ -294,7 +294,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         } else if ( mDebug ) {
           KMessageBox::error( 0,
                               i18n( "Cannot insert content from file %1: %2").
-                              tqarg( path ).tqarg(file.errorString() ));
+                              arg( path ).arg(file.errorString() ));
         }
 
       } else if ( cmd.startsWith( "QUOTEPIPE=" ) ) {
@@ -396,7 +396,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         kdDebug() << "Command: OTEXTSIZE" << endl;
         i += strlen( "OTEXTSIZE" );
         if ( mOrigMsg ) {
-          TQString str = TQString( "%1" ).tqarg( mOrigMsg->body().length() );
+          TQString str = TQString( "%1" ).arg( mOrigMsg->body().length() );
           body.append( str );
         }
 
@@ -967,7 +967,7 @@ void TemplateParser::addProcessedBodyToMessage( const TQString &body )
             DwParameter *nameParameter = new DwParameter;
             nameParameter->SetAttribute( "name" );
             nameParameter->SetValue( Util::dwString( KMMsgBase::encodeRFC2231StringAutoDetectCharset(
-                       i18n( "Attachment %1" ).tqarg( attachmentNumber ) ) ) );
+                       i18n( "Attachment %1" ).arg( attachmentNumber ) ) ) );
             ct.AddParameter( nameParameter );
           }
         }
@@ -1059,7 +1059,7 @@ TQString TemplateParser::findTemplate()
 
   TQString iid;
   if ( mIdentity ) {
-    iid = TQString("IDENTITY_%1").tqarg( mIdentity );	// templates ID for that identity
+    iid = TQString("IDENTITY_%1").arg( mIdentity );	// templates ID for that identity
   }
   else {
     iid = "IDENTITY_NO_IDENTITY"; // templates ID for no identity
@@ -1148,11 +1148,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
             if ( mPipeErr.isEmpty() ) {
               KMessageBox::error( 0,
                                   i18n( "Pipe command exit with status %1: %2").
-                                  tqarg( mPipeRc ).tqarg( cmd ) );
+                                  arg( mPipeRc ).arg( cmd ) );
             } else {
               KMessageBox::detailedError( 0,
                                           i18n( "Pipe command exit with status %1: %2" ).
-                                          tqarg( mPipeRc ).tqarg( cmd ), mPipeErr );
+                                          arg( mPipeRc ).arg( cmd ), mPipeErr );
             }
           }
 
@@ -1163,11 +1163,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
             if ( mPipeErr.isEmpty() ) {
               KMessageBox::error( 0,
                                   i18n( "Pipe command killed by signal %1: %2" ).
-                                  tqarg( -(mPipeRc) ).tqarg( cmd ) );
+                                  arg( -(mPipeRc) ).arg( cmd ) );
             } else {
               KMessageBox::detailedError( 0,
                                           i18n( "Pipe command killed by signal %1: %2" ).
-                                          tqarg( -(mPipeRc) ).tqarg( cmd ), mPipeErr );
+                                          arg( -(mPipeRc) ).arg( cmd ), mPipeErr );
             }
           }
         }
@@ -1179,7 +1179,7 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
         if ( mDebug ) {
           KMessageBox::error( 0,
                               i18n( "Pipe command did not finish within %1 seconds: %2" ).
-                              tqarg( PipeTimeout ).tqarg( cmd ) );
+                              arg( PipeTimeout ).arg( cmd ) );
         }
       }
 
@@ -1190,11 +1190,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
       if ( mDebug ) {
         if ( mPipeErr.isEmpty() ) {
           KMessageBox::error( 0,
-                              i18n( "Cannot write to process stdin: %1" ).tqarg( cmd ) );
+                              i18n( "Cannot write to process stdin: %1" ).arg( cmd ) );
         } else {
           KMessageBox::detailedError( 0,
                                       i18n( "Cannot write to process stdin: %1" ).
-                                      tqarg( cmd ), mPipeErr );
+                                      arg( cmd ), mPipeErr );
         }
       }
     }
@@ -1202,7 +1202,7 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
   } else if ( mDebug ) {
     KMessageBox::error( 0,
                         i18n( "Cannot start pipe command from template: %1" ).
-                        tqarg( cmd ) );
+                        arg( cmd ) );
   }
 
   return mPipeOut;
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 6f39a29c..8b4f37e8 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -102,7 +102,7 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na
             "if they are specified.</p>"
             "</qt>" );
   }
-  mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg( help ) );
+  mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg( help ) );
 }
 
 void TemplatesConfiguration::slotTextChanged()
@@ -163,7 +163,7 @@ void TemplatesConfiguration::saveToGlobal()
 
 void TemplatesConfiguration::loadFromIdentity( uint id )
 {
-  Templates t( TQString("IDENTITY_%1").tqarg( id ) );
+  Templates t( TQString("IDENTITY_%1").arg( id ) );
 
   TQString str;
 
@@ -215,7 +215,7 @@ void TemplatesConfiguration::loadFromIdentity( uint id )
 
 void TemplatesConfiguration::saveToIdentity( uint id )
 {
-  Templates t( TQString("IDENTITY_%1").tqarg( id ) );
+  Templates t( TQString("IDENTITY_%1").arg( id ) );
 
   t.setTemplateNewMessage( strOrBlank( textEdit_new->text() ) );
   t.setTemplateReply( strOrBlank( textEdit_reply->text() ) );
@@ -231,7 +231,7 @@ void TemplatesConfiguration::loadFromFolder( TQString id, uint identity )
   Templates* tid = 0;
 
   if ( identity ) {
-    tid = new Templates( TQString("IDENTITY_%1").tqarg( identity ) );
+    tid = new Templates( TQString("IDENTITY_%1").arg( identity ) );
   }
 
   TQString str;
@@ -344,7 +344,7 @@ void TemplatesConfiguration::loadFromPhrases()
     "----------  %1  ----------\n"
     "%TEXT\n"
     "-------------------------------------------------------\n"
-    ) ).tqarg( convertPhrases( str ) ) );
+    ) ).arg( convertPhrases( str ) ) );
   }
   else {
     textEdit_forward->setText( defaultForward() );
@@ -400,7 +400,7 @@ void TemplatesConfiguration::importFromPhrases()
     "\n"
     "%TEXT\n"
     "-------------------------------------------------------\n"
-    ) ).tqarg( convertPhrases( str ) ) );
+    ) ).arg( convertPhrases( str ) ) );
   }
   else {
     GlobalSettings::self()->setTemplateForward( defaultForward() );
diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui
index a6419987..fb45fd02 100644
--- a/kmail/templatesconfiguration_base.ui
+++ b/kmail/templatesconfiguration_base.ui
@@ -284,7 +284,7 @@
                     <property name="text">
                         <string>&amp;Quote indicator:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index 7b88c029..ad9c22eb 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -561,7 +561,7 @@ namespace {
     TQString displayName, libName, keyId;
     if ( !foundSMIMEData( url.path() + '#' + url.ref(), displayName, libName, keyId ) )
       return TQString();
-    return i18n("Show certificate 0x%1").tqarg( keyId );
+    return i18n("Show certificate 0x%1").arg( keyId );
   }
 }
 
@@ -689,8 +689,8 @@ namespace {
     if ( name.isEmpty() )
       name = msgPart.name();
     if ( !name.isEmpty() )
-      return i18n( "Attachment: %1" ).tqarg( name );
-    return i18n( "Attachment #%1 (unnamed)" ).tqarg( KMReaderWin::msgPartFromUrl( url ) );
+      return i18n( "Attachment: %1" ).arg( name );
+    return i18n( "Attachment #%1 (unnamed)" ).arg( KMReaderWin::msgPartFromUrl( url ) );
   }
 }
 
diff --git a/kmail/util.cpp b/kmail/util.cpp
index d153e9d3..bbf15ba5 100644
--- a/kmail/util.cpp
+++ b/kmail/util.cpp
@@ -146,7 +146,7 @@ void KMail::Util::append( TQByteArray& that, const TQByteArray& str )
   that.detach();
   uint len1 = that.size();
   uint len2 = str.size();
-  if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) )
+  if ( that.resize( len1 + len2, TQGArray::SpeedOptim ) )
     memcpy( that.data() + len1, str.data(), len2 );
 }
 
@@ -157,7 +157,7 @@ void KMail::Util::append( TQByteArray& that, const char* str )
   that.detach();
   uint len1 = that.size();
   uint len2 = tqstrlen(str);
-  if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) )
+  if ( that.resize( len1 + len2, TQGArray::SpeedOptim ) )
     memcpy( that.data() + len1, str, len2 );
 }
 
@@ -166,7 +166,7 @@ void KMail::Util::append( TQByteArray& that, const TQCString& str )
   that.detach();
   uint len1 = that.size();
   uint len2 = str.size() - 1;
-  if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) )
+  if ( that.resize( len1 + len2, TQGArray::SpeedOptim ) )
     memcpy( that.data() + len1, str.data(), len2 );
 }
 
@@ -180,13 +180,13 @@ void KMail::Util::insert( TQByteArray& that, uint index, const char* s )
   int nlen = olen + len;
   if ( index >= olen ) {                      // insert after end of string
     that.detach();
-    if ( that.tqresize(nlen+index-olen, TQGArray::SpeedOptim ) ) {
+    if ( that.resize(nlen+index-olen, TQGArray::SpeedOptim ) ) {
       memset( that.data()+olen, ' ', index-olen );
       memcpy( that.data()+index, s, len );
     }
   } else {
     that.detach();
-    if ( that.tqresize(nlen, TQGArray::SpeedOptim ) ) {    // normal insert
+    if ( that.resize(nlen, TQGArray::SpeedOptim ) ) {    // normal insert
       memmove( that.data()+index+len, that.data()+index, olen-index );
       memcpy( that.data()+index, s, len );
     }
diff --git a/kmail/util.h b/kmail/util.h
index 0d1e263f..9f291a2e 100644
--- a/kmail/util.h
+++ b/kmail/util.h
@@ -206,7 +206,7 @@ namespace Util {
                     KMessageBox::warningContinueCancel(
                         w,
                         i18n( "A file named \"%1\" already exists. "
-                            "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
+                            "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
                         i18n( "Overwrite File?" ),
                         i18n( "&Overwrite" ) ) )
                 return false;
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index 7011185d..d3d374ae 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -475,12 +475,12 @@ namespace KMail {
                                      " { keep; stop; }\n" ); // FIXME?
 
     if ( !domain.isEmpty() ) // FIXME
-      script += TQString::fromLatin1( "if not address :domain :contains \"from\" \"%1\" { keep; stop; }\n" ).tqarg( domain );
+      script += TQString::fromLatin1( "if not address :domain :contains \"from\" \"%1\" { keep; stop; }\n" ).arg( domain );
 
     script += "vacation ";
     script += addressesArgument;
     if ( notificationInterval > 0 )
-      script += TQString::fromLatin1(":days %1 ").tqarg( notificationInterval );
+      script += TQString::fromLatin1(":days %1 ").arg( notificationInterval );
     script += TQString::fromLatin1("text:\n");
     script += dotstuff( messageText.isEmpty() ? defaultMessageText() : messageText );
     script += TQString::fromLatin1( "\n.\n;\n" );
@@ -573,7 +573,7 @@ namespace KMail {
 		"\n"
 		"Yours sincerely,\n"
 		"-- <enter your name and email address here>\n")
-      .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) );
+      .arg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) );
   }
 
   int Vacation::defaultNotificationInterval() {
diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui
index 12d1c405..f16a157b 100644
--- a/kmail/warningconfiguration.ui
+++ b/kmail/warningconfiguration.ui
@@ -103,7 +103,7 @@ It is recommended to leave this option turned on for maximum security.
                     <property name="text">
                         <string>For signing</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -114,7 +114,7 @@ It is recommended to leave this option turned on for maximum security.
                     <property name="text">
                         <string>For encryption</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index afd9f5fe..d329ef36 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -147,7 +147,7 @@ namespace KMail {
     mFromFileBtn = new TQPushButton( i18n("Select File..."), page );
     TQWhatsThis::add( mFromFileBtn,
                      i18n("Use this to select an image file to create the picture from. "
-                         "The image should be of high contrast and nearly quadratic tqshape. "
+                         "The image should be of high contrast and nearly quadratic shape. "
                          "A light background helps improve the result." ) );
     mFromFileBtn->setAutoDefault( false );
     page_vlay->addWidget( mFromFileBtn, 1 );