Rename old tq methods that no longer need a unique name

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-18 18:34:45 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-18 18:34:45 -0600
commit: 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 (patch)
tree: 4138783f7dad757fc5fbfaa8d66a355288d3125e /kmail
parent: 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (diff)
download: tdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.tar.gz
tdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.zip
136 files changed, 901 insertions, 901 deletions
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index 9c24f4598..05802ef7c 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -334,7 +334,7 @@ Currently defined tag values are:
    IdMD5	 5	   u	msgIdMD5().stripWhiteSpace()
    XMark	 6	   u	xmark().stripWhiteSpace()
    Offset	 7	   l	folderOffset() (not only mbox!)
-   LegacytqStatus	 8	   l	mLegacytqStatus
+   LegacyStatus	 8	   l	mLegacyStatus
    Size		 9	   l	msgSize()
    Date		 10	   l	date()
    File		 11	   u	fileName() (not only maildir!)
@@ -342,7 +342,7 @@ Currently defined tag values are:
    MDNSent	 13	   l	mdnSentState()
    ReplyToAuxIdMD5 14	   u	replyToAuxIdMD5()
    StrippedSubject 15	   u	strippedSubjectMD5().stripWhiteSpace()
-   tqStatus	   16	   l	status()
+   Status	   16	   l	status()
 
    u: tqunicode-string-value; l: ulong-value
 
@@ -446,7 +446,7 @@ Currently defined tags are:
    MBoxOffset	     Offset(64) Offset in mbox file (pointing to From_)
    MBoxLength        Size(64)   Length of message in mbox file (incl. From_)
    Size		     Size(64)	rfc2822-size of message (in mbox: excl. From_)
-   tqStatus	     BitField	(see below)
+   Status	     BitField	(see below)
    MessageIdMD5	     MD5Hash	MD5Hash of _normalized_ Message-Id:
    MDNLink	     SerialNumber SerNum of MDN received for this message
    DNSLink	     SerialNumber SerNUm of DSN received for this message
@@ -459,7 +459,7 @@ Currently defined tags are:
    "String" is either Utf8String or (Utf16String or Latin1String),
 	    depending on content
 
-Currently allocated bits for the tqStatus BitField are:
+Currently allocated bits for the Status BitField are:
 
     Bit              Value: on(/off) (\\imapflag)
 
diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index 0fa29906d..0782f3d3b 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -175,7 +175,7 @@ namespace KMail {
       "heiko@ist.eigentlich.net", 0 },
     { "Torsten Kasch", 0, 0, 0 }, // crash fix for Solaris (cf. bug:68801)
     { "Jason 'vanRijn' Kasper", 0, 0, 0 }, // implemented wish 79938 (configurable font for new/unread/important messages)
-    { "Martijn Klingens", 0, 0, 0 }, // fix keyboard navigation in the tqStatus combo of the quick search
+    { "Martijn Klingens", 0, 0, 0 }, // fix keyboard navigation in the Status combo of the quick search
     { "Christoph Kl\303\274nter", 0, 0, 0 }, // fix for bug:88216 (drag&drop from KAddressBook to the To: field)
     { "Martin Koller", 0, 0, 0 }, // optional columns in the message list
     { "Tobias K\303\266nig", 0, 0, 0 }, // edit recent addresses, store email<->OpenPGP key association in address book
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 93616ac8f..3712346ec 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -258,7 +258,7 @@ ProcmailRCParser::expandVars(const TQString &s)
   TQAsciiDictIterator<TQString> it( mVars ); // iterator for dict
 
   while ( it.current() ) {
-    expS.replace(TQString::tqfromLatin1("$") + it.currentKey(), *it.current());
+    expS.replace(TQString::fromLatin1("$") + it.currentKey(), *it.current());
     ++it;
   }
 
@@ -306,7 +306,7 @@ AccountDialog::AccountDialog( const TQString & caption, KMAccount *account,
   else
   {
     TQString msg = i18n( "Account type is not supported." );
-    KMessageBox::information( tqtopLevelWidget(),msg,i18n("Configure Account") );
+    KMessageBox::information( topLevelWidget(),msg,i18n("Configure Account") );
     return;
   }
 
@@ -361,7 +361,7 @@ void AccountDialog::makeLocalAccountPage()
   group->tqlayout()->setSpacing( 0 );
   group->tqlayout()->setMargin( 0 );
   TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() );
-  groupLayout->tqsetAlignment( TQt::AlignTop );
+  groupLayout->setAlignment( TQt::AlignTop );
   groupLayout->setSpacing( 6 );
   groupLayout->setMargin( 11 );
 
@@ -905,7 +905,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   // button to reload
   TQToolButton* button = new TQToolButton( box );
   button->setAutoRaise(true);
-  button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   button->setFixedSize( 22, 22 );
   button->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "reload", KIcon::Small, 0 ) );
@@ -924,7 +924,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mImap.editPNS->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) );
   mImap.editPNS->setAutoRaise( true );
-  mImap.editPNS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mImap.editPNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mImap.editPNS->setFixedSize( 22, 22 );
   connect( mImap.editPNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditPersonalNamespace()) );
 
@@ -936,7 +936,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mImap.editONS->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) );
   mImap.editONS->setAutoRaise( true );
-  mImap.editONS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mImap.editONS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mImap.editONS->setFixedSize( 22, 22 );
   connect( mImap.editONS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditOtherUsersNamespace()) );
 
@@ -948,7 +948,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mImap.editSNS->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) );
   mImap.editSNS->setAutoRaise( true );
-  mImap.editSNS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mImap.editSNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mImap.editSNS->setFixedSize( 22, 22 );
   connect( mImap.editSNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSharedNamespace()) );
 
@@ -1451,7 +1451,7 @@ void AccountDialog::slotLeaveOnServerClicked()
     slotEnableLeaveOnServerSize( state );
   }
   if ( !( mCurCapa & UIDL ) && mPop.leaveOnServerCheck->isChecked() ) {
-    KMessageBox::information( tqtopLevelWidget(),
+    KMessageBox::information( topLevelWidget(),
                               i18n("The server does not seem to support unique "
                                    "message numbers, but this is a "
                                    "requirement for leaving messages on the "
@@ -1466,7 +1466,7 @@ void AccountDialog::slotLeaveOnServerClicked()
 void AccountDialog::slotFilterOnServerClicked()
 {
   if ( !( mCurCapa & TOP ) && mPop.filterOnServerCheck->isChecked() ) {
-    KMessageBox::information( tqtopLevelWidget(),
+    KMessageBox::information( topLevelWidget(),
                               i18n("The server does not seem to support "
                                    "fetching message headers, but this is a "
                                    "requirement for filtering messages on the "
@@ -1481,7 +1481,7 @@ void AccountDialog::slotFilterOnServerClicked()
 void AccountDialog::slotPipeliningClicked()
 {
   if (mPop.usePipeliningCheck->isChecked())
-    KMessageBox::information( tqtopLevelWidget(),
+    KMessageBox::information( topLevelWidget(),
       i18n("Please note that this feature can cause some POP3 servers "
       "that do not support pipelining to send corrupted mail;\n"
       "this is configurable, though, because some servers support pipelining "
@@ -1636,7 +1636,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa )
   mPop.authAPOP->setEnabled( capa & APOP );
   if ( !( capa & Pipelining ) && mPop.usePipeliningCheck->isChecked() ) {
     mPop.usePipeliningCheck->setChecked( false );
-    KMessageBox::information( tqtopLevelWidget(),
+    KMessageBox::information( topLevelWidget(),
                               i18n("The server does not seem to support "
                                    "pipelining; therefore, this option has "
                                    "been disabled.\n"
@@ -1655,7 +1655,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa )
   }
   if ( !( capa & UIDL ) && mPop.leaveOnServerCheck->isChecked() ) {
     mPop.leaveOnServerCheck->setChecked( false );
-    KMessageBox::information( tqtopLevelWidget(),
+    KMessageBox::information( topLevelWidget(),
                               i18n("The server does not seem to support unique "
                                    "message numbers, but this is a "
                                    "requirement for leaving messages on the "
@@ -1668,7 +1668,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa )
   }
   if ( !( capa & TOP ) && mPop.filterOnServerCheck->isChecked() ) {
     mPop.filterOnServerCheck->setChecked( false );
-    KMessageBox::information( tqtopLevelWidget(),
+    KMessageBox::information( topLevelWidget(),
                               i18n("The server does not seem to support "
                                    "fetching message headers, but this is a "
                                    "requirement for filtering messages on the "
@@ -2307,7 +2307,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
     button->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small, 0 ) );
     button->setAutoRaise( true );
-    button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+    button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
     button->setFixedSize( 22, 22 );
     mLineEditMap[ mBg->insert( button ) ] = edit;
   }
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 21a9f8cdc..a086292a8 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -149,7 +149,7 @@ void AccountManager::processNextCheck( bool _newMail )
     kdDebug(5006) << "account " << acct->name() << " finished check" << endl;
     mAcctChecking.remove( acct );
     kmkernel->filterMgr()->deref();
-    disconnect( acct, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
+    disconnect( acct, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                       this, TQT_SLOT( processNextCheck( bool ) ) );
   }
   if ( mAcctChecking.isEmpty() ) {
@@ -219,7 +219,7 @@ void AccountManager::processNextCheck( bool _newMail )
     }
   }
 
-  connect( curAccount, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
+  connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                 this, TQT_SLOT( processNextCheck( bool ) ) );
 
   KPIM::BroadcastStatus::instance()->seStatusMsg(
diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp
index 33a7e5837..1ad1a69be 100644
--- a/kmail/acljobs.cpp
+++ b/kmail/acljobs.cpp
@@ -122,7 +122,7 @@ TQString ACLJobs::permissionsToString( unsigned int permissions )
 
 KIO::SimpleJob* ACLJobs::setACL( KIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions )
 {
-  TQString perm = TQString::tqfromLatin1( permissionsToIMAPRights( permissions ) );
+  TQString perm = TQString::fromLatin1( permissionsToIMAPRights( permissions ) );
 
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 71475a93d..f699ff906 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->setqStatus(msg->status());
+    newMsg->seStatus(msg->status());
     newMsg->setComplete(msg->isComplete());
     newMsg->setHeaderField( "X-KMail-Filtered", serNumS );
     mSrcFolder->addMsg( newMsg );
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 4091c715c..e0b40fc67 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -517,7 +517,7 @@ void AntiSpamWizard::checkToolAvailability()
     }
     else {
       // check the availability of the application
-      KApplication::kApplication()->tqprocessEvents( 200 );
+      KApplication::kApplication()->processEvents( 200 );
       if ( !checkForProgram( (*it).getExecutable() ) ) {
         mInfoPage->addAvailableTool( (*it).getVisibleName() );
         found = true;
diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp
index 21c345fb3..c8068ec4d 100644
--- a/kmail/archivefolderdialog.cpp
+++ b/kmail/archivefolderdialog.cpp
@@ -46,7 +46,7 @@ static TQString standardArchivePath( const TQString &folderName )
   }
   return currentPath +
     i18n( "Start of the filename for a mail archive file" , "Archive" ) + "_" + folderName +
-    "_" + TQDate::tqcurrentDate().toString( Qt::ISODate ) + ".tar.bz2";
+    "_" + TQDate::currentDate().toString( Qt::ISODate ) + ".tar.bz2";
 }
 
 ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
@@ -120,7 +120,7 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
   mainLayout->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), row, 0 );
 
   // Make it a bit bigger, else the folder requester cuts off the text too early
-  resize( 500, tqminimumSize().height() );
+  resize( 500, minimumSize().height() );
 }
 
 void ArchiveFolderDialog::slotUrlChanged( const TQString &text )
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index 43209ca7b..af9a75c38 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -165,7 +165,7 @@ void BackupJob::finish()
     }
   }
 
-  mProgressItem->setqStatus( i18n( "Archiving finished" ) );
+  mProgressItem->seStatus( i18n( "Archiving finished" ) );
   mProgressItem->setComplete();
   mProgressItem = 0;
 
@@ -388,7 +388,7 @@ void BackupJob::archiveNextFolder()
 
   mCurrentFolder = mPendingFolders.take( 0 );
   kdDebug(5006) << "===> Archiving next folder: " << mCurrentFolder->name() << endl;
-  mProgressItem->setqStatus( i18n( "Archiving folder %1" ).tqarg( mCurrentFolder->name() ) );
+  mProgressItem->seStatus( i18n( "Archiving folder %1" ).tqarg( mCurrentFolder->name() ) );
   if ( mCurrentFolder->open( "BackupJob" ) != 0 ) {
     abort( i18n( "Unable to open folder '%1'.").tqarg( mCurrentFolder->name() ) );
     return;
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index f47cc9ddf..ec7dece78 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::tqfromLatin1(";UID=%1").tqarg(uids) );
+               TQString::fromLatin1(";UID=%1").tqarg(uids) );
 
   KIO::SimpleJob *simpleJob = KIO::file_delete( url, false );
   KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
@@ -248,7 +248,7 @@ void CachedImapJob::expungeFolder()
 {
   KURL url = mAccount->getUrl();
   // Special URL that means EXPUNGE
-  url.setPath( mFolder->imapPath() + TQString::tqfromLatin1(";UID=*") );
+  url.setPath( mFolder->imapPath() + TQString::fromLatin1(";UID=*") );
 
   KIO::SimpleJob *job = KIO::file_delete( url, false );
   KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
@@ -311,7 +311,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
       mFolder->addMsgInternal( mMsg, true, &index );
 
       if ( kmkernel->iCalIface().isResourceFolder( mFolder->folder() ) ) {
-        mFolder->setqStatus( index, KMMsgStatusRead, false );
+        mFolder->seStatus( index, KMMsgStatusRead, false );
       }
 
       emit messageRetrieved( mMsg );
@@ -339,7 +339,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
   mMsg->setUID(mfd.uid);
   mMsg->setMsgSizeServer(mfd.size);
   if( mfd.flags > 0 )
-    KMFolderImap::flagsTotqStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX);
+    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));
 
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp
index 35aa6ef3f..aa563c46e 100644
--- a/kmail/compactionjob.cpp
+++ b/kmail/compactionjob.cpp
@@ -103,7 +103,7 @@ int MboxCompactionJob::executeNow( bool silent )
   }
   kdDebug(5006) << "Compacting " << mSrcFolder->idString() << endl;
 
-  if (KMFolderIndex::IndexOk != mbox->indextqStatus()) {
+  if (KMFolderIndex::IndexOk != mbox->indexStatus()) {
       kdDebug(5006) << "Critical error: " << storage->location() <<
           " has been modified by an external application while KMail was running." << endl;
       //      exit(1); backed out due to broken nfs
diff --git a/kmail/composercryptoconfiguration.ui b/kmail/composercryptoconfiguration.ui
index 7ffe6c9d3..429933d45 100644
--- a/kmail/composercryptoconfiguration.ui
+++ b/kmail/composercryptoconfiguration.ui
@@ -137,7 +137,7 @@ However, there may be local rules that require you to turn this option on. When
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 59223cf89..6dd25347d 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -281,7 +281,7 @@ void ConfigureDialog::slotUser2() {
 // *                                                           *
 // *************************************************************
 TQString IdentityPage::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-identity");
+  return TQString::fromLatin1("configure-identity");
 }
 
 IdentityPage::IdentityPage( TQWidget * parent, const char * name )
@@ -552,7 +552,7 @@ void IdentityPage::slotUpdateTransportCombo( const TQStringList & sl )
 // *                                                           *
 // *************************************************************
 TQString AccountsPage::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-accounts");
+  return TQString::fromLatin1("configure-accounts");
 }
 
 AccountsPage::AccountsPage( TQWidget * parent, const char * name )
@@ -578,7 +578,7 @@ AccountsPage::AccountsPage( TQWidget * parent, const char * name )
 }
 
 TQString AccountsPage::SendingTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-accounts-sending");
+  return TQString::fromLatin1("configure-accounts-sending");
 }
 
 AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name )
@@ -599,7 +599,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
 
   // hbox tqlayout: stretch 10, spacing inherited from vlay
   hlay = new TQHBoxLayout();
-  vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's tqsizeHint
+  vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's sizeHint
 
   // transport list: left widget in hlay; stretch 1
   // ### FIXME: allow inline renaming of the account:
@@ -787,10 +787,10 @@ void AccountsPage::SendingTab::slotAddTransport()
   KMTransportInfo *transportInfo = new KMTransportInfo();
   switch ( transportType ) {
   case 0: // smtp
-    transportInfo->type = TQString::tqfromLatin1("smtp");
+    transportInfo->type = TQString::fromLatin1("smtp");
     break;
   case 1: // sendmail
-    transportInfo->type = TQString::tqfromLatin1("sendmail");
+    transportInfo->type = TQString::fromLatin1("sendmail");
     transportInfo->name = i18n("Sendmail");
     transportInfo->host = _PATH_SENDMAIL; // ### FIXME: use const, not #define
     break;
@@ -1026,7 +1026,7 @@ void AccountsPage::SendingTab::doLoadOther() {
       buffer[255] = 0;
     else
       buffer[0] = 0;
-    str = TQString::tqfromLatin1( *buffer ? buffer : "localhost" );
+    str = TQString::fromLatin1( *buffer ? buffer : "localhost" );
   }
   mDefaultDomainEdit->setText( str );
 }
@@ -1053,7 +1053,7 @@ void AccountsPage::SendingTab::save() {
 }
 
 TQString AccountsPage::ReceivingTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-accounts-receiving");
+  return TQString::fromLatin1("configure-accounts-receiving");
 }
 
 AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name )
@@ -1127,7 +1127,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
 
   // "beep on new mail" check box:
   mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group );
-  mBeepNewMailCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  mBeepNewMailCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
                                                  TQSizePolicy::Fixed ) );
   connect( mBeepNewMailCheck, TQT_SIGNAL( stateChanged( int ) ),
            this, TQT_SLOT( slotEmitChanged( void ) ) );
@@ -1135,7 +1135,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
   // "Detailed new mail notification" check box
   mVerboseNotificationCheck =
     new TQCheckBox( i18n( "Deta&iled new mail notification" ), group );
-  mVerboseNotificationCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  mVerboseNotificationCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
                                                          TQSizePolicy::Fixed ) );
   TQToolTip::add( mVerboseNotificationCheck,
                  i18n( "Show for each folder the number of newly arrived "
@@ -1147,7 +1147,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
 
   // "Other Actions" button:
   mOtherNewMailActionsButton = new TQPushButton( i18n("Other Actio&ns"), group );
-  mOtherNewMailActionsButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
+  mOtherNewMailActionsButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
                                                           TQSizePolicy::Fixed ) );
   connect( mOtherNewMailActionsButton, TQT_SIGNAL(clicked()),
            this, TQT_SLOT(slotEditNotifications()) );
@@ -1229,7 +1229,7 @@ void AccountsPage::ReceivingTab::slotAddAccount() {
   }
 
   KMAccount *account
-    = kmkernel->acctMgr()->create( TQString::tqfromLatin1( accountType ) );
+    = kmkernel->acctMgr()->create( TQString::fromLatin1( accountType ) );
   if ( !account ) {
     // ### FIXME: Give the user more information. Is this error
     // recoverable?
@@ -1478,7 +1478,7 @@ void AccountsPage::ReceivingTab::save() {
 // *                                                           *
 // *************************************************************
 TQString AppearancePage::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-appearance");
+  return TQString::fromLatin1("configure-appearance");
 }
 
 AppearancePage::AppearancePage( TQWidget * parent, const char * name )
@@ -1525,7 +1525,7 @@ AppearancePage::AppearancePage( TQWidget * parent, const char * name )
 
 
 TQString AppearancePage::FontsTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-appearance-fonts");
+  return TQString::fromLatin1("configure-appearance-fonts");
 }
 
 static const struct {
@@ -1694,7 +1694,7 @@ void AppearancePage::FontsTab::save() {
 }
 
 TQString AppearancePage::ColorsTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-appearance-colors");
+  return TQString::fromLatin1("configure-appearance-colors");
 }
 
 
@@ -1857,7 +1857,7 @@ void AppearancePage::ColorsTab::save() {
 }
 
 TQString AppearancePage::LayoutTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-appearance-tqlayout");
+  return TQString::fromLatin1("configure-appearance-tqlayout");
 }
 
 static const EnumConfigEntryItem folderListModes[] = {
@@ -1976,7 +1976,7 @@ void AppearancePage::LayoutTab::save() {
 //
 
 TQString AppearancePage::HeadersTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-appearance-headers");
+  return TQString::fromLatin1("configure-appearance-headers");
 }
 
 static const struct {
@@ -2246,7 +2246,7 @@ static const BoolConfigEntry showCurrentTime = {
 };
 
 TQString AppearancePage::ReaderTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-appearance-reader");
+  return TQString::fromLatin1("configure-appearance-reader");
 }
 
 AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
@@ -2472,7 +2472,7 @@ void AppearancePage::ReaderTab::installProfile( KConfig * /* profile */ ) {
 
 
 TQString AppearancePage::SystemTrayTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-appearance-systemtray");
+  return TQString::fromLatin1("configure-appearance-systemtray");
 }
 
 AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent,
@@ -2537,7 +2537,7 @@ void AppearancePage::SystemTrayTab::save() {
 // *************************************************************
 
 TQString ComposerPage::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-composer");
+  return TQString::fromLatin1("configure-composer");
 }
 
 ComposerPage::ComposerPage( TQWidget * parent, const char * name )
@@ -2596,7 +2596,7 @@ ComposerPage::ComposerPage( TQWidget * parent, const char * name )
 }
 
 TQString ComposerPage::GeneralTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-composer-general");
+  return TQString::fromLatin1("configure-composer-general");
 }
 
 ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name )
@@ -2910,7 +2910,7 @@ void ComposerPage::GeneralTab::slotConfigureCompletionOrder( )
 }
 
 TQString ComposerPage::PhrasesTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-composer-phrases");
+  return TQString::fromLatin1("configure-composer-phrases");
 }
 
 ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name )
@@ -3122,7 +3122,7 @@ void ComposerPage::PhrasesTab::save() {
 }
 
 TQString ComposerPage::TemplatesTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-composer-templates");
+  return TQString::fromLatin1("configure-composer-templates");
 }
 
 ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const char * name )
@@ -3146,7 +3146,7 @@ void ComposerPage::TemplatesTab::save() {
 }
 
 TQString ComposerPage::CustomTemplatesTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-composer-custom-templates");
+  return TQString::fromLatin1("configure-composer-custom-templates");
 }
 
 ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * parent, const char * name )
@@ -3170,7 +3170,7 @@ void ComposerPage::CustomTemplatesTab::save() {
 }
 
 TQString ComposerPage::SubjectTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-composer-subject");
+  return TQString::fromLatin1("configure-composer-subject");
 }
 
 ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name )
@@ -3190,7 +3190,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
   // row 0: help text:
   label = new TQLabel( i18n("Recognize any sequence of the following prefixes\n"
                            "(entries are case-insensitive regular expressions):"), group );
-  label->tqsetAlignment( AlignLeft|WordBreak );
+  label->setAlignment( AlignLeft|WordBreak );
 
   // row 1, string list editor:
   SimpleStringListEditor::ButtonCode buttonCode =
@@ -3219,7 +3219,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
   // row 0: help text:
   label= new TQLabel( i18n("Recognize any sequence of the following prefixes\n"
                           "(entries are case-insensitive regular expressions):"), group );
-  label->tqsetAlignment( AlignLeft|WordBreak );
+  label->setAlignment( AlignLeft|WordBreak );
 
   // row 1: string list editor
   mForwardListEditor =
@@ -3254,7 +3254,7 @@ void ComposerPage::SubjectTab::save() {
 }
 
 TQString ComposerPage::CharsetTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-composer-charset");
+  return TQString::fromLatin1("configure-composer-charset");
 }
 
 ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name )
@@ -3269,7 +3269,7 @@ ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char *
   label = new TQLabel( i18n("This list is checked for every outgoing message "
                            "from the top to the bottom for a charset that "
                            "contains all required characters."), this );
-  label->tqsetAlignment( WordBreak);
+  label->setAlignment( WordBreak);
   vlay->addWidget( label );
 
   mCharsetListEditor =
@@ -3297,13 +3297,13 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
 
   // KCharsets::codecForName("us-ascii") returns "iso-8859-1" (cf. Bug #49812)
   // therefore we have to treat this case specially
-  if ( charset.lower() == TQString::tqfromLatin1("us-ascii") ) {
-    charset = TQString::tqfromLatin1("us-ascii");
+  if ( charset.lower() == TQString::fromLatin1("us-ascii") ) {
+    charset = TQString::fromLatin1("us-ascii");
     return;
   }
 
-  if ( charset.lower() == TQString::tqfromLatin1("locale") ) {
-    charset =  TQString::tqfromLatin1("%1 (locale)")
+  if ( charset.lower() == TQString::fromLatin1("locale") ) {
+    charset =  TQString::fromLatin1("%1 (locale)")
       .tqarg( TQString( kmkernel->networkCodec()->mimeName() ).lower() );
     return;
   }
@@ -3311,7 +3311,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
   bool ok = false;
   TQTextCodec *codec = KGlobal::charsets()->codecForName( charset, ok );
   if ( ok && codec ) {
-    charset = TQString::tqfromLatin1( codec->mimeName() ).lower();
+    charset = TQString::fromLatin1( codec->mimeName() ).lower();
     return;
   }
 
@@ -3325,7 +3325,7 @@ void ComposerPage::CharsetTab::doLoadOther() {
   TQStringList charsets = composer.readListEntry( "pref-charsets" );
   for ( TQStringList::Iterator it = charsets.begin() ;
         it != charsets.end() ; ++it )
-    if ( (*it) == TQString::tqfromLatin1("locale") ) {
+    if ( (*it) == TQString::fromLatin1("locale") ) {
       TQCString cset = kmkernel->networkCodec()->mimeName();
       KPIM::kAsciiToLower( cset.data() );
       (*it) = TQString("%1 (locale)").tqarg( TQString(cset) );
@@ -3349,7 +3349,7 @@ void ComposerPage::CharsetTab::save() {
 }
 
 TQString ComposerPage::HeadersTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-composer-headers");
+  return TQString::fromLatin1("configure-composer-headers");
 }
 
 ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * name )
@@ -3564,7 +3564,7 @@ void ComposerPage::HeadersTab::save() {
 }
 
 TQString ComposerPage::AttachmentsTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-composer-attachments");
+  return TQString::fromLatin1("configure-composer-attachments");
 }
 
 ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
@@ -3601,7 +3601,7 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
   // "Attachment key words" label and string list editor
   label = new TQLabel( i18n("Recognize any of the following key words as "
                            "intention to attach a file:"), this );
-  label->tqsetAlignment( AlignLeft|WordBreak );
+  label->setAlignment( AlignLeft|WordBreak );
   vlay->addWidget( label );
 
   SimpleStringListEditor::ButtonCode buttonCode =
@@ -3629,11 +3629,11 @@ void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() {
   TQStringList attachWordsList = GlobalSettings::self()->attachmentKeywords();
   if ( attachWordsList.isEmpty() ) {
     // default value
-    attachWordsList << TQString::tqfromLatin1("attachment")
-                    << TQString::tqfromLatin1("attached");
-    if ( TQString::tqfromLatin1("attachment") != i18n("attachment") )
+    attachWordsList << TQString::fromLatin1("attachment")
+                    << TQString::fromLatin1("attached");
+    if ( TQString::fromLatin1("attachment") != i18n("attachment") )
       attachWordsList << i18n("attachment");
-    if ( TQString::tqfromLatin1("attached") != i18n("attached") )
+    if ( TQString::fromLatin1("attached") != i18n("attached") )
       attachWordsList << i18n("attached");
   }
 
@@ -3669,7 +3669,7 @@ void ComposerPageAttachmentsTab::slotOutlookCompatibleClicked()
 // *                                                           *
 // *************************************************************
 TQString SecurityPage::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-security");
+  return TQString::fromLatin1("configure-security");
 }
 
 SecurityPage::SecurityPage( TQWidget * parent, const char * name )
@@ -3716,7 +3716,7 @@ void SecurityPage::installProfile( KConfig * profile ) {
 }
 
 TQString SecurityPage::GeneralTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-security-reading");
+  return TQString::fromLatin1("configure-security-reading");
 }
 
 SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name )
@@ -3993,7 +3993,7 @@ void SecurityPage::GeneralTab::save() {
 
 
 TQString SecurityPage::ComposerCryptoTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-security-composing");
+  return TQString::fromLatin1("configure-security-composing");
 }
 
 SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, const char * name )
@@ -4068,7 +4068,7 @@ void SecurityPage::ComposerCryptoTab::save() {
 }
 
 TQString SecurityPage::WarningTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-security-warnings");
+  return TQString::fromLatin1("configure-security-warnings");
 }
 
 SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * name )
@@ -4177,7 +4177,7 @@ void SecurityPage::WarningTab::slotReenableAllWarningsClicked() {
 ////
 
 TQString SecurityPage::SMimeTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-security-smime-validation");
+  return TQString::fromLatin1("configure-security-smime-validation");
 }
 
 SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name )
@@ -4495,7 +4495,7 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp
 ////
 
 TQString SecurityPage::CryptPlugTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-security-crypto-backends");
+  return TQString::fromLatin1("configure-security-crypto-backends");
 }
 
 SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const char * name )
@@ -4528,7 +4528,7 @@ void SecurityPage::CryptPlugTab::save() {
 // *                                                           *
 // *************************************************************
 TQString MiscPage::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-misc");
+  return TQString::fromLatin1("configure-misc");
 }
 
 MiscPage::MiscPage( TQWidget * parent, const char * name )
@@ -4543,7 +4543,7 @@ MiscPage::MiscPage( TQWidget * parent, const char * name )
 }
 
 TQString MiscPage::FolderTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-misc-folders");
+  return TQString::fromLatin1("configure-misc-folders");
 }
 
 MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
@@ -4797,7 +4797,7 @@ void MiscPage::FolderTab::save() {
 }
 
 TQString MiscPage::GroupwareTab::helpAnchor() const {
-  return TQString::tqfromLatin1("configure-misc-groupware");
+  return TQString::fromLatin1("configure-misc-groupware");
 }
 
 MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index 6357e1e86..ccc0230b1 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -43,7 +43,7 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities,
   : KDialogBase( parent, name, modal, i18n("New Identity"),
 		 Ok|Cancel|Help, Ok, true )
 {
-  setHelp( TQString::tqfromLatin1("configure-identity-newidentitydialog") );
+  setHelp( TQString::fromLatin1("configure-identity-newidentitydialog") );
   TQWidget * page = makeMainWidget();
   TQVBoxLayout * vlay = new TQVBoxLayout( page, 0, spacingHint() );
 
@@ -169,26 +169,26 @@ void ListView::setVisibleItem( int visibleItem, bool updateSize )
   mVisibleItem = TQMAX( 1, visibleItem );
   if( updateSize == true )
   {
-    TQSize s = tqsizeHint();
-    setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() +
+    TQSize s = sizeHint();
+    setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() +
 		    lineWidth() * 2, s.height() );
   }
 }
 
 
-TQSize ListView::tqsizeHint() const
+TQSize ListView::sizeHint() const
 {
-  TQSize s = TQListView::tqsizeHint();
+  TQSize s = TQListView::sizeHint();
 
   int h = fontMetrics().height() + 2*itemMargin();
   if( h % 2 > 0 ) { h++; }
 
-  s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height());
+  s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height());
   return s;
 }
 
 
-static TQString flagPng = TQString::tqfromLatin1("/flag.png");
+static TQString flagPng = TQString::fromLatin1("/flag.png");
 
 NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
 				      TQWidget *parent, const char *name,
@@ -203,7 +203,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
   hlay->addWidget( mComboBox, 1 );
 
   TQStringList pathList = KGlobal::dirs()->findAllResources( "locale",
-                               TQString::tqfromLatin1("*/entry.desktop") );
+                               TQString::fromLatin1("*/entry.desktop") );
   // extract a list of language tags that should not be included:
   TQStringList suppressedAcronyms;
   for ( LanguageItemList::Iterator lit = suppressedLangs.begin();
@@ -224,7 +224,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
 
     if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) {
       // not found:
-      TQString displayname = TQString::tqfromLatin1("%1 (%2)")
+      TQString displayname = TQString::fromLatin1("%1 (%2)")
 	.tqarg( name ).tqarg( acronym );
       TQPixmap flag( locate("locale", acronym + flagPng ) );
       mComboBox->insertItem( flag, displayname );
@@ -251,11 +251,11 @@ LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name
 
 int LanguageComboBox::insertLanguage( const TQString & language )
 {
-  static TQString entryDesktop = TQString::tqfromLatin1("/entry.desktop");
+  static TQString entryDesktop = TQString::fromLatin1("/entry.desktop");
   KSimpleConfig entry( locate("locale", language + entryDesktop) );
   entry.setGroup( "KCM Locale" );
   TQString name = entry.readEntry( "Name" );
-  TQString output = TQString::tqfromLatin1("%1 (%2)").tqarg( name ).tqarg( language );
+  TQString output = TQString::fromLatin1("%1 (%2)").tqarg( name ).tqarg( 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::tqfromLatin1("(%1)").tqarg( language );
+  TQString parenthizedLanguage = TQString::fromLatin1("(%1)").tqarg( language );
   for (int i = 0; i < count(); i++)
     // ### FIXME: use .endWith():
     if ( text(i).find( parenthizedLanguage ) >= 0 ) {
@@ -323,7 +323,7 @@ void ProfileDialog::slotSelectionChanged()
 void ProfileDialog::setup() {
   mListView->clear();
   // find all profiles (config files named "profile-xyz-rc"):
-  const TQString profileFilenameFilter = TQString::tqfromLatin1("kmail/profile-*-rc");
+  const TQString profileFilenameFilter = TQString::fromLatin1("kmail/profile-*-rc");
   mProfileList = KGlobal::dirs()->findAllResources( "data", profileFilenameFilter );
 
   kdDebug(5006) << "Profile manager: found " << mProfileList.count()
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index e095b1756..51dca5e16 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -1094,7 +1094,7 @@ public:
   void resizeColums();
 
   void setVisibleItem( int visibleItem, bool updateSize=true );
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
 
 protected:
   virtual void resizeEvent( TQResizeEvent *e );
diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui
index 7060794cc..c72ccec05 100644
--- a/kmail/customtemplates_base.ui
+++ b/kmail/customtemplates_base.ui
@@ -47,7 +47,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>100</width>
                                     <height>0</height>
diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp
index e992eace5..b6b0f6d7f 100644
--- a/kmail/expirypropertiesdialog.cpp
+++ b/kmail/expirypropertiesdialog.cpp
@@ -73,7 +73,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
 
   labelDays2 = new TQLabel( privateLayoutWidget, "labelDays2" );
   labelDays2->setText( i18n( "days" ) );
-  labelDays2->tqsetAlignment( int( TQLabel::AlignTop ) );
+  labelDays2->setAlignment( int( TQLabel::AlignTop ) );
   unreadHBox->addWidget( labelDays2 );
   globalVBox->addLayout( unreadHBox );
 
@@ -81,7 +81,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
 
   expiryActionLabel = new TQLabel( privateLayoutWidget, "expiryActionLabel" );
   expiryActionLabel->setText( i18n( "Expiry action:" ) );
-  expiryActionLabel->tqsetAlignment( int( TQLabel::AlignVCenter ) );
+  expiryActionLabel->setAlignment( int( TQLabel::AlignVCenter ) );
   expiryActionHBox->addWidget( expiryActionLabel );
 
   actionsHBox = new TQVBoxLayout( 0, 0, 6, "actionsHBox");
@@ -111,7 +111,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
 
   note = new TQLabel( privateLayoutWidget, "note" );
   note->setText( i18n( "Note: Expiry action will be applied immediately after confirming settings." ) );
-  note->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+  note->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
   globalVBox->addWidget( note );
 
   // Load the values from the folder
@@ -144,7 +144,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
       folderSelector->setFolder( destFolder );
   }
   slotUpdateControls();
-  resize( TQSize(295, 204).expandedTo(tqminimumSizeHint()) );
+  resize( TQSize(295, 204).expandedTo(minimumSizeHint()) );
   clearWState( WState_Polished );
 }
 
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 26daf6a23..63b67ffc4 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -328,7 +328,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
   topLayout->addWidget( mStack );
 
   mLabel = new TQLabel( mStack );
-  mLabel->tqsetAlignment( AlignHCenter | AlignVCenter | WordBreak );
+  mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak );
   mStack->addWidget( mLabel );
 
   mACLWidget = new TQHBox( mStack );
@@ -352,7 +352,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
   mEditACL = new KPushButton( i18n( "Modify Entry..." ), buttonBox );
   mRemoveACL = new KPushButton( i18n( "Remove Entry" ), buttonBox );
   TQWidget *spacer = new TQWidget( buttonBox );
-  spacer->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
+  spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
   connect( mAddACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddACL() ) );
   connect( mEditACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditACL() ) );
@@ -632,7 +632,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL()
     return;
   if ( !ACLitem->isNew() ) {
     if ( mImapAccount && mImapAccount->login() == ACLitem->userId() ) {
-      if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( tqtopLevelWidget(),
+      if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( topLevelWidget(),
          i18n( "Do you really want to remove your own permissions for this folder? You will not be able to access it afterwards." ), i18n( "Remove" ) ) )
         return;
     }
@@ -642,7 +642,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL()
   emit changed(true);
 }
 
-KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaACLTab::accept()
+KMail::FolderDiaTab::AccepStatus KMail::FolderDiaACLTab::accept()
 {
   if ( !mChanged || !mImapAccount )
     return Accepted; // (no change made), ok for accepting the dialog immediately
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index 901e12d1e..f518cbd35 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -94,7 +94,7 @@ public:
 
   virtual void load();
   virtual bool save();
-  virtual AcceptqStatus accept();
+  virtual AccepStatus accept();
 
   static bool supports( KMFolder* refFolder );
 
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 195a00b1f..7c133bb8f 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -62,7 +62,7 @@ KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* pare
   topLayout->addWidget( mStack );
 
   mLabel = new TQLabel( mStack );
-  mLabel->tqsetAlignment( AlignHCenter | AlignVCenter | WordBreak );
+  mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak );
   mStack->addWidget( mLabel );
 
   mQuotaWidget = new KMail::QuotaWidget( mStack );
@@ -187,7 +187,7 @@ void KMail::FolderDiaQuotaTab::showQuotaWidget()
 }
 
 
-KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaQuotaTab::accept()
+KMail::FolderDiaTab::AccepStatus KMail::FolderDiaQuotaTab::accept()
 {
   if ( mFolderType == KMFolderTypeCachedImap || mFolderType == KMFolderTypeImap )
     return Accepted;
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index 9d2d968db..be91bba2b 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -60,7 +60,7 @@ public:
 
   virtual void load();
   virtual bool save();
-  virtual AcceptqStatus accept();
+  virtual AccepStatus accept();
 
   static bool supports( KMFolder* refFolder );
 
diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui
index b154aac12..c21b2d4b7 100644
--- a/kmail/folderpropertiesdialog.ui
+++ b/kmail/folderpropertiesdialog.ui
@@ -73,7 +73,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -140,13 +140,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>28</width>
                             <height>28</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>28</width>
                             <height>28</height>
@@ -166,7 +166,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -188,13 +188,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>28</width>
                             <height>28</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>28</width>
                             <height>28</height>
@@ -228,7 +228,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>101</width>
                             <height>20</height>
@@ -296,7 +296,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -321,7 +321,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -434,7 +434,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -507,7 +507,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>120</width>
                             <height>80</height>
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index 23636e365..242037b9a 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -55,7 +55,7 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree )
   button->setIconSet( KGlobal::iconLoader()->loadIconSet( "folder", KIcon::Small, 0 ) );
   connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenDialog()) );
 
-  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
         TQSizePolicy::Fixed ) );
   setFocusPolicy( TQ_StrongFocus );
 }
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 63dc91fb5..57241cd4b 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->setqStatus(KMMsgStatusUnread);
+      msgBase->seStatus(KMMsgStatusUnread);
       msgBase->setDirty(true);
     }
   }
@@ -861,18 +861,18 @@ bool FolderStorage::isCloseToQuota() const
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::msgStatusChanged(const KMMsgtqStatus oldtqStatus,
-  const KMMsgtqStatus newtqStatus, int idx)
+void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus,
+  const KMMsgStatus newStatus, int idx)
 {
   int oldUnread = 0;
   int newUnread = 0;
 
-  if (((oldtqStatus & KMMsgStatusUnread || oldtqStatus & KMMsgStatusNew) &&
-      !(oldtqStatus & KMMsgStatusIgnored)) ||
+  if (((oldStatus & KMMsgStatusUnread || oldStatus & KMMsgStatusNew) &&
+      !(oldStatus & KMMsgStatusIgnored)) ||
       (folder() == kmkernel->outboxFolder()))
     oldUnread = 1;
-  if (((newtqStatus & KMMsgStatusUnread || newtqStatus & KMMsgStatusNew) &&
-      !(newtqStatus & KMMsgStatusIgnored)) ||
+  if (((newStatus & KMMsgStatusUnread || newStatus & KMMsgStatusNew) &&
+      !(newStatus & KMMsgStatusIgnored)) ||
       (folder() == kmkernel->outboxFolder()))
     newUnread = 1;
   int deltaUnread = newUnread - oldUnread;
@@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::setqStatus(int idx, KMMsgtqStatus status, bool toggle)
+void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle)
 {
   KMMsgBase *msg = getMsgBase(idx);
   if ( msg ) {
     if (toggle)
-      msg->toggletqStatus(status, idx);
+      msg->toggleStatus(status, idx);
     else
-      msg->setqStatus(status, idx);
+      msg->seStatus(status, idx);
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void FolderStorage::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle)
+void FolderStorage::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
 {
   for ( TQValueList<int>::Iterator it = ids.begin(); it != ids.end(); ++it )
   {
-    FolderStorage::setqStatus(*it, status, toggle);
+    FolderStorage::seStatus(*it, status, toggle);
   }
 }
 
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index 550b45e55..390675a25 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -245,10 +245,10 @@ public:
    * be reflected in the UI.  */
   virtual bool isCloseToQuota() const;
 
-  /** Called by KMMsgBase::setqStatus when status of a message has changed
+  /** Called by KMMsgBase::seStatus when status of a message has changed
       required to keep the number unread messages variable current. */
-  virtual void msgStatusChanged( const KMMsgtqStatus oldtqStatus,
-                                 const KMMsgtqStatus newtqStatus,
+  virtual void msgStatusChanged( const KMMsgStatus oldStatus,
+                                 const KMMsgStatus newStatus,
 				 int idx);
 
   /** Open folder for access.
@@ -364,10 +364,10 @@ public:
   void deregisterFromMessageDict();
 
   /** Set the status of the message at index @p idx to @p status. */
-  virtual void setqStatus(int idx, KMMsgtqStatus status, bool toggle=false);
+  virtual void seStatus(int idx, KMMsgStatus status, bool toggle=false);
 
   /** Set the status of the message(s) in the TQValueList @p ids to @p status. */
-  virtual void setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle=false);
+  virtual void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
 
   void removeJobs();
 
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index 8e4f56ddd..096d22764 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -20,8 +20,8 @@ class FolderViewToolTip : public TQToolTip
       KMFolderTreeItem *item = dynamic_cast<KMFolderTreeItem*>( mListView->itemAt( point ) );
       if  ( !item )
         return;
-      const TQRect tqitemRect = mListView->tqitemRect( item );
-      if ( !tqitemRect.isValid() )
+      const TQRect itemRect = mListView->itemRect( item );
+      if ( !itemRect.isValid() )
         return;
       const TQRect headerRect = mListView->header()->sectionRect( 0 );
       if ( !headerRect.isValid() )
@@ -43,7 +43,7 @@ class FolderViewToolTip : public TQToolTip
               tipText += i18n("<br>Quota: %1").tqarg( info.toString() );
       }
       
-      tip( TQRect( headerRect.left(), tqitemRect.top(), headerRect.width(), tqitemRect.height() ), tipText );
+      tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ), tipText );
     }
 
   private:
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 81a4252cb..14d467327 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -309,7 +309,7 @@ const TQPixmap *HeaderItem::pixmap(int col) const
       if ( msgBase->isWatched() ) pixmaps << *KMHeaders::pixWatched;
     }
 
-    if ( !headers->mPaintInfo.showtqStatus ) {
+    if ( !headers->mPaintInfo.showStatus ) {
       const TQPixmap *pix = statusIcon(msgBase);
       if ( pix ) pixmaps << *pix;
     }
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index 4d5669a1a..5fe00e022 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -51,7 +51,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
                                               KListView *listView,
                                               KActionCollection *actionCollection,
                                               const char *name )
-  : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mtqStatus(0),  statusList()
+  : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mStatus(0),  statusList()
 {
   KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
                                            TQApplication::reverseLayout()
@@ -72,16 +72,16 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
   mStatusCombo->setSizeLimit( 12 );
   mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") );
 
-  insertqStatus( StatusUnread );
-  insertqStatus( StatusNew );
-  insertqStatus( StatusImportant );
-  insertqStatus( StatusReplied );
-  insertqStatus( StatusForwarded );
-  insertqStatus( StatusToDo );
-  insertqStatus( StatusHasAttachment );
-  insertqStatus( StatusInvitation );
-  insertqStatus( StatusWatched );
-  insertqStatus( StatusIgnored );
+  inserStatus( StatusUnread );
+  inserStatus( StatusNew );
+  inserStatus( StatusImportant );
+  inserStatus( StatusReplied );
+  inserStatus( StatusForwarded );
+  inserStatus( StatusToDo );
+  inserStatus( StatusHasAttachment );
+  inserStatus( StatusInvitation );
+  inserStatus( StatusWatched );
+  inserStatus( StatusIgnored );
   mStatusCombo->setCurrentItem( 0 );
   mStatusCombo->installEventFilter( this );
   connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ),
@@ -145,10 +145,10 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event )
 bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQString &s) const
 {
   mCurrentSearchTerm = s; // bit of a hack, but works
-  if ( mtqStatus != 0 ) {
+  if ( mStatus != 0 ) {
     KMHeaders *headers = static_cast<KMHeaders*>( item->listView() );
     const KMMsgBase *msg = headers->getMsgBaseForItem( item );
-    if ( !msg || ! ( msg->status() & mtqStatus ) )
+    if ( !msg || ! ( msg->status() & mStatus ) )
       return false;
   }
 
@@ -176,13 +176,13 @@ void HeaderListQuickSearch::reset()
 void HeaderListQuickSearch::sloStatusChanged( int index )
 {
   if ( index == 0 )
-    mtqStatus = 0;
+    mStatus = 0;
   else
-    mtqStatus = KMSearchRuletqStatus::statusFromEnglishName( statusList[index - 1] );
+    mStatus = KMSearchRuleStatus::statusFromEnglishName( statusList[index - 1] );
   updateSearch();
 }
 
-void HeaderListQuickSearch::insertqStatus(KMail::StatusValueTypes which)
+void HeaderListQuickSearch::inserStatus(KMail::StatusValueTypes which)
 {
   mStatusCombo->insertItem( SmallIcon( KMail::StatusValues[which].icon ),
     i18n( KMail::StatusValues[ which ].text ) );
@@ -196,9 +196,9 @@ TQString HeaderListQuickSearch::currentSearchTerm() const
 }
 
 
-int HeaderListQuickSearch::currentqStatus() const
+int HeaderListQuickSearch::currenStatus() const
 {
-    return mtqStatus;
+    return mStatus;
 }
 
 } // namespace KMail
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index e0589c7d6..0e3c4c9de 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -31,7 +31,7 @@
 #ifndef KMAILHEADERLISTQUICKSEARCH_H
 #define KMAILHEADERLISTQUICKSEARCH_H
 
-#include "kmmsgbase.h" // for KMMsgtqStatus
+#include "kmmsgbase.h" // for KMMsgStatus
 #include "kmsearchpattern.h"
 #include <klistviewsearchline.h>
 #include <tqvaluevector.h>
@@ -67,7 +67,7 @@ public:
     /**
      * Returns the currently selected status filter.
      */
-    int currentqStatus() const;
+    int currenStatus() const;
 
 public slots:
    void reset();
@@ -78,22 +78,22 @@ signals:
 protected:
     /**
      * checks whether @param item contains the search string and has the status
-     * currently in mtqStatus
+     * currently in mStatus
      */
     virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const;
 
 private slots:
   /**
-   * cache the status in mtqStatus so as to avoid having to do the comparatively
+   * cache the status in mStatus so as to avoid having to do the comparatively
    * expensive string comparison for each item in itemMatches
    */
   void sloStatusChanged( int index );
 
 private:
     /** Helper method for the filling of the status combo. */
-    void insertqStatus(KMail::StatusValueTypes which);
+    void inserStatus(KMail::StatusValueTypes which);
     TQComboBox *mStatusCombo;
-    KMMsgtqStatus mtqStatus;
+    KMMsgStatus mStatus;
     TQValueVector<TQString> statusList;
     mutable TQString mCurrentSearchTerm;
 };
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index ac45aeeb6..405f802b1 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -457,7 +457,7 @@ namespace KMail {
     }
 
     // Spam header display.
-    // If the spamSpamtqStatus config value is true then we look for headers
+    // If the spamSpamStatus config value is true then we look for headers
     // from a few spam filters and try to create visually meaningful graphics
     // out of the spam scores.
 
@@ -493,7 +493,7 @@ namespace KMail {
           presence = imProxy->presenceString( kabcUid );
           if ( !presence.isEmpty() )
           {
-            TQString presenceIcon = TQString::tqfromLatin1( " <img src=\"%1\"/>" )
+            TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" )
                 .tqarg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
             presence += presenceIcon;
           }
@@ -830,8 +830,8 @@ namespace KMail {
       headerStr.append( TQString( "<tr><th>%1</th>\n"
                                  "<td dir=\"%2\">%3</td></tr>\n")
                                     .tqarg(i18n("Sender status: "))
-                                    .tqarg( directionOf( onlinetqStatus ) )
-                                    .tqarg(onlinetqStatus));
+                                    .tqarg( directionOf( onlineStatus ) )
+                                    .tqarg(onlineStatus));
     */
     headerStr.append( TQString("<tr><td colspan=\"2\"><div id=\"attachmentInjectionPoint\"></div></td></tr>" ) );
     headerStr.append(
@@ -853,7 +853,7 @@ namespace KMail {
     TQBuffer buffer( ba );
     buffer.open( IO_WriteOnly );
     image.save( &buffer, fmt );
-    return TQString::tqfromLatin1("data:image/%1;base64,%2")
+    return TQString::fromLatin1("data:image/%1;base64,%2")
            .tqarg( fmt, KCodecs::base64Encode( ba ).data() );
   }
 
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index 79af65979..d8c002515 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -52,9 +52,9 @@ KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * parent, const char * name, WFlag
   : TQLabel( parent, name, f ),
     mMode( Normal )
 {
-  tqsetAlignment( AlignHCenter|AlignTop );
+  setAlignment( AlignHCenter|AlignTop );
   // Don't force a minimum height to the reader widget
-  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
+  setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
   upd();
 }
 
diff --git a/kmail/identitydrag.cpp b/kmail/identitydrag.cpp
index 106cb5896..88df48f6a 100644
--- a/kmail/identitydrag.cpp
+++ b/kmail/identitydrag.cpp
@@ -54,7 +54,7 @@ namespace KMail {
       return 0;
   }
 
-  TQByteArray IdentityDrag::tqencodedData( const char * mimetype ) const {
+  TQByteArray IdentityDrag::encodedData( const char * mimetype ) const {
     TQByteArray a;
 
     if ( !qstrcmp( mimetype, kmailIdentityMimeType ) ) {
@@ -73,7 +73,7 @@ namespace KMail {
   bool IdentityDrag::decode( const TQMimeSource * e, KPIM::Identity & i ) {
 
     if ( e->provides( kmailIdentityMimeType ) ) {
-      TQDataStream s( e->tqencodedData( kmailIdentityMimeType ), IO_ReadOnly );
+      TQDataStream s( e->encodedData( kmailIdentityMimeType ), IO_ReadOnly );
       s >> i;
       return true;
     }
diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h
index a93095ff5..d0e468a17 100644
--- a/kmail/identitydrag.h
+++ b/kmail/identitydrag.h
@@ -52,7 +52,7 @@ namespace KMail {
     virtual ~IdentityDrag() {}
 
     const char * format( int i ) const; // reimp. TQMimeSource
-    TQByteArray tqencodedData( const char * mimetype ) const; // dto.
+    TQByteArray encodedData( const char * mimetype ) const; // dto.
 
     static bool canDecode( const TQMimeSource * e );
     static bool decode( const TQMimeSource * e, KPIM::Identity & ident );
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index f1dbaae11..df90dfdb2 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -1031,9 +1031,9 @@ namespace KMail {
     mCheckingSingleFolder = ( type == Single );
     if ( checkingMail() )
     {
-      disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
+      disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                   this, TQT_SLOT( slotCheckQueuedFolders() ) );
-      connect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
+      connect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                this, TQT_SLOT( slotCheckQueuedFolders() ) );
     } else {
       slotCheckQueuedFolders();
@@ -1043,7 +1043,7 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   void ImapAccountBase::slotCheckQueuedFolders()
   {
-    disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
+    disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                 this, TQT_SLOT( slotCheckQueuedFolders() ) );
 
     TQValueList<TQGuardedPtr<KMFolder> > mSaveList = mMailCheckFolders;
@@ -1194,7 +1194,7 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags )
+  void ImapAccountBase::setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags )
   {
      // set the status on the server, the uids are integrated in the path
      kdDebug(5006) << "setImapStatus path=" << path << " to: " << flags << endl;
@@ -1218,7 +1218,7 @@ namespace KMail {
            TQT_SLOT(slotSeStatusResult(KIO::Job *)));
   }
 
-  void ImapAccountBase::setImapSeentqStatus(KMFolder * folder, const TQString & path, bool seen)
+  void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen)
   {
      KURL url = getUrl();
      url.setPath(path);
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 533be4839..d9f3e7cb3 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -231,13 +231,13 @@ namespace KMail {
      * Set the status on the server
      * Emits imapStatusChanged signal on success/error.
      */
-    void setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags );
+    void setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags );
 
     /**
      * Set seen status on the server.
      * Emits imapStatusChanged signal on success/error.
      */
-    void setImapSeentqStatus( KMFolder* folder, const TQString& path, bool seen );
+    void setImapSeenStatus( KMFolder* folder, const TQString& path, bool seen );
 
     /**
      * The KIO-Slave died
@@ -597,7 +597,7 @@ namespace KMail {
 
     /**
      * Emitted upon completion of the job for setting the status for a group of UIDs,
-     * as a result of a setImaptqStatus call.
+     * as a result of a setImapStatus call.
      * On error, if the user chooses abort (not continue), cont is set to false.
      */
     void imapStatusChanged( KMFolder*, const TQString& imapPath, bool cont );
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index 3ddb93f39..693414164 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -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->setqStatus( errorStr );
+      (*it).progressItem->seStatus( 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->setqStatus( i18n("Uploading message data failed.") );
+      (*it).progressItem->seStatus( i18n("Uploading message data failed.") );
     account->handlePutError( job, *it, mDestFolder );
     return;
   } else {
     if ( (*it).progressItem )
-      (*it).progressItem->setqStatus( i18n("Uploading message data completed.") );
+      (*it).progressItem->seStatus( 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->setqStatus( errStr );
+      (*it).progressItem->seStatus( errStr );
     if ( account->handleJobError( job, errStr  ) )
       deleteLater();
     return;
diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp
index eeea23d78..0da3448ca 100644
--- a/kmail/importarchivedialog.cpp
+++ b/kmail/importarchivedialog.cpp
@@ -73,7 +73,7 @@ ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags fla
   mainLayout->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), row, 0 );
 
   // Make it a bit bigger, else the folder requester cuts off the text too early
-  resize( 500, tqminimumSize().height() );
+  resize( 500, minimumSize().height() );
 }
 
 void ImportArchiveDialog::setFolder( KMFolder *defaultFolder )
diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index 96ea86b5e..783c2dd5c 100644
--- a/kmail/importjob.cpp
+++ b/kmail/importjob.cpp
@@ -211,7 +211,7 @@ void KMail::ImportJob::importNextMessage()
       return;
     }
     kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl;
-    mProgressItem->setqStatus( i18n( "Importing folder %1" ).tqarg( mCurrentFolder->name() ) );
+    mProgressItem->seStatus( i18n( "Importing folder %1" ).tqarg( 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 /* setqStatus */ );
+  mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* seStatus */ );
   int retIndex;
 
   // If this is not an IMAP folder, we can add the message directly. Otherwise, the whole thing is
diff --git a/kmail/index.cpp b/kmail/index.cpp
index 5604003d4..674588f24 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::tqfromLatin1( " %1 " ).tqarg( rule->contents() );
+				terms += TQString::fromLatin1( " %1 " ).tqarg( rule->contents() );
 			}
 
 			mValues = kmkernel->msgIndex()->simpleSearch( terms, 0  );
diff --git a/kmail/kcursorsaver.h b/kmail/kcursorsaver.h
index 3f6526d72..ec02eb946 100644
--- a/kmail/kcursorsaver.h
+++ b/kmail/kcursorsaver.h
@@ -14,7 +14,7 @@ class KCursorSaver : public TQt
 {
 public:
     /// constructor taking TQCursor tqshapes
-    KCursorSaver(TQt::tqCursorShape tqshape) {
+    KCursorSaver(TQt::CursorShape tqshape) {
         TQApplication::setOverrideCursor( TQCursor(tqshape) );
         inited = true;
     }
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index 7cadcba97..fa013b8d0 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -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->setqStatus(KMMsgStatusUnread);  // -sanders
-    //    aMsg->setqStatus(KMMsgStatusRead);
+      aMsg->seStatus(KMMsgStatusUnread);  // -sanders
+    //    aMsg->seStatus(KMMsgStatusRead);
     else
-      aMsg->setqStatus(KMMsgStatusNew);
+      aMsg->seStatus(KMMsgStatusNew);
   }
 /*
 TQFile fileD0( "testdat_xx-kmaccount-0" );
@@ -470,7 +470,7 @@ void KMAccount::pseudoAssign( const KMAccount * a ) {
 }
 
 //-----------------------------------------------------------------------------
-void KMAccount::checkDone( bool newmail, ChecktqStatus status )
+void KMAccount::checkDone( bool newmail, CheckStatus status )
 {
     setCheckingMail( false );
   // Reset the timeout for automatic mailchecking. The user might have
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 43f3aca3a..e5c1f4e78 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -83,7 +83,7 @@ class KMAccount: public TQObject, public KAccount
 public:
   virtual ~KMAccount();
 
-  enum ChecktqStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted,
+  enum CheckStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted,
                      CheckError };
 
   /** The default check interval */
@@ -231,7 +231,7 @@ public:
    * @param newMail true if new mail arrived
    * @param status the status of the mail check
    */
-  void checkDone( bool newMail, ChecktqStatus status );
+  void checkDone( bool newMail, CheckStatus status );
 
   /**
    * Abort all running mail checks. Used when closing the last KMMainWin.
@@ -260,7 +260,7 @@ signals:
    * @param newMail true if there was new mail
    * @param status the status of the mail check
    **/
-  virtual void finishedCheck( bool newMail, ChecktqStatus status );
+  virtual void finishedCheck( bool newMail, CheckStatus status );
 
   /**
    * Emitted after the mail check is finished.
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 9066941c6..2a797acbb 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -186,7 +186,7 @@ void KMAcctCachedImap::slotCheckQueuedFolders()
     mMailCheckFolders.append( mFoldersQueuedForChecking.front() );
     mFoldersQueuedForChecking.pop_front();
     if ( mFoldersQueuedForChecking.isEmpty() )
-      disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
+      disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                   this, TQT_SLOT( slotCheckQueuedFolders() ) );
 
     kmkernel->acctMgr()->singleCheckMail(this, true);
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index fe74bc80a..6690bd008 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -395,7 +395,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
   if ( mMailCheckProgressItem ) {
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->setqStatus( folder->prettyURL() + i18n(" completed") );
+    mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") );
   }
   mCountRemainChecks--;
 
@@ -488,8 +488,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
     mCountLastUnread = 0; // => mCountUnread - mCountLastUnread == new count
     // when we check only one folder (=selected) and we have new mails
     // then do not display a summary as the normal status message is better
-    bool showtqStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true;
-    ImapAccountBase::postProcessNewMail( showtqStatus );
+    bool showStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true;
+    ImapAccountBase::postProcessNewMail( showStatus );
     mUnreadBeforeCheck.clear();
     mCheckingSingleFolder = false;
   }
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 88424e13e..9af6e2cae 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -196,7 +196,7 @@ bool KMAcctLocal::fetchMsg()
   //BroadcastStatus::instance()->seStatusMsg( statusMsg );
   mMailCheckProgressItem->incCompletedItems();
   mMailCheckProgressItem->updateProgress();
-  mMailCheckProgressItem->setqStatus( statusMsg );
+  mMailCheckProgressItem->seStatus( 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->setqStatus(msg->headerField("Status").latin1(),
+    msg->seStatus(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));
@@ -250,7 +250,7 @@ void KMAcctLocal::postProcess()
 
     if( mMailCheckProgressItem ) { // do this only once...
       BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
-      mMailCheckProgressItem->setqStatus(
+      mMailCheckProgressItem->seStatus(
         i18n( "Fetched 1 message from mailbox %1.",
               "Fetched %n messages from mailbox %1.",
               mNumMsgs ).tqarg( mMailFolder->location() ) );
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index 818e614d0..bcf29f118 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -165,12 +165,12 @@ void KMAcctMaildir::processNewMail(bool)
     TQString statusMsg = statusMsgStub.tqarg(i);
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->setqStatus( statusMsg );
+    mMailCheckProgressItem->seStatus( statusMsg );
 
     msg = mailFolder.take(0);
     if (msg)
     {
-      msg->setqStatus(msg->headerField("Status").latin1(),
+      msg->seStatus(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));
@@ -189,7 +189,7 @@ void KMAcctMaildir::processNewMail(bool)
 
   if( mMailCheckProgressItem ) { // do this only once...
     BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( num );
-    mMailCheckProgressItem->setqStatus(
+    mMailCheckProgressItem->seStatus(
       i18n( "Fetched 1 message from maildir folder %1.",
             "Fetched %n messages from maildir folder %1.",
             num ).tqarg(mailFolder.location() ) );
diff --git a/kmail/kmail.antispamrc b/kmail/kmail.antispamrc
index 2bef9ad09..098f80c26 100644
--- a/kmail/kmail.antispamrc
+++ b/kmail/kmail.antispamrc
@@ -20,7 +20,7 @@ UseRegExp=0
 SupportsBayes=1
 SupportsUnsure=0
 ScoreName=Spamassassin
-ScoreHeader=X-Spam-tqStatus
+ScoreHeader=X-Spam-Status
 ScoreType=Adjusted
 ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.]
 ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.]
@@ -139,7 +139,7 @@ UseRegExp=0
 SupportsBayes=1
 SupportsUnsure=0
 ScoreName=Spamassassin
-ScoreHeader=X-Spam-tqStatus
+ScoreHeader=X-Spam-Status
 ScoreType=Adjusted
 ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.]
 ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.]
@@ -163,7 +163,7 @@ UseRegExp=0
 SupportsBayes=1
 SupportsUnsure=0
 ScoreName=Spamassassin
-ScoreHeader=X-Spam-tqStatus
+ScoreHeader=X-Spam-Status
 ScoreType=Adjusted
 ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.]
 ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.]
@@ -222,7 +222,7 @@ PipeFilterName=CRM114 Check
 PipeCmdDetect=crm -u $HOME/.crm114 mailreaver.crm
 ExecCmdSpam=crm -u $HOME/.crm114 mailreaver.crm --spam
 ExecCmdHam=crm -u $HOME/.crm114 mailreaver.crm --good
-DetectionHeader=X-CRM114-tqStatus
+DetectionHeader=X-CRM114-Status
 DetectionPattern=SPAM
 DetectionPattern2=UNSURE
 DetectionOnly=0
@@ -230,7 +230,7 @@ UseRegExp=0
 SupportsBayes=1
 SupportsUnsure=1
 ScoreName=CRM114
-ScoreHeader=X-CRM114-tqStatus
+ScoreHeader=X-CRM114-Status
 ScoreType=Bool
 ScoreValueRegexp=SPAM
 ScoreThresholdRegexp=
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 452f3fe43..ac418a952 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -223,7 +223,7 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
   mainWidget->initializeFilterActions();
   mainWidget->initializeFolderShortcutActions();
   mainWidget->setupForwardingActionsList();
-  mainWidget->updateVactionScriptqStatus();
+  mainWidget->updateVactionScripStatus();
 }
 
 void KMailPart::exit()
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 1376932e0..45654d276 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -671,19 +671,19 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder )
     }
 
     TQString label = folder->prettyURL();
-    TQStringList parts = TQStringList::split( TQString::tqfromLatin1("/"), label );
+    TQStringList parts = TQStringList::split( TQString::fromLatin1("/"), label );
 
     // In the common special case of some other user's folder shared with us
     // the url looks like "Server Name/user/$USERNAME/Folder/Name". Make
     // those a bit nicer.
-    if ( parts[1] == TQString::tqfromLatin1("user") ) {
+    if ( parts[1] == TQString::fromLatin1("user") ) {
         TQStringList remainder(parts);
         remainder.pop_front();
         remainder.pop_front();
         remainder.pop_front();
         label = i18n("%1's %2")
             .tqarg( parts[2] )
-            .tqarg( remainder.join( TQString::tqfromLatin1("/") ) );
+            .tqarg( 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::tqfromLatin1("/") ),
+              .tqarg( remainder.join( TQString::fromLatin1("/") ),
                     static_cast<const KMFolderCachedImap*>( folder->storage() )->account()->name() );
           } else {
             label = i18n("My %1")
-              .tqarg( remainder.join( TQString::tqfromLatin1("/") ) );
+              .tqarg( remainder.join( TQString::fromLatin1("/") ) );
           }
         } else {
           label = i18n("My %1")
-              .tqarg( remainder.join( TQString::tqfromLatin1("/") ) );
+              .tqarg( remainder.join( TQString::fromLatin1("/") ) );
         }
         break;
       }
@@ -1311,33 +1311,33 @@ TQString KMailICalIfaceImpl::folderName( KFolderTreeItem::Type type, int languag
        GroupwarePage in configuredialog.cpp */
 
     // English
-    folderNames[0][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendar");
-    folderNames[0][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Tasks");
-    folderNames[0][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal");
-    folderNames[0][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts");
-    folderNames[0][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes");
+    folderNames[0][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendar");
+    folderNames[0][KFolderTreeItem::Tasks] = TQString::fromLatin1("Tasks");
+    folderNames[0][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal");
+    folderNames[0][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts");
+    folderNames[0][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes");
 
     // German
-    folderNames[1][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Kalender");
-    folderNames[1][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Aufgaben");
-    folderNames[1][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal");
-    folderNames[1][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Kontakte");
-    folderNames[1][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notizen");
+    folderNames[1][KFolderTreeItem::Calendar] = TQString::fromLatin1("Kalender");
+    folderNames[1][KFolderTreeItem::Tasks] = TQString::fromLatin1("Aufgaben");
+    folderNames[1][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal");
+    folderNames[1][KFolderTreeItem::Contacts] = TQString::fromLatin1("Kontakte");
+    folderNames[1][KFolderTreeItem::Notes] = TQString::fromLatin1("Notizen");
 
     // French
-    folderNames[2][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendrier");
+    folderNames[2][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendrier");
     // Tasks = Tâches (â == 0xE2 in latin1)
-    folderNames[2][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("T\342ches");
-    folderNames[2][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal");
-    folderNames[2][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts");
-    folderNames[2][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes");
+    folderNames[2][KFolderTreeItem::Tasks] = TQString::fromLatin1("T\342ches");
+    folderNames[2][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal");
+    folderNames[2][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts");
+    folderNames[2][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes");
 
     // Dutch
-    folderNames[3][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Agenda");
-    folderNames[3][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Taken");
-    folderNames[3][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Logboek");
-    folderNames[3][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contactpersonen");
-    folderNames[3][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notities");
+    folderNames[3][KFolderTreeItem::Calendar] = TQString::fromLatin1("Agenda");
+    folderNames[3][KFolderTreeItem::Tasks] = TQString::fromLatin1("Taken");
+    folderNames[3][KFolderTreeItem::Journals] = TQString::fromLatin1("Logboek");
+    folderNames[3][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contactpersonen");
+    folderNames[3][KFolderTreeItem::Notes] = TQString::fromLatin1("Notities");
   }
 
   if( language < 0 || language > 3 ) {
@@ -1574,7 +1574,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
     kdWarning() << "KCal::ResourceKolab::fromKMailFolderSynced path is too short: " << path << endl;
     return;
   }
-  if ( path.tqstartsWith( "/INBOX/", false ) ) {
+  if ( path.startsWith( "/INBOX/", false ) ) {
     // If INBOX, replace it with the username (which is user@domain)
     path = path.mid( secondSlash );
     path.prepend( folderURL.user() );
@@ -1717,9 +1717,9 @@ void KMailICalIfaceImpl::readConfig()
     Q_ASSERT( account );
     if ( account ) {
       // just in case we were connected already
-      disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
+      disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                this, TQT_SLOT( slotCheckDone() ) );
-      connect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
+      connect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                this, TQT_SLOT( slotCheckDone() ) );
     }
     mUseResourceIMAP = false;
@@ -1966,7 +1966,7 @@ void KMailICalIfaceImpl::slotCheckDone()
   {
     KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() );
     if ( account )
-      disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
+      disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                   this, TQT_SLOT( slotCheckDone() ) );
     readConfig();
   }
@@ -2139,15 +2139,15 @@ TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const
     return TQString();
 
   if( type == KFolderTreeItem::Contacts )
-    return TQString::tqfromLatin1( "kmgroupware_folder_contacts" );
+    return TQString::fromLatin1( "kmgroupware_folder_contacts" );
   else if( type == KFolderTreeItem::Calendar )
-    return TQString::tqfromLatin1( "kmgroupware_folder_calendar" );
+    return TQString::fromLatin1( "kmgroupware_folder_calendar" );
   else if( type == KFolderTreeItem::Notes )
-    return TQString::tqfromLatin1( "kmgroupware_folder_notes" );
+    return TQString::fromLatin1( "kmgroupware_folder_notes" );
   else if( type == KFolderTreeItem::Tasks )
-    return TQString::tqfromLatin1( "kmgroupware_folder_tasks" );
+    return TQString::fromLatin1( "kmgroupware_folder_tasks" );
   else if( type == KFolderTreeItem::Journals )
-    return TQString::tqfromLatin1( "kmgroupware_folder_journals" );
+    return TQString::fromLatin1( "kmgroupware_folder_journals" );
 
   return TQString();
 }
diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp
index d1300f840..4d9fc42df 100644
--- a/kmail/kmatmlistview.cpp
+++ b/kmail/kmatmlistview.cpp
@@ -52,9 +52,9 @@ void KMAtmListViewItem::updateCheckBox( int headerSection, TQCheckBox *cb )
   //Set the correct background color
   TQColor bg;
   if ( isSelected() ) {
-    bg = listView()->tqcolorGroup().highlight();
+    bg = listView()->colorGroup().highlight();
   } else {
-    bg = listView()->tqcolorGroup().base();
+    bg = listView()->colorGroup().base();
   }
   cb->setPaletteBackgroundColor( bg );
 }
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 19661be97..508964519 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -537,7 +537,7 @@ KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent
 
 KMCommand::Result KMAddBookmarksCommand::execute()
 {
-  TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") );
+  TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") );
   KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename,
                                                                     false );
   KBookmarkGroup group = bookManager->root();
@@ -1395,7 +1395,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
       id = msg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt();
     // set the part header
     msgPartText += "--";
-    msgPartText += TQString::tqfromLatin1( boundary );
+    msgPartText += TQString::fromLatin1( boundary );
     msgPartText += "\nContent-Type: MESSAGE/RFC822";
     msgPartText += TQString( "; CHARSET=%1" ).tqarg( TQString(msg->charset()) );
     msgPartText += '\n';
@@ -1422,7 +1422,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
     id = mIdentity; // use folder identity if no message had an id set
   fwdMsg->initHeader( id );
   msgPartText += "--";
-  msgPartText += TQString::tqfromLatin1( boundary );
+  msgPartText += TQString::fromLatin1( boundary );
   msgPartText += "--\n";
   TQCString tmp;
   msgPart->setTypeStr( "MULTIPART" );
@@ -1639,9 +1639,9 @@ KMCommand::Result KMPrintCommand::execute()
 }
 
 
-KMSeStatusCommand::KMSeStatusCommand( KMMsgtqStatus status,
+KMSeStatusCommand::KMSeStatusCommand( KMMsgStatus status,
   const TQValueList<TQ_UINT32> &serNums, bool toggle )
-  : mtqStatus( status ), mSerNums( serNums ), mToggle( toggle )
+  : mStatus( status ), mSerNums( serNums ), mToggle( toggle )
 {
 }
 
@@ -1650,7 +1650,7 @@ KMCommand::Result KMSeStatusCommand::execute()
   TQValueListIterator<TQ_UINT32> it;
   int idx = -1;
   KMFolder *folder = 0;
-  bool parentqStatus = false;
+  bool parenStatus = false;
 
   // Toggle actions on threads toggle the whole thread
   // depending on the state of the parent.
@@ -1659,10 +1659,10 @@ KMCommand::Result KMSeStatusCommand::execute()
     KMMsgDict::instance()->getLocation( *mSerNums.begin(), &folder, &idx );
     if (folder) {
       msg = folder->getMsgBase(idx);
-      if (msg && (msg->status()&mtqStatus))
-        parentqStatus = true;
+      if (msg && (msg->status()&mStatus))
+        parenStatus = true;
       else
-        parentqStatus = false;
+        parenStatus = false;
     }
   }
   TQMap< KMFolder*, TQValueList<int> > folderMap;
@@ -1673,12 +1673,12 @@ KMCommand::Result KMSeStatusCommand::execute()
         KMMsgBase *msg = folder->getMsgBase(idx);
         // check if we are already at the target toggle state
         if (msg) {
-          bool mytqStatus;
-          if (msg->status()&mtqStatus)
-            mytqStatus = true;
+          bool myStatus;
+          if (msg->status()&mStatus)
+            myStatus = true;
           else
-            mytqStatus = false;
-          if (mytqStatus != parentqStatus)
+            myStatus = false;
+          if (myStatus != parenStatus)
             continue;
         }
       }
@@ -1690,7 +1690,7 @@ KMCommand::Result KMSeStatusCommand::execute()
   TQMapIterator< KMFolder*, TQValueList<int> > it2 = folderMap.begin();
   while ( it2 != folderMap.end() ) {
      KMFolder *f = it2.key();
-     f->setqStatus( (*it2), mtqStatus, mToggle );
+     f->seStatus( (*it2), mStatus, mToggle );
      ++it2;
   }
   //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() );
@@ -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->setqStatus(msg->status());
+      newMsg->seStatus(msg->status());
 
       if (srcFolder && !newMsg->isComplete())
       {
@@ -3011,7 +3011,7 @@ KMCommand::Result KMIMChatCommand::execute()
       {
           nameList.append( (*it).realName() );
       }
-      TQString names = nameList.join( TQString::tqfromLatin1( ",\n" ) );
+      TQString names = nameList.join( TQString::fromLatin1( ",\n" ) );
       apology = apology.tqarg( names );
     }
 
@@ -3216,7 +3216,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
     return;
 
   // FIXME: better detection of mimetype??
-  if ( !mAtmName.tqendsWith( ".xia", false ) )
+  if ( !mAtmName.endsWith( ".xia", false ) )
     return;
 
   const Kleo::CryptoBackend::Protocol * chiasmus =
@@ -3297,7 +3297,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
 }
 
 static const TQString chomp( const TQString & base, const TQString & suffix, bool cs ) {
-  return base.tqendsWith( suffix, cs ) ? base.left( base.length() - suffix.length() ) : base ;
+  return base.endsWith( suffix, cs ) ? base.left( base.length() - suffix.length() ) : base ;
 }
 
 void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::Error & err, const TQVariant & result )
@@ -3452,7 +3452,7 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify()
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->setqStatus( msg->status() );
+  newMsg->seStatus( 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->setqStatus( msg->status() );
+  newMsg->seStatus( msg->status() );
 
   storeChangedMessage( newMsg );
 }
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index b3de87f75..8f03571ba 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -11,7 +11,7 @@
 #include <tqtimer.h>
 #include <tqfont.h>
 #include <kio/job.h>
-#include "kmmsgbase.h" // for KMMsgtqStatus
+#include "kmmsgbase.h" // for KMMsgStatus
 #include <mimelib/string.h>
 #include <tdepimmacros.h>
 #include <kservice.h>
@@ -663,13 +663,13 @@ class KDE_EXPORT KMSeStatusCommand : public KMCommand
 
 public:
   // Serial numbers
-  KMSeStatusCommand( KMMsgtqStatus status, const TQValueList<TQ_UINT32> &,
+  KMSeStatusCommand( KMMsgStatus status, const TQValueList<TQ_UINT32> &,
                       bool toggle=false );
 
 private:
   virtual Result execute();
 
-  KMMsgtqStatus mtqStatus;
+  KMMsgStatus mStatus;
   TQValueList<TQ_UINT32> mSerNums;
   TQValueList<int> mIds;
   bool mToggle;
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index a161070df..12c2e6147 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -199,7 +199,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" );
   mHeadersToEditorSplitter->setChildrenCollapsible( false );
   mHeadersArea = new TQWidget( mHeadersToEditorSplitter );
-  mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->tqsizePolicy().horData(), TQSizePolicy::Maximum );
+  mHeadersArea->setSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum );
   TQVBoxLayout *v = new TQVBoxLayout( mMainWidget );
   v->addWidget( mHeadersToEditorSplitter );
   mIdentity = new KPIM::IdentityCombo(kmkernel->identityManager(), mHeadersArea);
@@ -341,7 +341,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   TQHBoxLayout *hbox = new TQHBoxLayout( vbox );
   {
       mSignatureStateIndicator = new TQLabel( editorAndCryptoStateIndicators );
-      mSignatureStateIndicator->tqsetAlignment( TQt::AlignHCenter );
+      mSignatureStateIndicator->setAlignment( TQt::AlignHCenter );
       hbox->addWidget( mSignatureStateIndicator );
 
       KConfigGroup reader( KMKernel::config(), "Reader" );
@@ -353,7 +353,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
       mSignatureStateIndicator->setPalette( p );
 
       mEncryptionStateIndicator = new TQLabel( editorAndCryptoStateIndicators );
-      mEncryptionStateIndicator->tqsetAlignment( TQt::AlignHCenter );
+      mEncryptionStateIndicator->setAlignment( TQt::AlignHCenter );
       hbox->addWidget( mEncryptionStateIndicator );
       p.setColor( TQColorGroup::Background, reader.readColorEntry( "PGPMessageEncr" , &defaultEncryptedColor ) );
       mEncryptionStateIndicator->setPalette( p );
@@ -965,7 +965,7 @@ int KMComposeWin::calcColumnWidth(int which, long allShowing, int width)
   w->setBuddy( mEditor ); // set dummy so we don't calculate width of '&' for this label.
   w->adjustSize();
   w->show();
-  return TQMAX( width, w->tqsizeHint().width() );
+  return TQMAX( width, w->sizeHint().width() );
 }
 
 void KMComposeWin::rethinkFields(bool fromSlot)
@@ -1111,7 +1111,7 @@ void KMComposeWin::rethinkFields(bool fromSlot)
   resize(this->size());
   tqrepaint();
 
-  mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() );
+  mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() );
   mGrid->activate();
   mHeadersArea->show();
 
@@ -1182,7 +1182,7 @@ void KMComposeWin::rethinkHeaderLine(int aValue, int aMask, int& aRow,
   if (aValue & aMask)
   {
     aLbl->adjustSize();
-    aLbl->resize((int)aLbl->tqsizeHint().width(),aLbl->tqsizeHint().height() + 6);
+    aLbl->resize((int)aLbl->sizeHint().width(),aLbl->sizeHint().height() + 6);
     aLbl->setMinimumSize(aLbl->size());
     aLbl->show();
     aLbl->setBuddy(aCbx);
@@ -1193,7 +1193,7 @@ void KMComposeWin::rethinkHeaderLine(int aValue, int aMask, int& aRow,
     mGrid->addWidget(aCbx, aRow, 1);
     if ( aChk ) {
       mGrid->addWidget(aChk, aRow, 2);
-      aChk->setFixedSize(aChk->tqsizeHint().width(), aLbl->height());
+      aChk->setFixedSize(aChk->sizeHint().width(), aLbl->height());
       aChk->show();
     }
     aRow++;
@@ -2277,17 +2277,17 @@ bool KMComposeWin::userForgotAttachment()
 
   if ( attachWordsList.isEmpty() ) {
     // default value (FIXME: this is duplicated in configuredialog.cpp)
-    attachWordsList << TQString::tqfromLatin1("attachment")
-                    << TQString::tqfromLatin1("attached");
-    if ( TQString::tqfromLatin1("attachment") != i18n("attachment") )
+    attachWordsList << TQString::fromLatin1("attachment")
+                    << TQString::fromLatin1("attached");
+    if ( TQString::fromLatin1("attachment") != i18n("attachment") )
       attachWordsList << i18n("attachment");
-    if ( TQString::tqfromLatin1("attached") != i18n("attached") )
+    if ( TQString::fromLatin1("attached") != i18n("attached") )
       attachWordsList << i18n("attached");
   }
 
-  TQRegExp rx ( TQString::tqfromLatin1("\\b") +
+  TQRegExp rx ( TQString::fromLatin1("\\b") +
                attachWordsList.join("\\b|\\b") +
-               TQString::tqfromLatin1("\\b") );
+               TQString::fromLatin1("\\b") );
   rx.setCaseSensitive( false );
 
   bool gotMatch = false;
@@ -3681,7 +3681,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment()
 
   TQMimeSource *mimeSource = TQApplication::tqclipboard()->data();
   if ( TQImageDrag::canDecode(mimeSource) ) {
-    slotAttachPNGImageData(mimeSource->tqencodedData("image/png"));
+    slotAttachPNGImageData(mimeSource->encodedData("image/png"));
   }
   else {
     bool ok;
@@ -3773,7 +3773,7 @@ void KMComposeWin::slotRemoveQuotes()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotUndo()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   if ( ::tqqt_cast<KEdit*>(fw) )
@@ -3784,7 +3784,7 @@ void KMComposeWin::slotUndo()
 
 void KMComposeWin::slotRedo()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   if (::tqqt_cast<KEdit*>(fw))
@@ -3796,7 +3796,7 @@ void KMComposeWin::slotRedo()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotCut()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   if (::tqqt_cast<KEdit*>(fw))
@@ -3809,7 +3809,7 @@ void KMComposeWin::slotCut()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotCopy()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
 #ifdef KeyPress
@@ -3829,12 +3829,12 @@ void KMComposeWin::slotPasteClipboard()
 
 void KMComposeWin::paste( TQClipboard::Mode mode )
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   TQMimeSource *mimeSource = TQApplication::tqclipboard()->data( mode );
   if ( mimeSource->provides("image/png") )  {
-    slotAttachPNGImageData(mimeSource->tqencodedData("image/png"));
+    slotAttachPNGImageData(mimeSource->encodedData("image/png"));
   } else if ( KURLDrag::canDecode( mimeSource ) ) {
         KURL::List urlList;
         if( KURLDrag::decode( mimeSource, urlList ) ) {
@@ -3872,7 +3872,7 @@ void KMComposeWin::paste( TQClipboard::Mode mode )
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotMarkAll()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   if (::tqqt_cast<TQLineEdit*>(fw))
@@ -4780,10 +4780,10 @@ void KMComposeWin::slotSpellcheckDone(int result)
       statusBar()->changeItem(i18n(" Spell check complete."),0);
       break;
   }
-  TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneCleartqStatus()) );
+  TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneClearStatus()) );
 }
 
-void KMComposeWin::slotSpellcheckDoneCleartqStatus()
+void KMComposeWin::slotSpellcheckDoneClearStatus()
 {
   statusBar()->changeItem("", 0);
 }
@@ -4829,7 +4829,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
       // of the identity, we assume that since the user typed it
       // they want to keep it
       if ( mEdtBcc->text() != ident.bcc() && !mEdtBcc->text().isEmpty() ) {
-        TQString temp_string( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() );
+        TQString temp_string( mEdtBcc->text() + TQString::fromLatin1(",") + ident.bcc() );
         mEdtBcc->setText( temp_string );
       } else {
         // if the user typed the same address as the preset BCC
@@ -4843,7 +4843,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
   // allowing the user to keep all addresses
   if( mEdtBcc && mEdtBcc->edited() && !ident.bcc().isEmpty() ) {
     if( !mEdtBcc->text().isEmpty() ) {
-      TQString temp_string ( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() );
+      TQString temp_string ( mEdtBcc->text() + TQString::fromLatin1(",") + ident.bcc() );
       mEdtBcc->setText( temp_string );
     } else {
       mEdtBcc->setText( ident.bcc() );
@@ -5177,19 +5177,19 @@ void KMComposeWin::slotSizeAction( int size )
 void KMComposeWin::slotAlignLeft()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::tqsetAlignment( AlignLeft );
+    mEditor->TQTextEdit::setAlignment( AlignLeft );
 }
 
 void KMComposeWin::slotAlignCenter()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::tqsetAlignment( AlignHCenter );
+    mEditor->TQTextEdit::setAlignment( AlignHCenter );
 }
 
 void KMComposeWin::slotAlignRight()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::tqsetAlignment( AlignRight );
+    mEditor->TQTextEdit::setAlignment( AlignRight );
 }
 
 void KMComposeWin::slotTextBold()
@@ -5404,6 +5404,6 @@ void KMComposeWin::recipientEditorSizeHintChanged()
 
 void KMComposeWin::setMaximumHeaderSize()
 {
-  mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() );
+  mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() );
 }
 
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 6193e8cb7..635ff7da9 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -470,7 +470,7 @@ private slots:
 
 //  void slotSpellConfigure();
   void slotSpellcheckDone(int result);
-  void slotSpellcheckDoneCleartqStatus();
+  void slotSpellcheckDoneClearStatus();
 
 public slots: // kmkernel
   void autoSaveMessage();
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index df9582436..bcc95d0a8 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -169,7 +169,7 @@ void KMEdit::contentsDropEvent(TQDropEvent *e)
         command->start();
     }
     else if( e->provides("image/png") ) {
-        emit attachPNGImageData(e->tqencodedData("image/png"));
+        emit attachPNGImageData(e->encodedData("image/png"));
     }
     else if( KURLDrag::canDecode( e ) ) {
         KURL::List urlList;
@@ -454,7 +454,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
               TQT_SLOT(slotExternalEditorDone(KProcess*)));
       if (!mExtEditorProcess->start())
       {
-        KMessageBox::error( tqtopLevelWidget(),
+        KMessageBox::error( topLevelWidget(),
                             i18n("Unable to start external editor.") );
         killExternalEditor();
       } else {
@@ -627,7 +627,7 @@ void KMEdit::killExternalEditor() {
 bool KMEdit::checkExternalEditorFinished() {
   if ( !mExtEditorProcess )
     return true;
-  switch ( KMessageBox::warningYesNoCancel( tqtopLevelWidget(),
+  switch ( KMessageBox::warningYesNoCancel( topLevelWidget(),
            i18n("The external editor is still running.\n"
                 "Abort the external editor or leave it open?"),
            i18n("External Editor"),
@@ -880,7 +880,7 @@ void KMEdit::slotSpellDone()
   mComposer->sujectLineWidget()->deselect();
   if (status == KSpell::Error)
   {
-     KMessageBox::sorry( tqtopLevelWidget(),
+     KMessageBox::sorry( topLevelWidget(),
                          i18n("ISpell/Aspell could not be started. Please "
                               "make sure you have ISpell or Aspell properly "
                               "configured and in your PATH.") );
@@ -889,7 +889,7 @@ void KMEdit::slotSpellDone()
   else if (status == KSpell::Crashed)
   {
      spellcheck_stop();
-     KMessageBox::sorry( tqtopLevelWidget(),
+     KMessageBox::sorry( topLevelWidget(),
                          i18n("ISpell/Aspell seems to have crashed.") );
      emit spellcheck_done( KS_CANCEL );
   }
@@ -898,7 +898,7 @@ void KMEdit::slotSpellDone()
       if( mSpellLineEdit )
           spellcheck();
       else if( !mComposer->subjectTextWasSpellChecked() && status == KSpell::FinishedNoMisspellingsEncountered )
-          KMessageBox::information( tqtopLevelWidget(),
+          KMessageBox::information( topLevelWidget(),
                                     i18n("No misspellings encountered.") );
   }
 }
diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp
index a4efae487..ae3634270 100644
--- a/kmail/kmfawidgets.cpp
+++ b/kmail/kmfawidgets.cpp
@@ -35,7 +35,7 @@ KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* pare
   hbl->addWidget( mLineEdit, 1 /*stretch*/ );
   mBtn = new TQPushButton( TQString() ,this );
   mBtn->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) );
-  mBtn->setFixedHeight( mLineEdit->tqsizeHint().height() );
+  mBtn->setFixedHeight( mLineEdit->sizeHint().height() );
   TQToolTip::add( mBtn, i18n( "Open Address Book" ) );
   hbl->addWidget( mBtn );
 
@@ -136,7 +136,7 @@ void KMSoundTestWidget::playSound()
     if ( parameter.isEmpty() )
         return ;
     TQString play = parameter;
-    TQString file = TQString::tqfromLatin1("file:");
+    TQString file = TQString::fromLatin1("file:");
     if (parameter.startsWith(file))
         play = parameter.mid(file.length());
     KAudioPlayer::play(TQFile::encodeName(play));
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp
index 6a5e12324..86a7a3e4f 100644
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@@ -742,13 +742,13 @@ void KMFilterActionIdentity::setParamWidgetValue( TQWidget * paramWidget ) const
 }
 
 //=============================================================================
-// KMFilterActionSetqStatus - set status to
+// KMFilterActionSeStatus - set status to
 // Set the status of messages
 //=============================================================================
-class KMFilterActionSetqStatus: public KMFilterActionWithStringList
+class KMFilterActionSeStatus: public KMFilterActionWithStringList
 {
 public:
-  KMFilterActionSetqStatus();
+  KMFilterActionSeStatus();
   virtual ReturnCode process(KMMessage* msg) const;
   virtual bool requiresBody(KMMsgBase*) const;
 
@@ -762,7 +762,7 @@ public:
 };
 
 
-static const KMMsgtqStatus stati[] =
+static const KMMsgStatus stati[] =
 {
   KMMsgStatusFlag,
   KMMsgStatusRead,
@@ -776,18 +776,18 @@ static const KMMsgtqStatus stati[] =
   KMMsgStatusSpam,
   KMMsgStatusHam
 };
-static const int StatiCount = sizeof( stati ) / sizeof( KMMsgtqStatus );
+static const int StatiCount = sizeof( stati ) / sizeof( KMMsgStatus );
 
-KMFilterAction* KMFilterActionSetqStatus::newAction()
+KMFilterAction* KMFilterActionSeStatus::newAction()
 {
-  return (new KMFilterActionSetqStatus);
+  return (new KMFilterActionSeStatus);
 }
 
-KMFilterActionSetqStatus::KMFilterActionSetqStatus()
+KMFilterActionSeStatus::KMFilterActionSeStatus()
   : KMFilterActionWithStringList( "set status", i18n("Mark As") )
 {
   // if you change this list, also update
-  // KMFilterActionSetqStatus::stati above
+  // KMFilterActionSeStatus::stati above
   mParameterList.append( "" );
   mParameterList.append( i18n("msg status","Important") );
   mParameterList.append( i18n("msg status","Read") );
@@ -804,22 +804,22 @@ KMFilterActionSetqStatus::KMFilterActionSetqStatus()
   mParameter = *mParameterList.at(0);
 }
 
-KMFilterAction::ReturnCode KMFilterActionSetqStatus::process(KMMessage* msg) const
+KMFilterAction::ReturnCode KMFilterActionSeStatus::process(KMMessage* msg) const
 {
   int idx = mParameterList.findIndex( mParameter );
   if ( idx < 1 ) return ErrorButGoOn;
 
-  KMMsgtqStatus status = stati[idx-1] ;
-  msg->setqStatus( status );
+  KMMsgStatus status = stati[idx-1] ;
+  msg->seStatus( status );
   return GoOn;
 }
 
-bool KMFilterActionSetqStatus::requiresBody(KMMsgBase*) const
+bool KMFilterActionSeStatus::requiresBody(KMMsgBase*) const
 {
   return false;
 }
 
-void KMFilterActionSetqStatus::argsFromString( const TQString argsStr )
+void KMFilterActionSeStatus::argsFromString( const TQString argsStr )
 {
   if ( argsStr.length() == 1 ) {
     for ( int i = 0 ; i < StatiCount ; i++ )
@@ -831,16 +831,16 @@ void KMFilterActionSetqStatus::argsFromString( const TQString argsStr )
   mParameter = *mParameterList.at(0);
 }
 
-const TQString KMFilterActionSetqStatus::argsAsString() const
+const TQString KMFilterActionSeStatus::argsAsString() const
 {
   int idx = mParameterList.findIndex( mParameter );
   if ( idx < 1 ) return TQString();
 
-  KMMsgtqStatus status = stati[idx-1];
+  KMMsgStatus status = stati[idx-1];
   return KMMsgBase::statusToStr(status);
 }
 
-const TQString KMFilterActionSetqStatus::displayString() const
+const TQString KMFilterActionSeStatus::displayString() const
 {
   // FIXME after string freeze:
   // return i18n("").tqarg( );
@@ -1064,7 +1064,7 @@ TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* parent ) const
   cb->setInsertionPolicy( TQComboBox::AtBottom );
   hbl->addWidget( cb, 0 /* stretch */ );
   TQLabel *l = new TQLabel( i18n("With value:"), w );
-  l->setFixedWidth( l->tqsizeHint().width() );
+  l->setFixedWidth( l->sizeHint().width() );
   hbl->addWidget( l, 0 );
   TQLineEdit *le = new KLineEdit( w, "ledit" );
   hbl->addWidget( le, 1 );
@@ -1214,14 +1214,14 @@ TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* parent ) con
   hbl->addWidget( cb, 0 /* stretch */ );
 
   TQLabel *l = new TQLabel( i18n("Replace:"), w );
-  l->setFixedWidth( l->tqsizeHint().width() );
+  l->setFixedWidth( l->sizeHint().width() );
   hbl->addWidget( l, 0 );
 
   RegExpLineEdit *rele = new RegExpLineEdit( w, "search" );
   hbl->addWidget( rele, 1 );
 
   l = new TQLabel( i18n("With:"), w );
-  l->setFixedWidth( l->tqsizeHint().width() );
+  l->setFixedWidth( l->sizeHint().width() );
   hbl->addWidget( l, 0 );
 
   TQLineEdit *le = new KLineEdit( w, "replace" );
@@ -1744,10 +1744,10 @@ class PipeJob : public KPIM::ThreadWeaver::Job
         if ( !origSerNum.isEmpty() )
           mMsg->setHeaderField( "X-KMail-Filtered", origSerNum );
         if ( filterFolder && handler ) {
-          bool oldtqStatus = handler->ignoreChanges( true );
+          bool oldStatus = handler->ignoreChanges( true );
           filterFolder->take( filterFolder->find( mMsg ) );
           filterFolder->addMsg( mMsg );
-          handler->ignoreChanges( oldtqStatus );
+          handler->ignoreChanges( oldStatus );
         } else {
           kdDebug(5006) << "Warning: Cannot refresh the message from the external filter." << endl;
         }
@@ -1898,7 +1898,7 @@ KMFilterAction::ReturnCode KMFilterActionExecSound::process(KMMessage*) const
   if ( mParameter.isEmpty() )
     return ErrorButGoOn;
   TQString play = mParameter;
-  TQString file = TQString::tqfromLatin1("file:");
+  TQString file = TQString::fromLatin1("file:");
   if (mParameter.startsWith(file))
     play = mParameter.mid(file.length());
   KAudioPlayer::play(TQFile::encodeName(play));
@@ -1970,7 +1970,7 @@ void KMFilterActionDict::init(void)
   insert( KMFilterActionMove::newAction );
   insert( KMFilterActionCopy::newAction );
   insert( KMFilterActionIdentity::newAction );
-  insert( KMFilterActionSetqStatus::newAction );
+  insert( KMFilterActionSeStatus::newAction );
   insert( KMFilterActionFakeDisposition::newAction );
   insert( KMFilterActionTransport::newAction );
   insert( KMFilterActionReplyTo::newAction );
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index b9d0e5060..5a9ed3175 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -234,7 +234,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
       mConfigureShortcut = new TQCheckBox( i18n("Add this filter to the Apply Filter menu"), adv_w );
       gl->addMultiCellWidget( mConfigureShortcut, 7, 7, 0, 1 );
       TQLabel *keyButtonLabel = new TQLabel( i18n( "Shortcut:" ), adv_w );
-      keyButtonLabel->tqsetAlignment( AlignVCenter | AlignRight );
+      keyButtonLabel->setAlignment( AlignVCenter | AlignRight );
       gl->addMultiCellWidget( keyButtonLabel, 7, 7, 2, 2 );
       mKeyButton = new KKeyButton( adv_w, "FilterShortcutSelector" );
       gl->addMultiCellWidget( mKeyButton, 7, 7, 3, 3 );
@@ -595,19 +595,19 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
   mBtnTop = new KPushButton( TQString(), hb );
   mBtnTop->setAutoRepeat( true );
   mBtnTop->setIconSet( BarIconSet( "top", KIcon::SizeSmall ) );
-  mBtnTop->setMinimumSize( mBtnTop->tqsizeHint() * 1.2 );
+  mBtnTop->setMinimumSize( mBtnTop->sizeHint() * 1.2 );
   mBtnUp = new KPushButton( TQString(), hb );
   mBtnUp->setAutoRepeat( true );
   mBtnUp->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
-  mBtnUp->setMinimumSize( mBtnUp->tqsizeHint() * 1.2 );
+  mBtnUp->setMinimumSize( mBtnUp->sizeHint() * 1.2 );
   mBtnDown = new KPushButton( TQString(), hb );
   mBtnDown->setAutoRepeat( true );
   mBtnDown->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
-  mBtnDown->setMinimumSize( mBtnDown->tqsizeHint() * 1.2 );
+  mBtnDown->setMinimumSize( mBtnDown->sizeHint() * 1.2 );
   mBtnBot = new KPushButton( TQString(), hb );
   mBtnBot->setAutoRepeat( true );
   mBtnBot->setIconSet( BarIconSet( "bottom", KIcon::SizeSmall ) );
-  mBtnBot->setMinimumSize( mBtnBot->tqsizeHint() * 1.2 );
+  mBtnBot->setMinimumSize( mBtnBot->sizeHint() * 1.2 );
   TQToolTip::add( mBtnTop, i18n("Top") );
   TQToolTip::add( mBtnUp, i18n("Up") );
   TQToolTip::add( mBtnDown, i18n("Down") );
@@ -622,13 +622,13 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
   hb->setSpacing(4);
   mBtnNew = new TQPushButton( TQString(), hb );
   mBtnNew->setPixmap( BarIcon( "filenew", KIcon::SizeSmall ) );
-  mBtnNew->setMinimumSize( mBtnNew->tqsizeHint() * 1.2 );
+  mBtnNew->setMinimumSize( mBtnNew->sizeHint() * 1.2 );
   mBtnCopy = new TQPushButton( TQString(), hb );
   mBtnCopy->setIconSet( BarIconSet( "editcopy", KIcon::SizeSmall ) );
-  mBtnCopy->setMinimumSize( mBtnCopy->tqsizeHint() * 1.2 );
+  mBtnCopy->setMinimumSize( mBtnCopy->sizeHint() * 1.2 );
   mBtnDelete = new TQPushButton( TQString(), hb );
   mBtnDelete->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) );
-  mBtnDelete->setMinimumSize( mBtnDelete->tqsizeHint() * 1.2 );
+  mBtnDelete->setMinimumSize( mBtnDelete->sizeHint() * 1.2 );
   mBtnRename = new TQPushButton( i18n("Rename..."), hb );
   TQToolTip::add( mBtnNew, i18n("New") );
   TQToolTip::add( mBtnCopy, i18n("Copy") );
@@ -948,7 +948,7 @@ void KMFilterListBox::slotRename()
      i18n("Rename filter \"%1\" to:\n(leave the field empty for automatic naming)")
         .tqarg( filter->pattern()->name() ) /*label*/,
      filter->pattern()->name() /* initial value */,
-     &okPressed, tqtopLevelWidget(), 0, validator
+     &okPressed, topLevelWidget(), 0, validator
      );
   delete validator;
 
@@ -1141,12 +1141,12 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name )
   // don't show scroll bars.
   mComboBox->setSizeLimit( mComboBox->count() );
   // tqlayout management:
-  // o the combo box is not to be made larger than it's tqsizeHint(),
+  // o the combo box is not to be made larger than it's sizeHint(),
   //   the parameter widget should grow instead.
   // o the whole widget takes all space horizontally, but is fixed vertically.
   mComboBox->adjustSize();
-  mComboBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  mComboBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
   updateGeometry();
 
   // redirect focus to the filter action combo box
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index df8b4daf1..3315c99ee 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -470,10 +470,10 @@ int KMFolder::countUnreadRecursive()
   return count;
 }
 
-void KMFolder::msgStatusChanged( const KMMsgtqStatus oldtqStatus,
-                                 const KMMsgtqStatus newtqStatus, int idx )
+void KMFolder::msgStatusChanged( const KMMsgStatus oldStatus,
+                                 const KMMsgStatus newStatus, int idx )
 {
-  mStorage->msgStatusChanged( oldtqStatus, newtqStatus, idx );
+  mStorage->msgStatusChanged( oldStatus, newStatus, idx );
 }
 
 int KMFolder::open(const char *owner)
@@ -828,15 +828,15 @@ int KMFolder::writeIndex( bool createEmptyIndex )
   return mStorage->writeIndex( createEmptyIndex );
 }
 
-void KMFolder::setqStatus( int idx, KMMsgtqStatus status, bool toggle )
+void KMFolder::seStatus( int idx, KMMsgStatus status, bool toggle )
 {
-  mStorage->setqStatus( idx, status, toggle );
+  mStorage->seStatus( idx, status, toggle );
 }
 
-void KMFolder::setqStatus( TQValueList<int>& ids, KMMsgtqStatus status,
+void KMFolder::seStatus( TQValueList<int>& ids, KMMsgStatus status,
                           bool toggle )
 {
-  mStorage->setqStatus( ids, status, toggle);
+  mStorage->seStatus( ids, status, toggle);
 }
 
 void KMFolder::setIconPaths( const TQString &normalPath,
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index 60db26661..82d586a23 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -273,10 +273,10 @@ public:
       contained by this folder */
   int countUnreadRecursive();
 
-  /** Called by KMMsgBase::setqStatus when status of a message has changed
+  /** Called by KMMsgBase::seStatus when status of a message has changed
       required to keep the number unread messages variable current. */
-  void msgStatusChanged( const KMMsgtqStatus oldtqStatus,
-                         const KMMsgtqStatus newtqStatus,
+  void msgStatusChanged( const KMMsgStatus oldStatus,
+                         const KMMsgStatus newStatus,
                          int idx);
 
   /** Open folder for access.
@@ -490,10 +490,10 @@ public:
   int writeIndex( bool createEmptyIndex = false );
 
   /** Set the status of the message at index @p idx to @p status. */
-  void setqStatus(int idx, KMMsgtqStatus status, bool toggle=false);
+  void seStatus(int idx, KMMsgStatus status, bool toggle=false);
 
   /** Set the status of the message(s) in the TQValueList @p ids to @p status. */
-  void setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle=false);
+  void seStatus(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 10dfff5af..a55d22561 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -1531,7 +1531,7 @@ void KMFolderCachedImap::uploadFlags()
       // Send off a status setting job for each set.
       for( TQStringList::Iterator slit = sets.begin(); slit != sets.end(); ++slit ) {
         TQString imappath = imapPath() + ";UID=" + ( *slit );
-        mAccount->setImaptqStatus(folder(), imappath, flags);
+        mAccount->setImapStatus(folder(), imappath, flags);
       }
     }
     // FIXME END DUPLICATED FROM KMFOLDERIMAP
@@ -1575,7 +1575,7 @@ void KMFolderCachedImap::uploadSeenFlags()
       mStatusFlagsJobs += sets.count();
       for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) {
         TQString imappath = imapPath() + ";UID=" + ( *it );
-        mAccount->setImapSeentqStatus( folder(), imappath, true );
+        mAccount->setImapSeenStatus( folder(), imappath, true );
       }
     }
     if ( !unseenUids.isEmpty() ) {
@@ -1583,7 +1583,7 @@ void KMFolderCachedImap::uploadSeenFlags()
       mStatusFlagsJobs += sets.count();
       for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) {
         TQString imappath = imapPath() + ";UID=" + ( *it );
-        mAccount->setImapSeentqStatus( folder(), imappath, false );
+        mAccount->setImapSeenStatus( folder(), imappath, false );
       }
     }
 
@@ -1618,18 +1618,18 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString&
 }
 
 // This is not perfect, what if the status didn't really change? Oh well ...
-void KMFolderCachedImap::setqStatus( int idx, KMMsgtqStatus status, bool toggle)
+void KMFolderCachedImap::seStatus( int idx, KMMsgStatus status, bool toggle)
 {
-  KMFolderMaildir::setqStatus( idx, status, toggle );
+  KMFolderMaildir::seStatus( idx, status, toggle );
   const KMMsgBase *msg = getMsgBase( idx );
   Q_ASSERT( msg );
   if ( msg )
     mUIDsOfLocallyChangedStatuses.insert( msg->UID() );
 }
 
-void KMFolderCachedImap::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle)
+void KMFolderCachedImap::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
 {
-  KMFolderMaildir::setqStatus(ids, status, toggle);
+  KMFolderMaildir::seStatus(ids, status, toggle);
   for (TQValueList<int>::iterator it = ids.begin(); it != ids.end(); it++ ) {
     const KMMsgBase *msg = getMsgBase( *it );
     Q_ASSERT( msg );
@@ -1929,9 +1929,9 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
           // be considered correct.
           if ( !mReadOnly || !GlobalSettings::allowLocalFlags() ) {
             /* The message is OK, update flags */
-            KMFolderImap::flagsTotqStatus( existingMessage, flags,  false, mReadOnly ? INT_MAX : mPermanentFlags );
+            KMFolderImap::flagsToStatus( existingMessage, flags,  false, mReadOnly ? INT_MAX : mPermanentFlags );
           } else if ( mUserRights & KMail::ACLJobs::WriteSeenFlag ) {
-            KMFolderImap::seenFlagTotqStatus( existingMessage, flags );
+            KMFolderImap::seenFlagToStatus( existingMessage, flags );
           }
         }
         // kdDebug(5006) << "message with uid " << uid << " found in the local cache. " << endl;
@@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState()
   KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem();
   TQString str = i18n("Aborted");
   if (progressItem)
-     progressItem->setqStatus( str );
+     progressItem->seStatus( str );
   emit statusMsg( str );
   emit syncStateChanged();
 }
@@ -2606,21 +2606,21 @@ void KMFolderCachedImap::slotIncreaseProgress()
   mProgress += 5;
 }
 
-void KMFolderCachedImap::newState( int progress, const TQString& synctqStatus )
+void KMFolderCachedImap::newState( int progress, const TQString& syncStatus )
 {
-  //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << synctqStatus << endl;
+  //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << syncStatus << endl;
   KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem();
   if( progressItem )
     progressItem->setCompletedItems( progress );
-  if ( !synctqStatus.isEmpty() ) {
+  if ( !syncStatus.isEmpty() ) {
     TQString str;
     // For a subfolder, show the label. But for the main folder, it's already shown.
     if ( mAccount->imapFolder() == this )
-      str = synctqStatus;
+      str = syncStatus;
     else
-      str = TQString( "%1: %2" ).tqarg( label() ).tqarg( synctqStatus );
+      str = TQString( "%1: %2" ).tqarg( label() ).tqarg( syncStatus );
     if( progressItem )
-      progressItem->setqStatus( str );
+      progressItem->seStatus( str );
     emit statusMsg( str );
   }
   if( progressItem )
@@ -3095,7 +3095,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
       break;
 
     // create subfolder for this incident
-    TQDate today = TQDate::tqcurrentDate();
+    TQDate today = TQDate::currentDate();
     TQString baseName = folder()->label() + "-" + TQString::number( today.year() )
         + (today.month() < 10 ? "0" : "" ) + TQString::number( today.month() )
         + (today.day() < 10 ? "0" : "" ) + TQString::number( today.day() );
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index dfef783ab..bd084f00a 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 setqStatus( int id, KMMsgtqStatus status, bool toggle );
-  virtual void setqStatus( TQValueList<int>& ids, KMMsgtqStatus status, bool toggle );
+  virtual void seStatus( int id, KMMsgStatus status, bool toggle );
+  virtual void seStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle );
 
   TQString annotationFolderType() const { return mAnnotationFolderType; }
 
@@ -405,7 +405,7 @@ protected:
   virtual void timerEvent( TQTimerEvent* );
 
   /* update progress status */
-  void newState( int progress, const TQString& synctqStatus );
+  void newState( int progress, const TQString& syncStatus );
 
   /** See if there is a better parent then this folder */
   KMFolderCachedImap* findParent( const TQString& path, const TQString& name );
@@ -590,7 +590,7 @@ private:
   bool mSharedSeenFlagsChanged;
 
  /**
-  * UIDs added by setqStatus. Indicates that the client has changed
+  * UIDs added by seStatus. 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 d10e8cfac..6e7b6b34e 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -185,7 +185,7 @@ void KMFolderDialog::slotOk()
 
   mDelayedSavingTabs = 0; // number of tabs which need delayed saving
   for ( unsigned int i = 0 ; i < mTabs.count() ; ++i ) {
-    FolderDiaTab::AcceptqStatus s = mTabs[i]->accept();
+    FolderDiaTab::AccepStatus s = mTabs[i]->accept();
     if ( s == FolderDiaTab::Canceled ) {
       slotCancelAccept();
       return;
@@ -331,7 +331,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
     mNameEdit->setText( mDlg->folder() ? mDlg->folder()->label() : i18n("unnamed") );
     if (!aName.isEmpty())
             mNameEdit->setText(aName);
-    mNameEdit->setMinimumSize(mNameEdit->tqsizeHint());
+    mNameEdit->setMinimumSize(mNameEdit->sizeHint());
     // prevent renaming of IMAP inbox
     if ( mDlg->folder() && mDlg->folder()->isSystemFolder() ) {
       TQString imapPath;
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index 230b4526f..baec75f8a 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -83,12 +83,12 @@ public:
   /// @return whether save succeeded
   virtual bool save() = 0;
 
-  enum AcceptqStatus { Accepted, Canceled, Delayed };
+  enum AccepStatus { Accepted, Canceled, Delayed };
   /// Called when clicking OK.
   /// If a module returns Delayed, the closing is cancelled for now,
   /// and the module can close the dialog later on (i.e. after an async
   /// operation like a KIO job).
-  virtual AcceptqStatus accept() {
+  virtual AccepStatus accept() {
     return save() ? Accepted : Canceled;
   }
 
diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp
index 77390e61b..0c88bd2d1 100644
--- a/kmail/kmfolderdir.cpp
+++ b/kmail/kmfolderdir.cpp
@@ -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::tqfromLatin1(".%1.uidcache").tqarg(fname);
+          TQString imapcachefile = TQString::fromLatin1(".%1.uidcache").tqarg(fname);
           if ( dir.exists( imapcachefile) || dir.exists( maildir ) )
           {
              folder = new KMFolder( this, fname, KMFolderTypeCachedImap );
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index 05a7864d1..51e5762e8 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -849,7 +849,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames,
       // update progress
       account()->listDirProgressItem()->incCompletedItems();
       account()->listDirProgressItem()->updateProgress();
-      account()->listDirProgressItem()->setqStatus( folder()->prettyURL() + i18n(" completed") );
+      account()->listDirProgressItem()->seStatus( folder()->prettyURL() + i18n(" completed") );
 
       f->initializeFrom( this, subfolderPaths[i], subfolderMimeTypes[i] );
       f->setChildrenState( subfolderAttributes[i] );
@@ -1073,7 +1073,7 @@ void KMFolderImap::checkValidity()
     mMailCheckProgressItem->setProgress(0);
   }
   if ( account()->mailCheckProgressItem() ) {
-    account()->mailCheckProgressItem()->setqStatus( folder()->prettyURL() );
+    account()->mailCheckProgressItem()->seStatus( 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->setqStatus( i18n("Retrieving message status") );
+      mMailCheckProgressItem->seStatus( 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->setqStatus( i18n("Retrieving messages") );
+      mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
     url.setPath(imapPath() + ";UID=" + startUid
       + ":*;SECTION=ENVELOPE");
     KIO::SimpleJob *newJob = KIO::get(url, false, false);
@@ -1309,9 +1309,9 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
           int supportedFlags = mUploadAllFlags ? 31 : mPermanentFlags;
           if ( mReadOnly )
             supportedFlags = INT_MAX;
-          flagsTotqStatus( msgBase, serverFlags, false, supportedFlags );
+          flagsToStatus( msgBase, serverFlags, false, supportedFlags );
         } else
-          seenFlagTotqStatus( msgBase, serverFlags, false );
+          seenFlagToStatus( msgBase, serverFlags, false );
         idx++;
         uid = (*it).items.remove(uid);
         if ( msgBase->getMsgSerNum() > 0 ) {
@@ -1341,7 +1341,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
     mMailCheckProgressItem->setCompletedItems( 0 );
     mMailCheckProgressItem->setTotalItems( jd.total );
     mMailCheckProgressItem->setProgress( 0 );
-    mMailCheckProgressItem->setqStatus( i18n("Retrieving messages") );
+    mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
   }
 
   TQStringList sets;
@@ -1421,7 +1421,7 @@ void KMFolderImap::slotListFolderEntries(KIO::Job * job,
 //X }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg, int supportedFlags )
+void KMFolderImap::flagsToStatus(KMMsgBase *msg, int flags, bool newMsg, int supportedFlags )
 {
   if ( !msg ) return;
 
@@ -1440,45 +1440,45 @@ void KMFolderImap::flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg, int s
   };
   static const int numFlags = sizeof imapFlagMap / sizeof *imapFlagMap;
 
-  const KMMsgtqStatus oldtqStatus = msg->status();
+  const KMMsgStatus oldStatus = msg->status();
   for ( int i = 0; i < numFlags; ++i ) {
     if ( ( (supportedFlags & imapFlagMap[i].imapFlag) == 0 && (supportedFlags & 64) == 0 )
          && !imapFlagMap[i].standardFlag ) {
       continue;
     }
-    if ( ((flags & imapFlagMap[i].imapFlag) > 0) != ((oldtqStatus & imapFlagMap[i].kmFlag) > 0) ) {
-      msg->toggletqStatus( imapFlagMap[i].kmFlag );
+    if ( ((flags & imapFlagMap[i].imapFlag) > 0) != ((oldStatus & imapFlagMap[i].kmFlag) > 0) ) {
+      msg->toggleStatus( imapFlagMap[i].kmFlag );
     }
   }
 
-  seenFlagTotqStatus( msg, flags, newMsg );
+  seenFlagToStatus( msg, flags, newMsg );
 }
 
-void KMFolderImap::seenFlagTotqStatus(KMMsgBase * msg, int flags, bool newMsg)
+void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg)
 {
   if ( !msg ) return;
 
-  const KMMsgtqStatus oldtqStatus = msg->status();
-  if ( (flags & 1) && (oldtqStatus & KMMsgStatusOld) == 0 )
-    msg->setqStatus( KMMsgStatusOld );
+  const KMMsgStatus oldStatus = msg->status();
+  if ( (flags & 1) && (oldStatus & KMMsgStatusOld) == 0 )
+    msg->seStatus( 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
   // number of messages which actually show up as read can go out of sync.
-  if ( msg->isOfUnknowntqStatus() || (!(flags&1) && !(oldtqStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) {
+  if ( msg->isOfUnknownStatus() || (!(flags&1) && !(oldStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) {
     if (newMsg) {
-      if ( (oldtqStatus & KMMsgStatusNew) == 0 )
-        msg->setqStatus( KMMsgStatusNew );
+      if ( (oldStatus & KMMsgStatusNew) == 0 )
+        msg->seStatus( KMMsgStatusNew );
     } else {
-      if ( (oldtqStatus & KMMsgStatusUnread) == 0 )
-        msg->setqStatus( KMMsgStatusUnread );
+      if ( (oldStatus & KMMsgStatusUnread) == 0 )
+        msg->seStatus( KMMsgStatusUnread );
     }
   }
 }
 
 
 //-----------------------------------------------------------------------------
-TQString KMFolderImap::statusToFlags(KMMsgtqStatus status, int supportedFlags)
+TQString KMFolderImap::statusToFlags(KMMsgStatus status, int supportedFlags)
 {
   TQString flags;
   if (status & KMMsgStatusDeleted)
@@ -1596,14 +1596,14 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
         }
         // Transfer the status, if it is cached.
         if ( md ) {
-          msg->setqStatus( md->status() );
+          msg->seStatus( 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->setqStatus( md->status() );
+            msg->seStatus( md->status() );
             if ( md->serNum() != 0 && serNum == 0 ) {
               msg->setMsgSerNum( md->serNum() );
             }
@@ -1613,7 +1613,7 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
         }
         KMFolderMbox::addMsg(msg, 0);
         // Merge with the flags from the server.
-        flagsTotqStatus((KMMsgBase*)msg, flags, true, mUploadAllFlags ? 31 : mPermanentFlags);
+        flagsToStatus((KMMsgBase*)msg, flags, true, mUploadAllFlags ? 31 : mPermanentFlags);
         // set the correct size
         msg->setMsgSizeServer( msg->headerField("X-Length").toUInt() );
         msg->setUID(uid);
@@ -1880,15 +1880,15 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::setqStatus(int idx, KMMsgtqStatus status, bool toggle)
+void KMFolderImap::seStatus(int idx, KMMsgStatus status, bool toggle)
 {
   TQValueList<int> ids; ids.append(idx);
-  setqStatus(ids, status, toggle);
+  seStatus(ids, status, toggle);
 }
 
-void KMFolderImap::setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool toggle)
+void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle)
 {
-  FolderStorage::setqStatus(_ids, status, toggle);
+  FolderStorage::seStatus(_ids, status, toggle);
   TQValueList<int> ids;
   if ( mUploadAllFlags ) {
     kdDebug(5006) << k_funcinfo << "Migrating all flags to the server" << endl;
@@ -1929,14 +1929,14 @@ void KMFolderImap::setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool
       TQStringList sets = KMFolderImap::makeSets( seenUids, true );
       for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) {
         TQString imappath = imapPath() + ";UID=" + ( *it );
-        account()->setImapSeentqStatus( folder(), imappath, true );
+        account()->setImapSeenStatus( folder(), imappath, true );
       }
     }
     if ( !unseenUids.isEmpty() ) {
       TQStringList sets = KMFolderImap::makeSets( unseenUids, true );
       for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) {
         TQString imappath = imapPath() + ";UID=" + ( *it );
-        account()->setImapSeentqStatus( folder(), imappath, false );
+        account()->setImapSeenStatus( folder(), imappath, false );
       }
     }
     return;
@@ -1960,7 +1960,7 @@ void KMFolderImap::setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool
      // Send off a status setting job for each set.
      for (  TQStringList::Iterator slit = sets.begin(); slit != sets.end(); ++slit ) {
        TQString imappath = imapPath() + ";UID=" + ( *slit );
-       account()->setImaptqStatus(folder(), imappath, flags);
+       account()->setImapStatus(folder(), imappath, flags);
      }
   }
   if ( mContentState == imapListingInProgress ) {
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index c7b31588f..47ddfbdfb 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -61,15 +61,15 @@ using KPIM::ProgressItem;
 class KMMsgMetaData
 {
 public:
-  KMMsgMetaData(KMMsgtqStatus atqStatus)
-    :mtqStatus(atqStatus), mSerNum(0) {}
-  KMMsgMetaData(KMMsgtqStatus atqStatus, TQ_UINT32 aSerNum)
-    :mtqStatus(atqStatus), mSerNum(aSerNum) {}
+  KMMsgMetaData(KMMsgStatus aStatus)
+    :mStatus(aStatus), mSerNum(0) {}
+  KMMsgMetaData(KMMsgStatus aStatus, TQ_UINT32 aSerNum)
+    :mStatus(aStatus), mSerNum(aSerNum) {}
   ~KMMsgMetaData() {};
-  KMMsgtqStatus status() const { return mtqStatus; }
+  KMMsgStatus status() const { return mStatus; }
   TQ_UINT32 serNum() const { return mSerNum; }
 private:
-  KMMsgtqStatus mtqStatus;
+  KMMsgStatus mStatus;
   TQ_UINT32 mSerNum;
 };
 
@@ -184,12 +184,12 @@ public:
    * Change the status of the message indicated by @p index
    * Overloaded function for the following one
    */
-  virtual void setqStatus(int idx, KMMsgtqStatus status, bool toggle);
+  virtual void seStatus(int idx, KMMsgStatus status, bool toggle);
 
   /**
    * Change the status of several messages indicated by @p ids
    */
-  virtual void setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool toggle);
+  virtual void seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle);
 
   /** generates sets of uids */
   static TQStringList makeSets( TQValueList<ulong>&, bool sort = true);
@@ -241,7 +241,7 @@ public:
   /**
    * Convert message status to a list of IMAP flags
    */
-  static TQString statusToFlags(KMMsgtqStatus status, int supportedFalgs);
+  static TQString statusToFlags(KMMsgStatus status, int supportedFalgs);
 
   /**
    * Return the filename of the folder (reimplemented from KFolder)
@@ -380,13 +380,13 @@ public slots:
    * Convert IMAP flags to a message status
    * @param newMsg specifies whether unseen messages are new or unread
    */
-  static void flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 );
+  static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 );
 
   /**
    * Convert IMAP seen flag to a message status.
    * @param newMsg specifies whether unseen messages are new or unread
    */
-  static void seenFlagTotqStatus( KMMsgBase *msg, int flags, bool newMsg = true );
+  static void seenFlagToStatus( KMMsgBase *msg, int flags, bool newMsg = true );
 
   /**
    * Connected to the result signal of the copy/move job
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index d41f6bca1..21e51fcb5 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -288,7 +288,7 @@ bool KMFolderIndex::readIndex()
 #ifdef OBSOLETE
     else if (mi->isNew())
     {
-      mi->setqStatus(KMMsgStatusUnread);
+      mi->seStatus(KMMsgStatusUnread);
       mi->setDirty(false);
     }
 #endif
@@ -467,7 +467,7 @@ bool KMFolderIndex::updateIndexStreamPtr(bool)
 }
 
 
-KMFolderIndex::IndextqStatus KMFolderIndex::indextqStatus()
+KMFolderIndex::IndexStatus KMFolderIndex::indexStatus()
 {
     if ( !mCompactable )
       return IndexCorrupt;
@@ -562,10 +562,10 @@ void KMFolderIndex::updateInvitationAndAddressFieldsFromContents()
         msg.fromDwString( msgString, false );
         msg.updateInvitationState();
         if ( msg.status() & KMMsgStatusHasInvitation ) {
-          msgInfo->setqStatus( msgInfo->status() | KMMsgStatusHasInvitation );
+          msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasInvitation );
         }
         if ( msg.status() & KMMsgStatusHasNoInvitation ) {
-          msgInfo->setqStatus( msgInfo->status() | KMMsgStatusHasNoInvitation );
+          msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasNoInvitation );
         }
         msgInfo->setFrom( msg.from() );
         msgInfo->setTo( msg.to() );
diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h
index b0682ff00..563fe5d6e 100644
--- a/kmail/kmfolderindex.h
+++ b/kmail/kmfolderindex.h
@@ -45,9 +45,9 @@ class KMFolderIndex: public FolderStorage
 public:
 
   /** This enum indicates the status of the index file. It's returned by
-      indextqStatus().
+      indexStatus().
    */
-  enum IndextqStatus { IndexOk,
+  enum IndexStatus { IndexOk,
                      IndexMissing,
                      IndexCorrupt,
                      IndexTooOld
@@ -91,7 +91,7 @@ public:
       Should return IndexOk if the folder doesn't exist anymore "physically"
       or if the index is not older than the contents.
   */
-  virtual IndextqStatus indextqStatus() = 0;
+  virtual IndexStatus indexStatus() = 0;
 
 public slots:
   /** Incrementally update the index if possible else call writeIndex */
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 6947bc78a..61f40e8bd 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -117,7 +117,7 @@ int KMFolderMaildir::open(const char *)
 
   if (!folder()->path().isEmpty())
   {
-    if (KMFolderIndex::IndexOk != indextqStatus()) // test if contents file has changed
+    if (KMFolderIndex::IndexOk != indexStatus()) // test if contents file has changed
     {
       TQString str;
       mIndexStream = 0;
@@ -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->setqStatus(KMMsgStatusUnread);
+      mi->seStatus(KMMsgStatusUnread);
       setDirty( true );
     }
 #endif
@@ -583,7 +583,7 @@ DwString KMFolderMaildir::getDwString(int idx)
 }
 
 
-void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgtqStatus status)
+void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status)
 {
   // we keep our current directory to restore it later
   char path_buffer[PATH_MAX];
@@ -903,7 +903,7 @@ int KMFolderMaildir::createIndexFromContents()
   return 0;
 }
 
-KMFolderIndex::IndextqStatus KMFolderMaildir::indextqStatus()
+KMFolderIndex::IndexStatus KMFolderMaildir::indexStatus()
 {
   if ( !mCompactable )
     return KMFolderIndex::IndexCorrupt;
@@ -1033,7 +1033,7 @@ static KStaticDeleter<TQRegExp> suffix_regex_sd;
 //-----------------------------------------------------------------------------
 // static
 TQString KMFolderMaildir::constructValidFileName( const TQString & filename,
-                                                 KMMsgtqStatus status )
+                                                 KMMsgStatus status )
 {
   TQString aFileName( filename );
 
@@ -1075,7 +1075,7 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n
 }
 
 //-----------------------------------------------------------------------------
-TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgtqStatus status)
+TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgStatus status)
 {
   TQString dest(newLoc);
   // make sure that our destination filename doesn't already exist
@@ -1096,13 +1096,13 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderMaildir::msgStatusChanged(const KMMsgtqStatus oldtqStatus,
-  const KMMsgtqStatus newtqStatus, int idx)
+void KMFolderMaildir::msgStatusChanged(const KMMsgStatus oldStatus,
+  const KMMsgStatus newStatus, int idx)
 {
   // if the status of any message changes, then we need to compact
   needsCompact = true;
 
-  KMFolderIndex::msgStatusChanged(oldtqStatus, newtqStatus, idx);
+  KMFolderIndex::msgStatusChanged(oldStatus, newStatus, idx);
 }
 
 /*virtual*/
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index ea02d9b11..c16d64f0b 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -56,10 +56,10 @@ public:
   virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE)
   { return KMFolderIndex::removeMsg(msgList, imapQuiet); }
 
-  // Called by KMMsgBase::setqStatus when status of a message has changed
+  // Called by KMMsgBase::seStatus when status of a message has changed
   // required to keep the number unread messages variable current.
-  virtual void msgStatusChanged( const KMMsgtqStatus oldtqStatus,
-                                 const KMMsgtqStatus newtqStatus,
+  virtual void msgStatusChanged( const KMMsgStatus oldStatus,
+                                 const KMMsgStatus newStatus,
 				 int idx);
 
   /** Open folder for access.
@@ -87,7 +87,7 @@ public:
   static int createMaildirFolders( const TQString & folderPath );
 
   static TQString constructValidFileName( const TQString & filename = TQString(),
-                                         KMMsgtqStatus status = KMMsgStatusNew );
+                                         KMMsgStatus status = KMMsgStatusNew );
 
   static bool removeFile( const TQString & folderPath,
                           const TQString & filename );
@@ -148,9 +148,9 @@ private slots:
   void slotDirSizeJobResult( KIO::Job* job );
 
 private:
-  void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgtqStatus status);
+  void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status);
   TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, KMMsgInfo* mi);
-  TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgtqStatus status);
+  TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgStatus status);
   bool removeFile(const TQString& filename);
 
   /** Tests whether the contents of this folder is newer than the index.
@@ -158,7 +158,7 @@ private:
       Returns IndexMissing if there is no index.
       Returns IndexOk if the index is not older than the contents.
   */
-  virtual IndextqStatus indextqStatus();
+  virtual IndexStatus indexStatus();
 
   typedef TQPair<TQGuardedPtr<const KMFolderMaildir>,KFileItemList> DirSizeJobQueueEntry;
   static TQValueList<DirSizeJobQueueEntry> s_DirSizeJobQueue;
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index a53a4be1b..c876e9a1e 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -119,7 +119,7 @@ int KMFolderMbox::open(const char *owner)
 
   if (!folder()->path().isEmpty())
   {
-     KMFolderIndex::IndextqStatus index_status = indextqStatus();
+     KMFolderIndex::IndexStatus index_status = indexStatus();
      // test if index file exists and is up-to-date
      if (KMFolderIndex::IndexOk != index_status)
      {
@@ -262,7 +262,7 @@ void KMFolderMbox::reallyDoClose(const char* owner)
   Q_UNUSED( owner );
   if (mAutoCreateIndex)
   {
-      if (KMFolderIndex::IndexOk != indextqStatus()) {
+      if (KMFolderIndex::IndexOk != indexStatus()) {
           kdDebug(5006) << "Critical error: " << location() <<
               " has been modified by an external application while KMail was running." << endl;
           //      exit(1); backed out due to broken nfs
@@ -521,7 +521,7 @@ int KMFolderMbox::unlock()
 
 
 //-----------------------------------------------------------------------------
-KMFolderIndex::IndextqStatus KMFolderMbox::indextqStatus()
+KMFolderIndex::IndexStatus KMFolderMbox::indexStatus()
 {
   if ( !mCompactable )
     return KMFolderIndex::IndexCorrupt;
@@ -555,8 +555,8 @@ int KMFolderMbox::createIndexFromContents()
   KMMsgInfo* mi;
   TQString msgStr;
   TQRegExp regexp(MSG_SEPERATOR_REGEX);
-  int i, num, numtqStatus;
-  short needtqStatus;
+  int i, num, numStatus;
+  short needStatus;
 
   assert(mStream != 0);
   rewind(mStream);
@@ -564,7 +564,7 @@ int KMFolderMbox::createIndexFromContents()
   mMsgList.clear();
 
   num     = -1;
-  numtqStatus= 11;
+  numStatus= 11;
   off_t offs = 0;
   size_t size = 0;
   dateStr = "";
@@ -578,7 +578,7 @@ int KMFolderMbox::createIndexFromContents()
   replyToAuxIdStr = "";
   referencesStr = "";
   msgIdStr = "";
-  needtqStatus = 3;
+  needStatus = 3;
   size_t sizeServer = 0;
   ulong uid = 0;
 
@@ -597,11 +597,11 @@ int KMFolderMbox::createIndexFromContents()
 
       if (num >= 0)
       {
-        if (numtqStatus <= 0)
+        if (numStatus <= 0)
         {
           msgStr = i18n("Creating index file: one message done", "Creating index file: %n messages done", num);
           emit statusMsg(msgStr);
-          numtqStatus = 10;
+          numStatus = 10;
         }
 
         if (size > 0)
@@ -682,14 +682,14 @@ int KMFolderMbox::createIndexFromContents()
                     replyToIdStr, replyToAuxIdStr, msgIdStr,
                     KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown,
                     KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid );
-          mi->setqStatus(status, xstatus);
+          mi->seStatus(status, xstatus);
           mi->setDate( dateStr.stripWhiteSpace().data() );
           mi->setDirty(false);
           mMsgList.append(mi, mExportsSernums );
 
           *status = '\0';
           *xstatus = '\0';
-          needtqStatus = 3;
+          needStatus = 3;
           xmarkStr = "";
           replyToIdStr = "";
           replyToAuxIdStr = "";
@@ -701,12 +701,12 @@ int KMFolderMbox::createIndexFromContents()
           sizeServer = 0;
           uid = 0;
         }
-        else num--,numtqStatus++;
+        else num--,numStatus++;
       }
 
       offs = ftell(mStream);
       num++;
-      numtqStatus--;
+      numStatus--;
       inHeader = true;
       continue;
     }
@@ -727,19 +727,19 @@ int KMFolderMbox::createIndexFromContents()
     /* -sanders Make all messages read when auto-recreating index */
     /* Reverted, as it breaks reading the sent mail status, for example.
        -till */
-    if ((needtqStatus & 1) && strncasecmp(line, "Status:", 7) == 0)
+    if ((needStatus & 1) && strncasecmp(line, "Status:", 7) == 0)
     {
       for(i=0; i<4 && line[i+8] > ' '; i++)
         status[i] = line[i+8];
       status[i] = '\0';
-      needtqStatus &= ~1;
+      needStatus &= ~1;
     }
-    else if ((needtqStatus & 2) && strncasecmp(line, "X-Status:", 9)==0)
+    else if ((needStatus & 2) && strncasecmp(line, "X-Status:", 9)==0)
     {
       for(i=0; i<4 && line[i+10] > ' '; i++)
         xstatus[i] = line[i+10];
       xstatus[i] = '\0';
-      needtqStatus &= ~2;
+      needStatus &= ~2;
     }
     else if (strncasecmp(line,"X-KMail-Mark:",13)==0)
         xmarkStr = TQCString(line+13);
@@ -1237,7 +1237,7 @@ int KMFolderMbox::compact( bool silent )
   // Note that job autodeletes itself.
 
   // If this is the current folder, the changed signal will ultimately call
-  // KMHeaders::setFolderInfotqStatus which will override the message, so save/restore it
+  // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it
   TQString statusMsg = BroadcastStatus::instance()->statusMsg();
   emit changed();
   BroadcastStatus::instance()->seStatusMsg( statusMsg );
diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h
index d37411447..8cc8830bd 100644
--- a/kmail/kmfoldermbox.h
+++ b/kmail/kmfoldermbox.h
@@ -110,7 +110,7 @@ public:
 
   static TQByteArray escapeFrom( const DwString & str );
 
-  virtual IndextqStatus indextqStatus();
+  virtual IndexStatus indexStatus();
 
   /**  reimp */
   virtual TQ_INT64 doFolderSize() const;
diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp
index fd841ae6a..79df5bc1c 100644
--- a/kmail/kmfolderseldlg.cpp
+++ b/kmail/kmfolderseldlg.cpp
@@ -65,7 +65,7 @@ void KMFolderSelDlg::init()
   connect( mTreeView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
            this, TQT_SLOT( slotSelect() ) );
   connect( mTreeView, TQT_SIGNAL( selectionChanged() ),
-           this, TQT_SLOT( slotUpdateBtntqStatus() ) );
+           this, TQT_SLOT( slotUpdateBtnStatus() ) );
 
   readConfig();
 }
@@ -107,7 +107,7 @@ void KMFolderSelDlg::slotUser1()
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderSelDlg::slotUpdateBtntqStatus()
+void KMFolderSelDlg::slotUpdateBtnStatus()
 {
   enableButton( User1, folder() &&
                 ( !folder()->noContent() && !folder()->noChildren() ) );
diff --git a/kmail/kmfolderseldlg.h b/kmail/kmfolderseldlg.h
index edc5f6a74..2d699b80b 100644
--- a/kmail/kmfolderseldlg.h
+++ b/kmail/kmfolderseldlg.h
@@ -58,7 +58,7 @@ namespace KMail {
     protected slots:
       void slotSelect();
       void slotUser1();
-      void slotUpdateBtntqStatus();
+      void slotUpdateBtnStatus();
 
     protected:
       void readConfig();
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index aef19abe4..2c59b3981 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -1467,7 +1467,7 @@ void KMFolderTree::contentsDragMoveEvent( TQDragMoveEvent *e )
         }
 
         if ( dragAccepted ) {
-            e->accept( tqitemRect(i) );
+            e->accept( itemRect(i) );
 
             switch ( e->action() ) {
                 case TQDropEvent::Copy:
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 987f9aa06..1e9e5d132 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -329,7 +329,7 @@ void KMHeaders::slotToggleColumn(int id, int mode)
     }
     case KPaintInfo::COL_STATUS:
     {
-      show  = &mPaintInfo.showtqStatus;
+      show  = &mPaintInfo.showStatus;
       col   = &mPaintInfo.statusCol;
       width = pixNew->width() + 8;
       if ( *col == header()->mapToIndex( *col ) )
@@ -409,7 +409,7 @@ void KMHeaders::paintEmptyArea( TQPainter * p, const TQRect & rect )
                         rect.left() + contentsX(),
                         rect.top() + contentsY() );
   else
-    p->fillRect( rect, tqcolorGroup().base() );
+    p->fillRect( rect, colorGroup().base() );
 }
 
 bool KMHeaders::event(TQEvent *e)
@@ -669,7 +669,7 @@ void KMHeaders::writeConfig (void)
   config->writeEntry("showTodoColumn"          , mPaintInfo.showTodo);
   config->writeEntry("showSpamHamColumn"       , mPaintInfo.showSpamHam);
   config->writeEntry("showWatchedIgnoredColumn", mPaintInfo.showWatchedIgnored);
-  config->writeEntry("showStatusColumn"        , mPaintInfo.showtqStatus);
+  config->writeEntry("showStatusColumn"        , mPaintInfo.showStatus);
   config->writeEntry("showSignedColumn"        , mPaintInfo.showSigned);
   config->writeEntry("showCryptoColumn"        , mPaintInfo.showCrypto);
   config->writeEntry("showReceiverColumn"      , mPaintInfo.showReceiver);
@@ -700,7 +700,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       highlightMessage(0, false);
 
       disconnect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
-          this, TQT_SLOT(setFolderInfotqStatus()));
+          this, TQT_SLOT(setFolderInfoStatus()));
 
       mFolder->markNewAsUnread();
       writeFolderConfig();
@@ -754,7 +754,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)),
               BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
       connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
-          this, TQT_SLOT(setFolderInfotqStatus()));
+          this, TQT_SLOT(setFolderInfoStatus()));
       connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
 
       // Not very nice, but if we go from nested to non-nested
@@ -789,7 +789,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
     END_TIMER(updateMsg);
     SHOW_TIMER(updateMsg);
     makeHeaderVisible();
-    setFolderInfotqStatus();
+    setFolderInfoStatus();
 
     TQString colText = i18n( "Sender" );
     if (mFolder && (mFolder->whoField().lower() == "to") && !mPaintInfo.showReceiver)
@@ -831,7 +831,7 @@ void KMHeaders::msgChanged()
   const bool scrollbarAtBottom = verticalScrollBar() &&
                                  verticalScrollBar()->value() == verticalScrollBar()->maxValue();
   const HeaderItem * const oldFirstVisibleItem = dynamic_cast<HeaderItem*>( itemAt( TQPoint( 0, 0 ) ) );
-  const int oldOffsetOfFirstVisibleItem = tqitemRect( oldFirstVisibleItem ).y();
+  const int oldOffsetOfFirstVisibleItem = itemRect( oldFirstVisibleItem ).y();
   const uint oldSerNumOfFirstVisibleItem = oldFirstVisibleItem ? oldFirstVisibleItem->msgSerNum() : 0;
 
   TQString msgIdMD5;
@@ -935,9 +935,9 @@ void KMHeaders::msgAdded(int id)
     }
 
     if (parent && mFolder->getMsgBase(parent->id())->isWatched())
-      mFolder->getMsgBase(id)->setqStatus( KMMsgStatusWatched );
+      mFolder->getMsgBase(id)->seStatus( KMMsgStatusWatched );
     else if (parent && mFolder->getMsgBase(parent->id())->isIgnored())
-      mFolder->getMsgBase(id)->setqStatus( KMMsgStatusIgnored );
+      mFolder->getMsgBase(id)->seStatus( KMMsgStatusIgnored );
     if (parent)
       hi = new HeaderItem( parent->item(), id );
     else
@@ -1220,7 +1220,7 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId)
 
 
 //-----------------------------------------------------------------------------
-void KMHeaders::setMsgtqStatus (KMMsgtqStatus status, bool toggle)
+void KMHeaders::setMsgStatus (KMMsgStatus status, bool toggle)
 {
   //  kdDebug() << k_funcinfo << endl;
   SerNumList serNums = selectedVisibleSernums();
@@ -1254,7 +1254,7 @@ TQPtrList<TQListViewItem> KMHeaders::currentThread() const
   return list;
 }
 
-void KMHeaders::setThreadtqStatus(KMMsgtqStatus status, bool toggle)
+void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle)
 {
   TQPtrList<TQListViewItem> curThread;
 
@@ -1372,9 +1372,9 @@ void KMHeaders::setStyleDependantFrameWidth()
   // set the width of the frame to a reasonable value for the current GUI style
   int frameWidth;
   if( tqstyle().isA("KeramikStyle") )
-    frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != lineWidth() )
@@ -1389,7 +1389,7 @@ void KMHeaders::styleChange( TQStyle& oldStyle )
 }
 
 //-----------------------------------------------------------------------------
-void KMHeaders::setFolderInfotqStatus ()
+void KMHeaders::setFolderInfoStatus ()
 {
   if ( !mFolder ) return;
   TQString str;
@@ -1701,7 +1701,7 @@ void KMHeaders::setCurrentMsg(int cur)
     setSelectionAnchor( currentItem() );
   }
   makeHeaderVisible();
-  setFolderInfotqStatus();
+  setFolderInfoStatus();
 }
 
 //-----------------------------------------------------------------------------
@@ -1833,7 +1833,7 @@ void KMHeaders::selectNextMessage()
       (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true));
       setCurrentItem(below);
       makeHeaderVisible();
-      setFolderInfotqStatus();
+      setFolderInfoStatus();
     }
   }
 }
@@ -1871,7 +1871,7 @@ void KMHeaders::selectPrevMessage()
       (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true));
       setCurrentItem(above);
       makeHeaderVisible();
-      setFolderInfotqStatus();
+      setFolderInfoStatus();
     }
   }
 }
@@ -2140,7 +2140,7 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread)
   mItems[idx]->irefresh();
   mItems[idx]->tqrepaint();
   emit selected( msg );
-  setFolderInfotqStatus();
+  setFolderInfoStatus();
 }
 
 void KMHeaders::highlightCurrentThread()
@@ -2344,21 +2344,21 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
     HeaderItem *item = static_cast<HeaderItem*>( lvi );
     KMMsgBase *msg = mFolder->getMsgBase(item->msgId());
     if ( section == mPaintInfo.flagCol && flagsToggleable ) {
-      setMsgtqStatus( KMMsgStatusFlag, true );
+      setMsgStatus( KMMsgStatusFlag, true );
     } else if ( section == mPaintInfo.importantCol && flagsToggleable ) {
-      setMsgtqStatus( KMMsgStatusFlag, true );
+      setMsgStatus( KMMsgStatusFlag, true );
     } else if ( section == mPaintInfo.todoCol && flagsToggleable ) {
-      setMsgtqStatus( KMMsgStatusTodo, true );
+      setMsgStatus( KMMsgStatusTodo, true );
     } else if ( section == mPaintInfo.watchedIgnoredCol && flagsToggleable ) {
       if ( msg->isWatched() || msg->isIgnored() )
-        setMsgtqStatus( KMMsgStatusIgnored, true );
+        setMsgStatus( KMMsgStatusIgnored, true );
       else
-        setMsgtqStatus( KMMsgStatusWatched, true );
+        setMsgStatus( KMMsgStatusWatched, true );
     } else if ( section == mPaintInfo.statusCol ) {
       if ( msg->isUnread() || msg->isNew() )
-        setMsgtqStatus( KMMsgStatusRead );
+        setMsgStatus( KMMsgStatusRead );
       else
-        setMsgtqStatus( KMMsgStatusUnread );
+        setMsgStatus( KMMsgStatusUnread );
     }
   }
 }
@@ -2424,7 +2424,7 @@ void KMHeaders::highlightMessage(TQListViewItem* i)
 //-----------------------------------------------------------------------------
 void KMHeaders::slotRMB()
 {
-  if (!tqtopLevelWidget()) return; // safe bet
+  if (!topLevelWidget()) return; // safe bet
   mOwner->updateMessageActions();
 
   // check if the user clicked into a status column and only show the respective menues
@@ -3355,9 +3355,9 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
                 // If the parent is watched or ignored, propagate that to it's
                 // tqchildren
                 if (mFolder->getMsgBase(i->id())->isWatched())
-                  mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusWatched);
+                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusWatched);
                 if (mFolder->getMsgBase(i->id())->isIgnored())
-                  mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusIgnored);
+                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusIgnored);
                 khi = new HeaderItem(i->item(), new_kci->id(), new_kci->key());
             } else {
                 khi = new HeaderItem(this, new_kci->id(), new_kci->key());
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index f504c3f30..6541d4a99 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -10,7 +10,7 @@ using KMail::HeaderItem;
 
 #include <klistview.h>
 #include <kfoldertree.h> // for KPaintInfo
-#include <kmmsgbase.h>   // for KMMsgtqStatus
+#include <kmmsgbase.h>   // for KMMsgStatus
 
 #include <tqwidget.h>
 #include <tqstrlist.h>
@@ -77,13 +77,13 @@ public:
 
   /** Set all messages in the current thread to status @p status
       or toggle it, if specified. */
-  virtual void setThreadtqStatus(KMMsgtqStatus status, bool toggle=false);
+  virtual void setThreadStatus(KMMsgStatus status, bool toggle=false);
 
   /* Set message status to read if it is new, or unread */
   virtual void setMsgRead(int msgId);
 
   /** The following methods processes all selected messages. */
-  virtual void setMsgtqStatus(KMMsgtqStatus status, bool toggle=false);
+  virtual void setMsgStatus(KMMsgStatus status, bool toggle=false);
   virtual void deleteMsg();
   virtual void applyFiltersOnMsg();
   virtual void undo();
@@ -299,7 +299,7 @@ public slots:
   void slotToggleColumn(int id, int mode = -1);
 
   /** Provide information about number of messages in a folder */
-  void setFolderInfotqStatus();
+  void setFolderInfoStatus();
 
 protected:
   static TQPixmap *pixNew, *pixUns, *pixDel, *pixRead, *pixRep, *pixSent,
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index e6c641300..a7624d844 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -732,9 +732,9 @@ int KMKernel::sendCertificate( const TQString& to, const TQByteArray& certData )
   return 1;
 }
 
-KMMsgtqStatus KMKernel::strTotqStatus(const TQString &flags)
+KMMsgStatus KMKernel::strToStatus(const TQString &flags)
 {
-    KMMsgtqStatus status = 0;
+    KMMsgStatus status = 0;
     if (!flags.isEmpty()) {
         for (uint n = 0; n < flags.length() ; n++) {
             switch (flags[n]) {
@@ -946,8 +946,8 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
         }
 
         if ( !MsgStatusFlags.isEmpty() ) {
-          KMMsgtqStatus status = strTotqStatus(MsgStatusFlags);
-          if (status) msg->setqStatus(status);
+          KMMsgStatus status = strToStatus(MsgStatusFlags);
+          if (status) msg->seStatus(status);
         }
 
         int index;
@@ -1059,8 +1059,8 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
       int index;
 
       if( !MsgStatusFlags.isEmpty() ) {
-        KMMsgtqStatus status = strTotqStatus(MsgStatusFlags);
-        if (status) msg->setqStatus(status);
+        KMMsgStatus status = strToStatus(MsgStatusFlags);
+        if (status) msg->seStatus(status);
       }
 
       if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) {
@@ -1702,7 +1702,7 @@ void KMKernel::recreateCorruptIndexFiles()
     if ( !folder || folder->isDir() || folder->isOpened() )
       continue;
     KMFolderIndex * const index = dynamic_cast<KMFolderIndex*>( folder->storage() );
-    if ( index && index->indextqStatus() != KMFolderIndex::IndexOk ) {
+    if ( index && index->indexStatus() != KMFolderIndex::IndexOk ) {
       foldersWithBrokenIndex.append( index );
     }
   }
@@ -2330,13 +2330,13 @@ void KMKernel::selectFolder( TQString folderPath )
 KMMainWidget *KMKernel::getKMMainWidget()
 {
   //This could definitely use a speadup
-  TQWidgetList *l = kapp->tqtopLevelWidgets();
+  TQWidgetList *l = kapp->topLevelWidgets();
   TQWidgetListIt it( *l );
   TQWidget *wid;
 
   while ( ( wid = it.current() ) != 0 ) {
     ++it;
-    TQObjectList *l2 = wid->tqtopLevelWidget()->queryList( "KMMainWidget" );
+    TQObjectList *l2 = wid->topLevelWidget()->queryList( "KMMainWidget" );
     if (l2 && l2->first()) {
       KMMainWidget* kmmw = dynamic_cast<KMMainWidget *>( l2->first() );
       Q_ASSERT( kmmw );
@@ -2469,7 +2469,7 @@ Wallet *KMKernel::wallet() {
   if ( tqApp->activeWindow() )
     window = tqApp->activeWindow()->winId();
   else if ( getKMMainWidget() )
-    window = getKMMainWidget()->tqtopLevelWidget()->winId();
+    window = getKMMainWidget()->topLevelWidget()->winId();
 
   delete mWallet;
   mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window );
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index ef1688a66..bfcd053a2 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -442,7 +442,7 @@ signals:
 
 private:
   void openReader( bool onlyCheck );
-  KMMsgtqStatus strTotqStatus(const TQString &flags);
+  KMMsgStatus strToStatus(const TQString &flags);
   KMFolder *currentFolder();
 
   KMFolder *the_inboxFolder;
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 1dc08d053..36556a1de 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -238,7 +238,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
           this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
 
   connect( kmkernel, TQT_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ),
-           this, TQT_SLOT( slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ) ) );
+           this, TQT_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) );
 
   toggleSystemTray();
 
@@ -246,7 +246,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
   mStartupDone = true;
 
 
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
   KStatusBar *sb =  mainWin ? mainWin->statusBar() : 0;
   mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb );
   mVacationScriptIndicator->hide();
@@ -973,11 +973,11 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
 
   if(kmkernel->xmlGuiInstance()) {
     KNotifyClient::Instance instance(kmkernel->xmlGuiInstance());
-    KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived",
+    KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived",
                           summary );
   }
   else
-    KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived",
+    KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived",
                           summary );
 
   if (mBeepOnNew) {
@@ -1713,12 +1713,12 @@ void KMMainWidget::slotApplyFilters()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCheckVacation()
 {
-  updateVactionScriptqStatus( false );
+  updateVactionScripStatus( false );
   if ( !kmkernel->askToGoOnline() )
     return;
 
   Vacation *vac = new Vacation( TQT_TQOBJECT(this), true /* check only */ );
-  connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) );
+  connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
 }
 
 void KMMainWidget::slotEditVacation()
@@ -1731,7 +1731,7 @@ void KMMainWidget::slotEditVacation()
     return;
 
   mVacation = new Vacation( TQT_TQOBJECT(this) );
-  connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) );
+  connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
   if ( mVacation->isUsable() ) {
     connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) );
   } else {
@@ -1903,10 +1903,10 @@ void KMMainWidget::slotSaveAttachments()
   saveCommand->start();
 }
 
-void KMMainWidget::slotOnlinetqStatus()
+void KMMainWidget::slotOnlineStatus()
 {
   // KMKernel will emit a signal when we toggle the network state that is caught by
-  // KMMainWidget::slotUpdateOnlinetqStatus to update our GUI
+  // KMMainWidget::slotUpdateOnlineStatus to update our GUI
   if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) {
     // if online; then toggle and set it offline.
     kmkernel->stopNetworkJobs();
@@ -1916,7 +1916,7 @@ void KMMainWidget::slotOnlinetqStatus()
   }
 }
 
-void KMMainWidget::slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type )
+void KMMainWidget::slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type )
 {
   if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online )
     actionCollection()->action( "online_status" )->setText( i18n("Work Offline") );
@@ -2239,37 +2239,37 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusNew()
 {
-  mHeaders->setThreadtqStatus(KMMsgStatusNew);
+  mHeaders->setThreadStatus(KMMsgStatusNew);
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusUnread()
 {
-  mHeaders->setThreadtqStatus(KMMsgStatusUnread);
+  mHeaders->setThreadStatus(KMMsgStatusUnread);
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusFlag()
 {
-  mHeaders->setThreadtqStatus(KMMsgStatusFlag, true);
+  mHeaders->setThreadStatus(KMMsgStatusFlag, true);
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusRead()
 {
-  mHeaders->setThreadtqStatus(KMMsgStatusRead);
+  mHeaders->setThreadStatus(KMMsgStatusRead);
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusTodo()
 {
-  mHeaders->setThreadtqStatus(KMMsgStatusTodo, true);
+  mHeaders->setThreadStatus(KMMsgStatusTodo, true);
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusWatched()
 {
-  mHeaders->setThreadtqStatus(KMMsgStatusWatched, true);
+  mHeaders->setThreadStatus(KMMsgStatusWatched, true);
   if (mWatchThreadAction->isChecked()) {
     mIgnoreThreadAction->setChecked(false);
   }
@@ -2278,7 +2278,7 @@ void KMMainWidget::slotSetThreadStatusWatched()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSetThreadStatusIgnored()
 {
-  mHeaders->setThreadtqStatus(KMMsgStatusIgnored, true);
+  mHeaders->setThreadStatus(KMMsgStatusIgnored, true);
   if (mIgnoreThreadAction->isChecked()) {
     mWatchThreadAction->setChecked(false);
   }
@@ -2690,7 +2690,7 @@ void KMMainWidget::setupActions()
 		     TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued");
 
   (void) new KAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this),
-                     TQT_SLOT(slotOnlinetqStatus()), actionCollection(), "online_status");
+                     TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status");
 
   KActionMenu *sendActionMenu = new
     KActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(),
@@ -3402,7 +3402,7 @@ void KMMainWidget::updateMessageActions()
     actionCollection()->action( "go_prev_unread_message" )->setEnabled( enable_goto_unread );
     actionCollection()->action( "send_queued" )->setEnabled( kmkernel->outboxFolder()->count() > 0 );
     actionCollection()->action( "send_queued_via" )->setEnabled( kmkernel->outboxFolder()->count() > 0 );
-    slotUpdateOnlinetqStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) );
+    slotUpdateOnlineStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) );
     if (action( "edit_undo" ))
       action( "edit_undo" )->setEnabled( mHeaders->canUndo() );
 
@@ -3993,14 +3993,14 @@ void KMMainWidget::slotRequestFullSearchFromQuickSearch()
     assert( mSearchWin );
     KMSearchPattern pattern;
     pattern.append( KMSearchRule::createInstance( "<message>", KMSearchRule::FuncContains, mQuickSearchLine->currentSearchTerm() ) );
-    int status = mQuickSearchLine->currentqStatus();
+    int status = mQuickSearchLine->currenStatus();
     if ( status != 0 ) {
-        pattern.append( new KMSearchRuletqStatus( status ) );
+        pattern.append( new KMSearchRuleStatus( status ) );
     }
     mSearchWin->setSearchPattern( pattern );
 }
 
-void KMMainWidget::updateVactionScriptqStatus(bool active)
+void KMMainWidget::updateVactionScripStatus(bool active)
 {
   mVacationIndicatorActive = active;
   if ( active ) {
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index 26e5eee3f..e67f4fbd7 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -179,7 +179,7 @@ public:
   void setupForwardingActionsList();
 
   KStatusBarLabel* vacationScriptIndicator() const { return mVacationScriptIndicator; }
-  void updateVactionScriptqStatus() { updateVactionScriptqStatus( mVacationIndicatorActive ); }
+  void updateVactionScripStatus() { updateVactionScripStatus( mVacationIndicatorActive ); }
 
 public slots:
   void slotMoveMsgToFolder( KMFolder *dest);
@@ -339,8 +339,8 @@ protected slots:
   void slotToggleSizeColumn();
   void slotSendQueued();
   void slotSendQueuedVia( int item );
-  void slotOnlinetqStatus();
-  void slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type );
+  void slotOnlineStatus();
+  void slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type );
   void slotMsgPopup(KMMessage &msg, const KURL &aUrl, const TQPoint&);
   void slotMarkAll();
   void slotMemInfo();
@@ -447,7 +447,7 @@ private:
 
 private slots:
   void slotRequestFullSearchFromQuickSearch();
-  void updateVactionScriptqStatus( bool active );
+  void updateVactionScripStatus( bool active );
 
 private:
   // Message actions
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 1e666701d..ecf1e763a 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -110,7 +110,7 @@ KMMessage::KMMessage(KMMsgInfo& msgInfo): KMMsgBase()
   // now overwrite a few from the msgInfo
   mMsgSize = msgInfo.msgSize();
   mFolderOffset = msgInfo.folderOffset();
-  mtqStatus = msgInfo.status();
+  mStatus = msgInfo.status();
   mEncryptionState = msgInfo.encryptionState();
   mSignatureState = msgInfo.signatureState();
   mMDNSentState = msgInfo.mdnSentState();
@@ -145,7 +145,7 @@ void KMMessage::init( DwMessage* aMsg )
   mMsgSize = 0;
   mMsgLength = 0;
   mFolderOffset = 0;
-  mtqStatus  = KMMsgStatusNew;
+  mStatus  = KMMsgStatusNew;
   mEncryptionState = KMMsgEncryptionStateUnknown;
   mSignatureState = KMMsgSignatureStateUnknown;
   mMDNSentState = KMMsgMDNStateUnknown;
@@ -173,7 +173,7 @@ void KMMessage::assign( const KMMessage& other )
   mMsgSize = other.mMsgSize;
   mMsgLength = other.mMsgLength;
   mFolderOffset = other.mFolderOffset;
-  mtqStatus  = other.mtqStatus;
+  mStatus  = other.mStatus;
   mEncryptionState = other.mEncryptionState;
   mSignatureState = other.mSignatureState;
   mMDNSentState = other.mMDNSentState;
@@ -384,7 +384,7 @@ TQString KMMessage::headerAsString() const
   header.Assemble();
   if ( header.AsString().empty() )
     return TQString();
-  return TQString::tqfromLatin1( header.AsString().c_str() );
+  return TQString::fromLatin1( header.AsString().c_str() );
 }
 
 
@@ -394,23 +394,23 @@ DwMediaType& KMMessage::dwContentType()
   return mMsg->Headers().ContentType();
 }
 
-void KMMessage::fromByteArray( const TQByteArray & ba, bool setqStatus ) {
-  return fromDwString( DwString( ba.data(), ba.size() ), setqStatus );
+void KMMessage::fromByteArray( const TQByteArray & ba, bool seStatus ) {
+  return fromDwString( DwString( ba.data(), ba.size() ), seStatus );
 }
 
-void KMMessage::fromString( const TQCString & str, bool aSetqStatus ) {
-  return fromDwString( KMail::Util::dwString( str ), aSetqStatus );
+void KMMessage::fromString( const TQCString & str, bool aSeStatus ) {
+  return fromDwString( KMail::Util::dwString( str ), aSeStatus );
 }
 
-void KMMessage::fromDwString(const DwString& str, bool aSetqStatus)
+void KMMessage::fromDwString(const DwString& str, bool aSeStatus)
 {
   delete mMsg;
   mMsg = new DwMessage;
   mMsg->FromString( str );
   mMsg->Parse();
 
-  if (aSetqStatus) {
-    setqStatus(headerField("Status").latin1(), headerField("X-Status").latin1());
+  if (aSeStatus) {
+    seStatus(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() ) );
@@ -1081,7 +1081,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
        parser.process( this );
      }
   }
-  // setqStatus(KMMsgStatusReplied);
+  // seStatus(KMMsgStatusReplied);
   msg->link(this, KMMsgStatusReplied);
 
   if ( parent() && parent()->putRepliesInSameFolder() )
@@ -1216,7 +1216,7 @@ void KMMessage::sanitizeHeaders( const TQStringList& whiteList )
    {
      nextField = field->Next();
      if ( field->FieldNameStr().find( "ontent" ) == DwString::npos
-             && !whiteList.contains( TQString::tqfromLatin1( field->FieldNameStr().c_str() ) ) )
+             && !whiteList.contains( TQString::fromLatin1( field->FieldNameStr().c_str() ) ) )
        header.RemoveField(field);
      field = nextField;
    }
@@ -3358,7 +3358,7 @@ void KMMessage::addBodyPart(const KMMessagePart* aPart)
 //-----------------------------------------------------------------------------
 TQString KMMessage::generateMessageId( const TQString& addr )
 {
-  TQDateTime datetime = TQDateTime::tqcurrentDateTime();
+  TQDateTime datetime = TQDateTime::currentDateTime();
   TQString msgIdStr;
 
   msgIdStr = '<' + datetime.toString( "yyyyMMddhhmm.sszzz" );
@@ -3457,7 +3457,7 @@ TQCString KMMessage::html2source( const TQCString & src )
 TQString KMMessage::encodeMailtoUrl( const TQString& str )
 {
   TQString result;
-  result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str,
+  result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str,
                                                                 "utf-8" ) );
   result = KURL::encode_string( result );
   return result;
@@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity )
 
 
 //-----------------------------------------------------------------------------
-void KMMessage::setqStatus(const KMMsgtqStatus atqStatus, int idx)
+void KMMessage::seStatus(const KMMsgStatus aStatus, int idx)
 {
-  if (mtqStatus == atqStatus)
+  if (mStatus == aStatus)
     return;
-  KMMsgBase::setqStatus(atqStatus, idx);
+  KMMsgBase::seStatus(aStatus, idx);
 }
 
 void KMMessage::setEncryptionState(const KMMsgEncryptionState s, int idx)
@@ -4182,11 +4182,11 @@ void KMMessage::setMDNSentState( KMMsgMDNSentState status, int idx )
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::link( const KMMessage *aMsg, KMMsgtqStatus atqStatus )
+void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus )
 {
-  Q_ASSERT( atqStatus == KMMsgStatusReplied
-      || atqStatus == KMMsgStatusForwarded
-      || atqStatus == KMMsgStatusDeleted );
+  Q_ASSERT( aStatus == KMMsgStatusReplied
+      || aStatus == KMMsgStatusForwarded
+      || aStatus == KMMsgStatusDeleted );
 
   TQString message = headerField( "X-KMail-Link-Message" );
   if ( !message.isEmpty() )
@@ -4196,11 +4196,11 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgtqStatus atqStatus )
     type += ',';
 
   message += TQString::number( aMsg->getMsgSerNum() );
-  if ( atqStatus == KMMsgStatusReplied )
+  if ( aStatus == KMMsgStatusReplied )
     type += "reply";
-  else if ( atqStatus == KMMsgStatusForwarded )
+  else if ( aStatus == KMMsgStatusForwarded )
     type += "forward";
-  else if ( atqStatus == KMMsgStatusDeleted )
+  else if ( aStatus == KMMsgStatusDeleted )
     type += "deleted";
 
   setHeaderField( "X-KMail-Link-Message", message );
@@ -4208,10 +4208,10 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgtqStatus atqStatus )
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) const
+void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const
 {
   *retMsgSerNum = 0;
-  *retqStatus = KMMsgStatusUnknown;
+  *reStatus = KMMsgStatusUnknown;
 
   TQString message = headerField("X-KMail-Link-Message");
   TQString type = headerField("X-KMail-Link-Type");
@@ -4221,11 +4221,11 @@ void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) c
   if ( !message.isEmpty() && !type.isEmpty() ) {
     *retMsgSerNum = message.toULong();
     if ( type == "reply" )
-      *retqStatus = KMMsgStatusReplied;
+      *reStatus = KMMsgStatusReplied;
     else if ( type == "forward" )
-      *retqStatus = KMMsgStatusForwarded;
+      *reStatus = KMMsgStatusForwarded;
     else if ( type == "deleted" )
-      *retqStatus = KMMsgStatusDeleted;
+      *reStatus = KMMsgStatusDeleted;
   }
 }
 
@@ -4347,11 +4347,11 @@ void KMMessage::updateInvitationState()
     cntType += '/';
     cntType += mMsg->Headers().ContentType().SubtypeStr().c_str();
     if ( cntType.lower() == "text/calendar" ) {
-      setqStatus( KMMsgStatusHasInvitation );
+      seStatus( KMMsgStatusHasInvitation );
       return;
     }
   }
-  setqStatus( KMMsgStatusHasNoInvitation );
+  seStatus( KMMsgStatusHasNoInvitation );
   return;
 }
 
@@ -4364,7 +4364,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( !part )
   {
     // kdDebug(5006) << "updateAttachmentState - no part!" << endl;
-    setqStatus( KMMsgStatusHasNoAttach );
+    seStatus( KMMsgStatusHasNoAttach );
     return;
   }
 
@@ -4404,7 +4404,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
            part->Headers().ContentType().Subtype() != DwMime::kSubtypePgpSignature &&
            part->Headers().ContentType().Subtype() != DwMime::kSubtypePkcs7Signature ) )
     {
-      setqStatus( KMMsgStatusHasAttach );
+      seStatus( KMMsgStatusHasAttach );
     }
     return;
   }
@@ -4429,7 +4429,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( part->Next() )
     updateAttachmentState( part->Next() );
   else if ( attachmentState() == KMMsgAttachmentUnknown )
-    setqStatus( KMMsgStatusHasNoAttach );
+    seStatus( KMMsgStatusHasNoAttach );
 }
 
 void KMMessage::setBodyFromUnicode( const TQString &str, DwEntity *entity )
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index ebc8c78ef..ffae3ff09 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -150,13 +150,13 @@ public:
   }
 
   /** Mark the message as deleted */
-  void del() { setqStatus(KMMsgStatusDeleted); }
+  void del() { seStatus(KMMsgStatusDeleted); }
 
   /** Undelete the message. Same as touch */
-  void undel() { setqStatus(KMMsgStatusOld); }
+  void undel() { seStatus(KMMsgStatusOld); }
 
   /** Touch the message - mark it as read */
-  void touch() { setqStatus(KMMsgStatusOld); }
+  void touch() { seStatus(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 setqStatus=false);
-  void fromString(const TQCString& str, bool setqStatus=false);
-  void fromByteArray(const TQByteArray & ba, bool setqStatus=false);
+  void fromDwString(const DwString& str, bool seStatus=false);
+  void fromString(const TQCString& str, bool seStatus=false);
+  void fromByteArray(const TQByteArray & ba, bool seStatus=false);
 
   /** Return the entire message contents in the DwString. This function
       is *fast* even for large message since it does *not* involve a
@@ -243,7 +243,7 @@ public:
   TQCString headerAsSendableString() const;
 
   /**
-   * Remove all private header fields: *tqStatus: and X-KMail-*
+   * Remove all private header fields: *Status: and X-KMail-*
    **/
   void removePrivateHeaderFields();
 
@@ -822,11 +822,11 @@ public:
   ulong UID() const;
   void setUID(ulong uid);
 
-  /** tqStatus of the message. */
-  KMMsgtqStatus status() const { return mtqStatus; }
+  /** Status of the message. */
+  KMMsgStatus status() const { return mStatus; }
   /** Set status and mark dirty. */
-  void setqStatus(const KMMsgtqStatus status, int idx = -1);
-  void setqStatus(const char* s1, const char* s2=0) { KMMsgBase::setqStatus(s1, s2); }
+  void seStatus(const KMMsgStatus status, int idx = -1);
+  void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); }
 
   /** Set encryption status of the message. */
   void setEncryptionState(const KMMsgEncryptionState, int idx = -1);
@@ -844,11 +844,11 @@ public:
 
   KMMsgMDNSentState mdnSentState() const { return mMDNSentState; }
 
-  /** Links this message to @p aMsg, setting link type to @p atqStatus. */
-  void link(const KMMessage *aMsg, KMMsgtqStatus atqStatus);
+  /** Links this message to @p aMsg, setting link type to @p aStatus. */
+  void link(const KMMessage *aMsg, KMMsgStatus aStatus);
   /** Returns the information for the Nth link into @p retMsg
-   * and @p retqStatus. */
-  void getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) const;
+   * and @p reStatus. */
+  void getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const;
 
   /** Convert wildcards into normal string */
   TQString formatString(const TQString&) const;
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index cd05ee38c..e5cead4db 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -214,9 +214,9 @@ void KMMimePartTree::setStyleDependantFrameWidth()
   // set the width of the frame to a reasonable value for the current GUI style
   int frameWidth;
   if( tqstyle().isA("KeramikStyle") )
-    frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != lineWidth() )
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index f1341d6c8..db57a1bf1 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -72,7 +72,7 @@ using KMail::MessageProperty;
 //-----------------------------------------------------------------------------
 KMMsgBase::KMMsgBase(KMFolder* aParentFolder)
   : mParent( aParentFolder ), mIndexOffset( 0 ),
-    mIndexLength( 0 ), mDirty( false ), mEnableUndo( false ), mtqStatus( KMMsgStatusUnknown )
+    mIndexLength( 0 ), mDirty( false ), mEnableUndo( false ), mStatus( KMMsgStatusUnknown )
 {
 }
 
@@ -121,145 +121,145 @@ bool KMMsgBase::isMessage(void) const
   return false;
 }
 //-----------------------------------------------------------------------------
-void KMMsgBase::toggletqStatus(const KMMsgtqStatus atqStatus, int idx)
+void KMMsgBase::toggleStatus(const KMMsgStatus aStatus, int idx)
 {
   mDirty = true;
-  KMMsgtqStatus oldtqStatus = status();
-  if ( status() & atqStatus ) {
-    mtqStatus &= ~atqStatus;
+  KMMsgStatus oldStatus = status();
+  if ( status() & aStatus ) {
+    mStatus &= ~aStatus;
   } else {
-    mtqStatus |= atqStatus;
+    mStatus |= aStatus;
     // Ignored and Watched are toggleable, yet mutually exclusive.
     // That is an arbitrary restriction on my part. HAR HAR HAR :) -till
-    if (atqStatus == KMMsgStatusWatched)
-      mtqStatus &= ~KMMsgStatusIgnored;
-    if (atqStatus == KMMsgStatusIgnored)
-      mtqStatus &= ~KMMsgStatusWatched;
-    if (atqStatus == KMMsgStatusSpam)
-      mtqStatus &= ~KMMsgStatusHam;
-    if (atqStatus == KMMsgStatusHam)
-      mtqStatus &= ~KMMsgStatusSpam;
+    if (aStatus == KMMsgStatusWatched)
+      mStatus &= ~KMMsgStatusIgnored;
+    if (aStatus == KMMsgStatusIgnored)
+      mStatus &= ~KMMsgStatusWatched;
+    if (aStatus == KMMsgStatusSpam)
+      mStatus &= ~KMMsgStatusHam;
+    if (aStatus == KMMsgStatusHam)
+      mStatus &= ~KMMsgStatusSpam;
   }
   if (storage()) {
      if (idx < 0)
        idx = storage()->find( this );
-     storage()->msgStatusChanged( oldtqStatus, status(), idx );
+     storage()->msgStatusChanged( oldStatus, status(), idx );
      storage()->headerOfMsgChanged(this, idx);
   }
 
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgBase::setqStatus(const KMMsgtqStatus atqStatus, int idx)
+void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx)
 {
   mDirty = true;
-  KMMsgtqStatus oldtqStatus = status();
-  switch (atqStatus) {
+  KMMsgStatus oldStatus = status();
+  switch (aStatus) {
     case KMMsgStatusRead:
       // Unset unread and new, set read
-      mtqStatus &= ~KMMsgStatusUnread;
-      mtqStatus &= ~KMMsgStatusNew;
-      mtqStatus |= KMMsgStatusRead;
+      mStatus &= ~KMMsgStatusUnread;
+      mStatus &= ~KMMsgStatusNew;
+      mStatus |= KMMsgStatusRead;
       break;
 
     case KMMsgStatusUnread:
       // unread overrides read
-      mtqStatus &= ~KMMsgStatusOld;
-      mtqStatus &= ~KMMsgStatusRead;
-      mtqStatus &= ~KMMsgStatusNew;
-      mtqStatus |= KMMsgStatusUnread;
+      mStatus &= ~KMMsgStatusOld;
+      mStatus &= ~KMMsgStatusRead;
+      mStatus &= ~KMMsgStatusNew;
+      mStatus |= KMMsgStatusUnread;
       break;
 
     case KMMsgStatusOld:
       // old can't be new or unread
-      mtqStatus &= ~KMMsgStatusNew;
-      mtqStatus &= ~KMMsgStatusUnread;
-      mtqStatus |= KMMsgStatusOld;
+      mStatus &= ~KMMsgStatusNew;
+      mStatus &= ~KMMsgStatusUnread;
+      mStatus |= KMMsgStatusOld;
       break;
 
     case KMMsgStatusNew:
       // new overrides old and read
-      mtqStatus &= ~KMMsgStatusOld;
-      mtqStatus &= ~KMMsgStatusRead;
-      mtqStatus &= ~KMMsgStatusUnread;
-      mtqStatus |= KMMsgStatusNew;
+      mStatus &= ~KMMsgStatusOld;
+      mStatus &= ~KMMsgStatusRead;
+      mStatus &= ~KMMsgStatusUnread;
+      mStatus |= KMMsgStatusNew;
       break;
 
     case KMMsgStatusDeleted:
-      mtqStatus |= KMMsgStatusDeleted;
+      mStatus |= KMMsgStatusDeleted;
       break;
 
     case KMMsgStatusReplied:
-      mtqStatus |= KMMsgStatusReplied;
+      mStatus |= KMMsgStatusReplied;
       break;
 
     case KMMsgStatusForwarded:
-      mtqStatus |= KMMsgStatusForwarded;
+      mStatus |= KMMsgStatusForwarded;
       break;
 
     case KMMsgStatusQueued:
-      mtqStatus |= KMMsgStatusQueued;
+      mStatus |= KMMsgStatusQueued;
       break;
 
     case KMMsgStatusTodo:
-      mtqStatus |= KMMsgStatusTodo;
+      mStatus |= KMMsgStatusTodo;
       break;
 
     case KMMsgStatusSent:
-      mtqStatus &= ~KMMsgStatusQueued;
-      mtqStatus &= ~KMMsgStatusUnread;
-      mtqStatus &= ~KMMsgStatusNew;
-      mtqStatus |= KMMsgStatusSent;
+      mStatus &= ~KMMsgStatusQueued;
+      mStatus &= ~KMMsgStatusUnread;
+      mStatus &= ~KMMsgStatusNew;
+      mStatus |= KMMsgStatusSent;
       break;
 
     case KMMsgStatusFlag:
-      mtqStatus |= KMMsgStatusFlag;
+      mStatus |= KMMsgStatusFlag;
       break;
 
     // Watched and ignored are mutually exclusive
     case KMMsgStatusWatched:
-      mtqStatus &= ~KMMsgStatusIgnored;
-      mtqStatus |= KMMsgStatusWatched;
+      mStatus &= ~KMMsgStatusIgnored;
+      mStatus |= KMMsgStatusWatched;
       break;
 
     case KMMsgStatusIgnored:
-      mtqStatus &= ~KMMsgStatusWatched;
-      mtqStatus |= KMMsgStatusIgnored;
+      mStatus &= ~KMMsgStatusWatched;
+      mStatus |= KMMsgStatusIgnored;
       break;
     // as are ham and spam
     case KMMsgStatusSpam:
-      mtqStatus &= ~KMMsgStatusHam;
-      mtqStatus |= KMMsgStatusSpam;
+      mStatus &= ~KMMsgStatusHam;
+      mStatus |= KMMsgStatusSpam;
       break;
     case KMMsgStatusHam:
-      mtqStatus &= ~KMMsgStatusSpam;
-      mtqStatus |= KMMsgStatusHam;
+      mStatus &= ~KMMsgStatusSpam;
+      mStatus |= KMMsgStatusHam;
       break;
     case KMMsgStatusHasAttach:
-      mtqStatus &= ~KMMsgStatusHasNoAttach;
-      mtqStatus |= KMMsgStatusHasAttach;
+      mStatus &= ~KMMsgStatusHasNoAttach;
+      mStatus |= KMMsgStatusHasAttach;
       break;
     case KMMsgStatusHasNoAttach:
-      mtqStatus &= ~KMMsgStatusHasAttach;
-      mtqStatus |= KMMsgStatusHasNoAttach;
+      mStatus &= ~KMMsgStatusHasAttach;
+      mStatus |= KMMsgStatusHasNoAttach;
       break;
     case KMMsgStatusHasInvitation:
-      mtqStatus &= ~KMMsgStatusHasNoInvitation;
-      mtqStatus |= KMMsgStatusHasInvitation;
+      mStatus &= ~KMMsgStatusHasNoInvitation;
+      mStatus |= KMMsgStatusHasInvitation;
       break;
     case KMMsgStatusHasNoInvitation:
-      mtqStatus &= ~KMMsgStatusHasInvitation;
-      mtqStatus |= KMMsgStatusHasNoInvitation;
+      mStatus &= ~KMMsgStatusHasInvitation;
+      mStatus |= KMMsgStatusHasNoInvitation;
       break;
     default:
-      mtqStatus = atqStatus;
+      mStatus = aStatus;
       break;
   }
 
-  if ( oldtqStatus != mtqStatus && storage() ) {
+  if ( oldStatus != mStatus && storage() ) {
     if (idx < 0)
       idx = storage()->find( this );
-    storage()->msgStatusChanged( oldtqStatus, status(), idx );
+    storage()->msgStatusChanged( oldStatus, status(), idx );
     storage()->headerOfMsgChanged( this, idx );
   }
 }
@@ -267,40 +267,40 @@ void KMMsgBase::setqStatus(const KMMsgtqStatus atqStatus, int idx)
 
 
 //-----------------------------------------------------------------------------
-void KMMsgBase::setqStatus(const char* aStatusStr, const char* aXStatusStr)
+void KMMsgBase::seStatus(const char* aStatusStr, const char* aXStatusStr)
 {
   // first try to find status from "X-Status" field if given
   if (aXStatusStr) {
-    if (strchr(aXStatusStr, 'N')) setqStatus(KMMsgStatusNew);
-    if (strchr(aXStatusStr, 'U')) setqStatus(KMMsgStatusUnread);
-    if (strchr(aXStatusStr, 'O')) setqStatus(KMMsgStatusOld);
-    if (strchr(aXStatusStr, 'R')) setqStatus(KMMsgStatusRead);
-    if (strchr(aXStatusStr, 'D')) setqStatus(KMMsgStatusDeleted);
-    if (strchr(aXStatusStr, 'A')) setqStatus(KMMsgStatusReplied);
-    if (strchr(aXStatusStr, 'F')) setqStatus(KMMsgStatusForwarded);
-    if (strchr(aXStatusStr, 'Q')) setqStatus(KMMsgStatusQueued);
-    if (strchr(aXStatusStr, 'K')) setqStatus(KMMsgStatusTodo);
-    if (strchr(aXStatusStr, 'S')) setqStatus(KMMsgStatusSent);
-    if (strchr(aXStatusStr, 'G')) setqStatus(KMMsgStatusFlag);
-    if (strchr(aXStatusStr, 'P')) setqStatus(KMMsgStatusSpam);
-    if (strchr(aXStatusStr, 'H')) setqStatus(KMMsgStatusHam);
-    if (strchr(aXStatusStr, 'T')) setqStatus(KMMsgStatusHasAttach);
-    if (strchr(aXStatusStr, 'C')) setqStatus(KMMsgStatusHasNoAttach);
+    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);
   }
 
   // Merge the contents of the "Status" field
   if (aStatusStr) {
     if ((aStatusStr[0]== 'R' && aStatusStr[1]== 'O') ||
         (aStatusStr[0]== 'O' && aStatusStr[1]== 'R')) {
-      setqStatus( KMMsgStatusOld );
-      setqStatus( KMMsgStatusRead );
+      seStatus( KMMsgStatusOld );
+      seStatus( KMMsgStatusRead );
     }
     else if (aStatusStr[0] == 'R')
-      setqStatus(KMMsgStatusRead);
+      seStatus(KMMsgStatusRead);
     else if (aStatusStr[0] == 'D')
-      setqStatus(KMMsgStatusDeleted);
+      seStatus(KMMsgStatusDeleted);
     else
-      setqStatus(KMMsgStatusNew);
+      seStatus(KMMsgStatusNew);
   }
 }
 
@@ -363,117 +363,117 @@ void KMMsgBase::setSignatureStateChar( TQChar status, int idx )
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isUnread(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusUnread && !(st & KMMsgStatusIgnored));
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isNew(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusNew && !(st & KMMsgStatusIgnored));
 }
 
 //-----------------------------------------------------------------------------
-bool KMMsgBase::isOfUnknowntqStatus(void) const
+bool KMMsgBase::isOfUnknownStatus(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st == KMMsgStatusUnknown);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isOld(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusOld);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isRead(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusRead || st & KMMsgStatusIgnored);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isDeleted(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusDeleted);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isReplied(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusReplied);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isForwarded(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusForwarded);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isQueued(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusQueued);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isTodo(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusTodo);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isSent(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusSent);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isImportant(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusFlag);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isWatched(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusWatched);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isIgnored(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusIgnored);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isSpam(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusSpam);
 }
 
 //-----------------------------------------------------------------------------
 bool KMMsgBase::isHam(void) const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   return (st & KMMsgStatusHam);
 }
 
 //-----------------------------------------------------------------------------
-TQCString KMMsgBase::statusToStr(const KMMsgtqStatus status)
+TQCString KMMsgBase::statusToStr(const KMMsgStatus status)
 {
   TQCString sstr;
   if (status & KMMsgStatusNew) sstr += 'N';
@@ -1037,7 +1037,7 @@ TQCString KMMsgBase::autoDetectCharset(const TQCString &_encoding, const TQStrin
     TQStringList charsets = encodingList;
     if (!_encoding.isEmpty())
     {
-       TQString currentCharset = TQString::tqfromLatin1(_encoding);
+       TQString currentCharset = TQString::fromLatin1(_encoding);
        charsets.remove(currentCharset);
        charsets.prepend(currentCharset);
     }
@@ -1093,7 +1093,7 @@ unsigned long KMMsgBase::getMsgSerNum() const
 //-----------------------------------------------------------------------------
 KMMsgAttachmentState KMMsgBase::attachmentState() const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   if (st & KMMsgStatusHasAttach)
     return KMMsgHasAttachment;
   else if (st & KMMsgStatusHasNoAttach)
@@ -1105,7 +1105,7 @@ KMMsgAttachmentState KMMsgBase::attachmentState() const
 
 KMMsgInvitationState KMMsgBase::invitationState() const
 {
-  KMMsgtqStatus st = status();
+  KMMsgStatus st = status();
   if (st & KMMsgStatusHasInvitation)
     return KMMsgHasInvitation;
   else if (st & KMMsgStatusHasNoInvitation)
@@ -1372,7 +1372,7 @@ const uchar *KMMsgBase::asIndexString(int &length) const
   //these is at the beginning because it is queried quite often
   tmp_str = msgIdMD5().stripWhiteSpace();
   STORE_DATA_LEN(MsgIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
-  tmp = mLegacytqStatus;
+  tmp = mLegacyStatus;
   STORE_DATA(MsgLegacyStatusPart, tmp);
 
   //these are completely arbitrary order
@@ -1476,7 +1476,7 @@ TQString KMMsgBase::replacePrefixes( const TQString& str,
   // construct a big regexp that
   // 1. is anchored to the beginning of str (sans whitespace)
   // 2. matches at least one of the part regexps in prefixRegExps
-  TQString bigRegExp = TQString::tqfromLatin1("^(?:\\s+|(?:%1))+\\s*")
+  TQString bigRegExp = TQString::fromLatin1("^(?:\\s+|(?:%1))+\\s*")
                       .tqarg( prefixRegExps.join(")|(?:") );
   TQRegExp rx( bigRegExp, false /*case insens.*/ );
   if ( !rx.isValid() ) {
diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h
index 43a101027..6ad1315dc 100644
--- a/kmail/kmmsgbase.h
+++ b/kmail/kmmsgbase.h
@@ -38,7 +38,7 @@ class KMFolderIndex;
     to Unread or New. This is done in KMMsgBase::isRead()
     and related getters. So we can preserve the state
     when switching a thread to Ignored and back. */
-enum MsgtqStatus
+enum MsgStatus
 {
     KMMsgStatusUnknown =           0x00000000,
     KMMsgStatusNew =               0x00000001,
@@ -62,7 +62,7 @@ enum MsgtqStatus
     KMMsgStatusHasNoInvitation =   0x00040000
 };
 
-typedef uint KMMsgtqStatus;
+typedef uint KMMsgStatus;
 
 /** The old status format, only one at a time possible. Needed
     for upgrade path purposes. */
@@ -80,7 +80,7 @@ typedef enum
     KMLegacyMsgStatusQueued='Q',
     KMLegacyMsgStatusSent='S',
     KMLegacyMsgStatusFlag='G'
-} KMLegacyMsgtqStatus;
+} KMLegacyMsgStatus;
 
 
 
@@ -158,7 +158,7 @@ public:
   void setParent(KMFolder* p) { mParent = p; }
 
   /** Convert the given message status to a string. */
-  static TQCString statusToStr(const KMMsgtqStatus status);
+  static TQCString statusToStr(const KMMsgStatus status);
 
   /** Convert the given message status to a string. */
   TQString statusToSortRank();
@@ -173,7 +173,7 @@ public:
   virtual bool isNew(void) const;
 
   /** Returns TRUE if status is unknown. */
-  virtual bool isOfUnknowntqStatus(void) const;
+  virtual bool isOfUnknownStatus(void) const;
 
   /** Returns TRUE if status is old. */
   virtual bool isOld(void) const;
@@ -215,14 +215,14 @@ public:
   virtual bool isHam(void) const;
 
 
-  /** tqStatus of the message. */
-  virtual KMMsgtqStatus status(void) const = 0;
+  /** Status of the message. */
+  virtual KMMsgStatus status(void) const = 0;
 
   /** Set status and mark dirty.  Optional optimization: @p idx may
    * specify the index of this message within the parent folder. */
-  virtual void setqStatus(const KMMsgtqStatus status, int idx = -1);
-  virtual void toggletqStatus(const KMMsgtqStatus status, int idx = -1);
-  virtual void setqStatus(const char* statusField, const char* xstatusField=0);
+  virtual void seStatus(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);
 
   /** Encryption status of the message. */
   virtual KMMsgEncryptionState encryptionState() const = 0;
@@ -450,10 +450,10 @@ protected:
   short mIndexLength;
   bool mDirty;
   bool mEnableUndo;
-  mutable KMMsgtqStatus mtqStatus;
+  mutable KMMsgStatus mStatus;
   // This is kept to provide an upgrade path from the the old single status
   // to the new multiple status scheme.
-  mutable KMLegacyMsgtqStatus mLegacytqStatus;
+  mutable KMLegacyMsgStatus mLegacyStatus;
 
 public:
   enum MsgPartType
diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp
index 8ce5f7cf3..c2ce09582 100644
--- a/kmail/kmmsginfo.cpp
+++ b/kmail/kmmsginfo.cpp
@@ -154,7 +154,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMsgInfo& other)
         delete kd;
         kd = 0;
     }
-    mtqStatus = other.status();
+    mStatus = other.status();
     return *this;
 }
 #endif
@@ -174,7 +174,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg)
     kd->strippedSubjectMD5 = msg.strippedSubjectMD5();
     kd->msgIdMD5 = msg.msgIdMD5();
     kd->xmark = msg.xmark();
-    mtqStatus = msg.status();
+    mStatus = msg.status();
     kd->folderOffset = msg.folderOffset();
     kd->msgSize = msg.msgSize();
     kd->date = msg.date();
@@ -192,7 +192,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg)
 //-----------------------------------------------------------------------------
 void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
                      const TQCString& aTo, time_t aDate,
-                     KMMsgtqStatus atqStatus, const TQCString& aXMark,
+                     KMMsgStatus aStatus, const TQCString& aXMark,
                      const TQCString& replyToId, const TQCString& replyToAuxId,
                      const TQCString& msgId,
                      KMMsgEncryptionState encryptionState,
@@ -216,7 +216,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
     kd->msgIdMD5 = base64EncodedMD5( msgId );
     kd->xmark = aXMark;
     kd->folderOffset = aFolderOffset;
-    mtqStatus    = atqStatus;
+    mStatus    = aStatus;
     kd->msgSize = aMsgSize;
     kd->date = aDate;
     kd->file = "";
@@ -232,7 +232,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
 
 void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
                      const TQCString& aTo, time_t aDate,
-                     KMMsgtqStatus atqStatus, const TQCString& aXMark,
+                     KMMsgStatus aStatus, const TQCString& aXMark,
                      const TQCString& replyToId, const TQCString& replyToAuxId,
                      const TQCString& msgId,
                      const TQCString& aFileName,
@@ -244,7 +244,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
              size_t aMsgSizeServer, ulong aUID)
 {
   // use the "normal" init for most stuff
-  init( aSubject, aFrom, aTo, aDate, atqStatus, aXMark, replyToId, replyToAuxId,
+  init( aSubject, aFrom, aTo, aDate, aStatus, aXMark, replyToId, replyToAuxId,
         msgId, encryptionState, signatureState, mdnSentState, prefCharset,
         (unsigned long)0, aMsgSize, aMsgSizeServer, aUID );
   kd->file = aFileName;
@@ -477,16 +477,16 @@ void KMMsgInfo::setMDNSentState( const KMMsgMDNSentState s, int idx )
 }
 
 //-----------------------------------------------------------------------------
-KMMsgtqStatus KMMsgInfo::status(void) const
+KMMsgStatus KMMsgInfo::status(void) const
 {
-    if (mtqStatus == KMMsgStatusUnknown) {
-        KMMsgtqStatus st = (KMMsgtqStatus)getLongPart(MsgStatusPart);
+    if (mStatus == KMMsgStatusUnknown) {
+        KMMsgStatus st = (KMMsgStatus)getLongPart(MsgStatusPart);
         if (!st) {
             // We are opening an old index for the first time, get the legacy
             // status and merge it in.
-            mLegacytqStatus = (KMLegacyMsgtqStatus)getLongPart(MsgLegacyStatusPart);
+            mLegacyStatus = (KMLegacyMsgStatus)getLongPart(MsgLegacyStatusPart);
             st = KMMsgStatusRead;
-            switch (mLegacytqStatus) {
+            switch (mLegacyStatus) {
                 case KMLegacyMsgStatusUnknown:
                     st = KMMsgStatusUnknown;
                     break;
@@ -525,9 +525,9 @@ KMMsgtqStatus KMMsgInfo::status(void) const
             }
 
         }
-        mtqStatus = st;
+        mStatus = st;
     }
-    return mtqStatus;
+    return mStatus;
 }
 
 
@@ -666,11 +666,11 @@ void KMMsgInfo::setFileName(const TQString& file)
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgInfo::setqStatus(const KMMsgtqStatus atqStatus, int idx)
+void KMMsgInfo::seStatus(const KMMsgStatus aStatus, int idx)
 {
-    if(atqStatus == status())
+    if(aStatus == status())
         return;
-    KMMsgBase::setqStatus(atqStatus, idx); //base does more "stuff"
+    KMMsgBase::seStatus(aStatus, idx); //base does more "stuff"
 }
 
 //-----------------------------------------------------------------------------
@@ -716,7 +716,7 @@ void KMMsgInfo::compat_fromOldIndexString(const TQCString& str, bool toUtf8)
     kd->folderOffset = str.mid(2,9).toULong();
     kd->msgSize = str.mid(12,9).toULong();
     kd->date = (time_t)str.mid(22,10).toULong();
-    mtqStatus = (KMMsgtqStatus)str.at(0);
+    mStatus = (KMMsgStatus)str.at(0);
     if (toUtf8) {
         kd->subject = str.mid(37, 100).stripWhiteSpace();
         kd->fromStrip = str.mid(138, 50).stripWhiteSpace();
diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h
index a3d50c449..ce15e3127 100644
--- a/kmail/kmmsginfo.h
+++ b/kmail/kmmsginfo.h
@@ -39,7 +39,7 @@ public:
   /** Initialize with given values and set dirty flag to FALSE. */
   virtual void init(const TQCString& subject, const TQCString& from,
                     const TQCString& to, time_t date,
-		    KMMsgtqStatus status, const TQCString& xmark,
+		    KMMsgStatus status, const TQCString& xmark,
                     const TQCString& replyToId,
                     const TQCString& replyToAuxId,
                     const TQCString& msgId,
@@ -53,7 +53,7 @@ public:
   /** Initialize with given values and set dirty flag to FALSE. */
   virtual void init(const TQCString& subject, const TQCString& from,
                     const TQCString& to, time_t date,
-		    KMMsgtqStatus status, const TQCString& xmark,
+		    KMMsgStatus status, const TQCString& xmark,
                     const TQCString& replyToId,
                     const TQCString& replyToAuxId,
                     const TQCString& msgId,
@@ -78,7 +78,7 @@ public:
   virtual bool subjectIsPrefixed() const;
   virtual TQString msgIdMD5(void) const;
   virtual TQString fileName(void) const;
-  virtual KMMsgtqStatus status(void) const;
+  virtual KMMsgStatus status(void) const;
   virtual KMMsgEncryptionState encryptionState() const;
   virtual KMMsgSignatureState signatureState() const;
   virtual KMMsgMDNSentState mdnSentState() const;
@@ -91,7 +91,7 @@ public:
   void setMsgSizeServer(size_t sz);
   void setFolderOffset(off_t offs);
   void setFileName(const TQString& file);
-  virtual void setqStatus(const KMMsgtqStatus status, int idx = -1);
+  virtual void seStatus(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 setqStatus(const char* s1, const char* s2=0) { KMMsgBase::setqStatus(s1, s2); }
+  virtual void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(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 31a1e9321..16d188d7c 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -54,7 +54,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
   TQLabel      * label;
   TQString       msg;
 
-  setHelp( TQString::tqfromLatin1("attachments") );
+  setHelp( TQString::fromLatin1("attachments") );
 
   for ( int i = 0 ; i < numEncodingTypes ; ++i )
     mI18nizedEncodings << i18n( encodingTypes[i].displayName );
@@ -73,14 +73,14 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
   mMimeType->setInsertionPolicy( TQComboBox::NoInsertion );
   mMimeType->setValidator( new KMimeTypeValidator( TQT_TQOBJECT(mMimeType) ) );
   mMimeType->insertStringList( TQStringList()
-			       << TQString::tqfromLatin1("text/html")
-			       << TQString::tqfromLatin1("text/plain")
-			       << TQString::tqfromLatin1("image/gif")
-			       << TQString::tqfromLatin1("image/jpeg")
-			       << TQString::tqfromLatin1("image/png")
-			       << TQString::tqfromLatin1("application/octet-stream")
-			       << TQString::tqfromLatin1("application/x-gunzip")
-			       << TQString::tqfromLatin1("application/zip") );
+			       << TQString::fromLatin1("text/html")
+			       << TQString::fromLatin1("text/plain")
+			       << TQString::fromLatin1("image/gif")
+			       << TQString::fromLatin1("image/jpeg")
+			       << TQString::fromLatin1("image/png")
+			       << TQString::fromLatin1("application/octet-stream")
+			       << TQString::fromLatin1("application/x-gunzip")
+			       << TQString::fromLatin1("application/zip") );
   connect( mMimeType, TQT_SIGNAL(textChanged(const TQString&)),
 	   this, TQT_SLOT(slotMimeTypeChanged(const TQString&)) );
   glay->addWidget( mMimeType, 0, 1 );
@@ -210,7 +210,7 @@ void KMMsgPartDialog::setMimeType( const TQString & mimeType ) {
 
 void KMMsgPartDialog::setMimeType( const TQString & type,
 				   const TQString & subtype ) {
-  setMimeType( TQString::tqfromLatin1("%1/%2").tqarg(type).tqarg(subtype) );
+  setMimeType( TQString::fromLatin1("%1/%2").tqarg(type).tqarg(subtype) );
 }
 
 void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) {
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index 987485969..2cd29768e 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -464,7 +464,7 @@ void KMPopFilterCnfrmDlg::slotToggled(bool aOn)
 
 void KMPopFilterCnfrmDlg::slotUpdateMinimumSize()
 {
-  mainWidget()->setMinimumSize(mainWidget()->tqsizeHint());
+  mainWidget()->setMinimumSize(mainWidget()->sizeHint());
 }
 
 #include "kmpopfiltercnfrmdlg.moc"
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 505bd6128..e7eee3445 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -1027,14 +1027,14 @@ void KMReaderWin::contacStatusChanged( const TQString &uid)
 //  kdDebug( 5006 ) << k_funcinfo << " got a presence change for " << uid << endl;
   // get the list of nodes for this contact from the htmlView
   DOM::NodeList presenceNodes = mViewer->htmlDocument()
-    .getElementsByName( DOM::DOMString( TQString::tqfromLatin1("presence-") + uid ) );
+    .getElementsByName( DOM::DOMString( TQString::fromLatin1("presence-") + uid ) );
   for ( unsigned int i = 0; i < presenceNodes.length(); ++i ) {
     DOM::Node n =  presenceNodes.item( i );
     kdDebug( 5006 ) << "name is " << n.nodeName().string() << endl;
     kdDebug( 5006 ) << "value of content was " << n.firstChild().nodeValue().string() << endl;
     TQString newPresence = kmkernel->imProxy()->presenceString( uid );
     if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString() )
-      newPresence = TQString::tqfromLatin1( "ENOIMRUNNING" );
+      newPresence = TQString::fromLatin1( "ENOIMRUNNING" );
     n.firstChild().setNodeValue( newPresence );
 //    kdDebug( 5006 ) << "value of content is now " << n.firstChild().nodeValue().string() << endl;
   }
@@ -1976,7 +1976,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo
     menu->insertItem(SmallIcon("edit"), i18n("Edit Attachment"), 8 );
   if ( GlobalSettings::self()->allowAttachmentDeletion() && canChange )
     menu->insertItem(SmallIcon("editdelete"), i18n("Delete Attachment"), 7 );
-  if ( name.tqendsWith( ".xia", false ) &&
+  if ( name.endsWith( ".xia", false ) &&
        Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) )
     menu->insertItem( i18n( "Decrypt With Chiasmus..." ), 6 );
   menu->insertItem(i18n("Properties"), 5);
@@ -2000,9 +2000,9 @@ void KMReaderWin::setStyleDependantFrameWidth()
   // set the width of the frame to a reasonable value for the current GUI style
   int frameWidth;
   if( tqstyle().isA("KeramikStyle") )
-    frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != mBox->lineWidth() )
@@ -2267,7 +2267,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
   // determine the MIME type of the attachment
   KMimeType::Ptr mimetype;
   // prefer the value of the Content-Type header
-  mimetype = KMimeType::mimeType( TQString::tqfromLatin1( contentTypeStr ) );
+  mimetype = KMimeType::mimeType( TQString::fromLatin1( contentTypeStr ) );
   if ( mimetype->name() == "application/octet-stream" ) {
     // consider the filename if Content-Type is application/octet-stream
     mimetype = KMimeType::findByPath( name, 0, true /* no disk access */ );
@@ -2297,7 +2297,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
                        .tqarg( filenameText );
   const int choice = KMessageBox::questionYesNoCancel( this, text,
       i18n("Open Attachment?"), KStdGuiItem::saveAs(), open_text,
-      TQString::tqfromLatin1("askSave") + mimetype->name() ); // dontAskAgainName
+      TQString::fromLatin1("askSave") + mimetype->name() ); // dontAskAgainName
 
   if( choice == KMessageBox::Yes ) {		// Save
     mAtmUpdate = true;
@@ -2828,7 +2828,7 @@ void KMReaderWin::scrollToAttachment( const partNode *node )
   DOM::Document doc = mViewer->htmlDocument();
 
   // The anchors for this are created in ObjectTreeParser::parseObjectTree()
-  mViewer->gotoAnchor( TQString::tqfromLatin1( "att%1" ).tqarg( node->nodeId() ) );
+  mViewer->gotoAnchor( TQString::fromLatin1( "att%1" ).tqarg( node->nodeId() ) );
 
   // Remove any old color markings which might be there
   const partNode *root = node->topLevelParent();
@@ -2889,7 +2889,7 @@ void KMReaderWin::injectAttachments()
     link += "<div style=\"text-align: left;\"><a href=\"" + urlHandle + "\"><img src=\"" +
             imgpath + imgSrc + "\"/></a></div>";
     html.prepend( link );
-    html.prepend( TQString::tqfromLatin1( "<div style=\"float:left;\">%1&nbsp;</div>" ).
+    html.prepend( TQString::fromLatin1( "<div style=\"float:left;\">%1&nbsp;</div>" ).
                   arg( i18n( "Attachments:" ) ) );
   } else {
     link += "<div style=\"text-align: right;\"><a href=\"" + urlHandle + "\"><img src=\"" +
@@ -2930,7 +2930,7 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor
       if ( headerStyle() == HeaderStyle::enterprise() )
         align = "right";
       if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode )
-        html += TQString::tqfromLatin1("<div style=\"background:%1; %2"
+        html += TQString::fromLatin1("<div style=\"background:%1; %2"
                 "vertical-align:middle; float:%3; %4\">").tqarg( bgColor.name() ).tqarg( margin )
                                                          .tqarg( align ).tqarg( visibility );
       html += subHtml;
@@ -2941,11 +2941,11 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor
     partNode::AttachmentDisplayInfo info = node->attachmentDisplayInfo();
     if ( info.displayInHeader ) {
       html += "<div style=\"float:left;\">";
-      html += TQString::tqfromLatin1( "<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;\">" ).tqarg( bgColor.name() );
       TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() );
       TQString href = node->asHREF( "header" );
-      html += TQString::tqfromLatin1( "<a href=\"" ) + href +
-              TQString::tqfromLatin1( "\">" );
+      html += TQString::fromLatin1( "<a href=\"" ) + href +
+              TQString::fromLatin1( "\">" );
       html += "<img style=\"vertical-align:middle;\" src=\"" + info.icon + "\"/>&nbsp;";
       if ( headerStyle() == HeaderStyle::enterprise() ) {
         TQFont bodyFont = mCSSHelper->bodyFont( isFixedFont() );
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index 4c4340a2b..1d6fd95d7 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -41,7 +41,7 @@ static const int numFuncConfigNames = sizeof funcConfigNames / sizeof *funcConfi
 
 struct _statusNames {
   const char* name;
-  KMMsgtqStatus status;
+  KMMsgStatus status;
 };
 
 static struct _statusNames statusNames[] = {
@@ -104,7 +104,7 @@ KMSearchRule * KMSearchRule::createInstance( const TQCString & field,
 {
   KMSearchRule *ret = 0;
   if (field == "<status>")
-    ret = new KMSearchRuletqStatus( field, func, contents );
+    ret = new KMSearchRuleStatus( field, func, contents );
   else if ( field == "<age in days>" || field == "<size>" )
     ret = new KMSearchRuleNumerical( field, func, contents );
   else
@@ -550,7 +550,7 @@ bool KMSearchRuleNumerical::matches( const KMMessage * msg ) const
   } else if ( field() == "<age in days>" ) {
     TQDateTime msgDateTime;
     msgDateTime.setTime_t( msg->date() );
-    numericalMsgContents = msgDateTime.daysTo( TQDateTime::tqcurrentDateTime() );
+    numericalMsgContents = msgDateTime.daysTo( TQDateTime::currentDateTime() );
     numericalValue = contents().toInt();
     msgContents.setNum( numericalMsgContents );
   }
@@ -622,10 +622,10 @@ bool KMSearchRuleNumerical::matchesInternal( long numericalValue,
 
 //==================================================
 //
-// class KMSearchRuletqStatus
+// class KMSearchRuleStatus
 //
 //==================================================
-TQString englishNameFortqStatus( const KMMsgtqStatus& status )
+TQString englishNameForStatus( const KMMsgStatus& status )
 {
   for ( int i=0; i< numStatusNames; i++ ) {
     if ( statusNames[i].status == status ) {
@@ -635,22 +635,22 @@ TQString englishNameFortqStatus( const KMMsgtqStatus& status )
   return TQString();
 }
 
-KMSearchRuletqStatus::KMSearchRuletqStatus( const TQCString & field,
+KMSearchRuleStatus::KMSearchRuleStatus( const TQCString & field,
                                         Function func, const TQString & aContents )
           : KMSearchRule(field, func, aContents)
 {
   // the values are always in english, both from the conf file as well as
   // the patternedit gui
-  mtqStatus = statusFromEnglishName( aContents );
+  mStatus = statusFromEnglishName( aContents );
 }
 
-KMSearchRuletqStatus::KMSearchRuletqStatus( int status, Function func )
-: KMSearchRule( "<status>", func, englishNameFortqStatus( status ) )
+KMSearchRuleStatus::KMSearchRuleStatus( int status, Function func )
+: KMSearchRule( "<status>", func, englishNameForStatus( status ) )
 {
-    mtqStatus = status;
+    mStatus = status;
 }
 
-KMMsgtqStatus KMSearchRuletqStatus::statusFromEnglishName( const TQString & aStatusString )
+KMMsgStatus KMSearchRuleStatus::statusFromEnglishName( const TQString & aStatusString )
 {
   for ( int i=0; i< numStatusNames; i++ ) {
     if ( !aStatusString.compare( statusNames[i].name ) ) {
@@ -660,33 +660,33 @@ KMMsgtqStatus KMSearchRuletqStatus::statusFromEnglishName( const TQString & aSta
   return KMMsgStatusUnknown;
 }
 
-bool KMSearchRuletqStatus::isEmpty() const
+bool KMSearchRuleStatus::isEmpty() const
 {
   return field().stripWhiteSpace().isEmpty() || contents().isEmpty();
 }
 
-bool KMSearchRuletqStatus::matches( const DwString &, KMMessage &,
+bool KMSearchRuleStatus::matches( const DwString &, KMMessage &,
 				  const DwBoyerMoore *, int ) const
 {
   assert( 0 );
   return false; // don't warn
 }
 
-bool KMSearchRuletqStatus::matches( const KMMessage * msg ) const
+bool KMSearchRuleStatus::matches( const KMMessage * msg ) const
 {
 
-  KMMsgtqStatus msgtqStatus = msg->status();
+  KMMsgStatus msgStatus = msg->status();
   bool rc = false;
 
   switch ( function() ) {
     case FuncEquals: // fallthrough. So that "<status> 'is' 'read'" works
     case FuncContains:
-      if (msgtqStatus & mtqStatus)
+      if (msgStatus & mStatus)
         rc = true;
       break;
     case FuncNotEqual: // fallthrough. So that "<status> 'is not' 'read'" works
     case FuncContainsNot:
-      if (! (msgtqStatus & mtqStatus) )
+      if (! (msgStatus & mStatus) )
         rc = true;
       break;
     // FIXME what about the remaining funcs, how can they make sense for
diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index 87533a250..b60e9cdc8 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -10,7 +10,7 @@
 #include <tqptrlist.h>
 #include <tqstring.h>
 #include <tqcstring.h>
-#include "kmmsgbase.h" // for KMMsgtqStatus
+#include "kmmsgbase.h" // for KMMsgStatus
 
 class KMMessage;
 class KConfig;
@@ -208,13 +208,13 @@ public:
 
 namespace KMail {
 // The below are used in several places and here so they are accessible.
-  struct MessagetqStatus {
+  struct MessageStatus {
     const char * const text;
     const char * const icon;
   };
 
   // If you change the ordering here; also do it in the enum below
-  static const MessagetqStatus StatusValues[] = {
+  static const MessageStatus StatusValues[] = {
     { I18N_NOOP( "Important" ),        "kmmsgflag"   },
     { I18N_NOOP( "New" ),              "kmmsgnew"   },
     { I18N_NOOP( "Unread" ),           "kmmsgunseen"   },
@@ -255,7 +255,7 @@ namespace KMail {
   };
 
   static const int StatusValueCount =
-    sizeof( StatusValues ) / sizeof( MessagetqStatus );
+    sizeof( StatusValues ) / sizeof( MessageStatus );
   // we want to show all status entries in the quick search bar, but only the
   // ones up to attachment in the search/filter dialog, because there the
   // attachment case is handled separately.
@@ -267,12 +267,12 @@ namespace KMail {
     @short This class represents a search pattern rule operating on message
     status.
 */
-class KMSearchRuletqStatus : public KMSearchRule
+class KMSearchRuleStatus : public KMSearchRule
 {
 public:
-   KMSearchRuletqStatus( const TQCString & field=0, Function function=FuncContains,
+   KMSearchRuleStatus( const TQCString & field=0, Function function=FuncContains,
 		       const TQString & contents=TQString() );
-   KMSearchRuletqStatus( int status, Function function=FuncContains );
+   KMSearchRuleStatus( int status, Function function=FuncContains );
 
   virtual bool isEmpty() const ;
   virtual bool matches( const KMMessage * msg ) const;
@@ -280,9 +280,9 @@ public:
   virtual bool matches( const DwString &, KMMessage &,
                         const DwBoyerMoore *,
 			int ) const;
-  static KMMsgtqStatus statusFromEnglishName(const TQString&);
+  static KMMsgStatus statusFromEnglishName(const TQString&);
   private:
-  KMMsgtqStatus mtqStatus;
+  KMMsgStatus mStatus;
 };
 
 // ------------------------------------------------------------------------
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index f21bee17f..ceafc27e4 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -106,12 +106,12 @@ void KMSearchRuleWidget::initWidget()
   // initialize the function/value widget stack
   mFunctionStack = new TQWidgetStack( this, "mFunctionStack" );
   //Don't expand the widget in vertical direction
-  mFunctionStack->tqsetSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
+  mFunctionStack->setSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
 
   hlay->addWidget( mFunctionStack );
 
   mValueStack = new TQWidgetStack( this, "mValueStack" );
-  mValueStack->tqsetSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
+  mValueStack->setSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
   hlay->addWidget( mValueStack );
   hlay->setStretchFactor( mValueStack, 10 );
 
@@ -143,7 +143,7 @@ void KMSearchRuleWidget::setRule( KMSearchRule *aRule )
   mRuleField->blockSignals( true );
 
   if ( i < 0 ) { // not found -> user defined field
-    mRuleField->changeItem( TQString::tqfromLatin1( aRule->field() ), 0 );
+    mRuleField->changeItem( TQString::fromLatin1( aRule->field() ), 0 );
     i = 0;
   } else { // found in the list of predefined fields
     mRuleField->changeItem( TQString(), 0 );
diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h
index e42ae080d..625d8f864 100644
--- a/kmail/kmsearchpatternedit.h
+++ b/kmail/kmsearchpatternedit.h
@@ -46,7 +46,7 @@ public:
       be used to initialize the widget. */
   KMSearchRuleWidget( TQWidget* parent=0, KMSearchRule* aRule=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false );
 
-  enum { Message, Body, AnyHeader, Recipients, Size, AgeInDays, tqStatus,
+  enum { Message, Body, AnyHeader, Recipients, Size, AgeInDays, Status,
          Subject, From, To, CC, ReplyTo, Organization };
 
   /** Set whether only header fields can be searched. If @p is true only
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index 761f4d60a..8870976f9 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -80,7 +80,7 @@ KMSender::~KMSender()
 void KMSender::seStatusMsg(const TQString &msg)
 {
   if ( mProgressItem )
-    mProgressItem->setqStatus(msg);
+    mProgressItem->seStatus(msg);
 }
 
 //-----------------------------------------------------------------------------
@@ -164,7 +164,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow)
   KMFolder * const outbox = kmkernel->outboxFolder();
   const KMFolderOpener openOutbox( outbox, "outbox" );
 
-  aMsg->setqStatus(KMMsgStatusQueued);
+  aMsg->seStatus(KMMsgStatusQueued);
 
   if ( const int err = outbox->addMsg(aMsg) ) {
     Q_UNUSED( err );
@@ -314,8 +314,8 @@ void KMSender::doSendMsg()
         mCurrentMsg->addBodyPart( &msgPart );
       }
     }
-    mCurrentMsg->setqStatus(KMMsgStatusSent);
-    mCurrentMsg->setqStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
+    mCurrentMsg->seStatus(KMMsgStatusSent);
+    mCurrentMsg->seStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
     mCurrentMsg->updateAttachmentState();
     mCurrentMsg->updateInvitationState();
 
@@ -850,7 +850,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg)
   int n = 0;
   while (1) {
     ulong msn;
-    KMMsgtqStatus status;
+    KMMsgStatus status;
     aMsg->getLink(n, &msn, &status);
     if (!msn || !status)
       break;
@@ -867,7 +867,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg)
           new KMDeleteMsgCommand( folder, folder->getMsg( index ) );
         cmd->start();
       } else {
-        folder->setqStatus(index, status);
+        folder->seStatus(index, status);
       }
     } else {
       kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl;
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index b5b0680da..a6ac84769 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include <tqfile.h>
 
-#undef tqStatus // stupid X headers
+#undef Status // stupid X headers
 
 extern "C" {
 
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index d7bba197b..3a1ab1ab5 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -67,7 +67,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name)
     mNewMessagePopupId(-1),
     mPopupMenu(0)
 {
-  tqsetAlignment( AlignCenter );
+  setAlignment( AlignCenter );
   kdDebug(5006) << "Initting systray" << endl;
 
   mLastUpdate = time( 0 );
@@ -81,7 +81,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name)
 
   KMMainWidget * mainWidget = kmkernel->getKMMainWidget();
   if ( mainWidget ) {
-    TQWidget * mainWin = mainWidget->tqtopLevelWidget();
+    TQWidget * mainWin = mainWidget->topLevelWidget();
     if ( mainWin ) {
       mDesktopOfMainWin = KWin::windowInfo( mainWin->winId(),
                                             NET::WMDesktop ).desktop();
@@ -133,7 +133,7 @@ void KMSystemTray::buildPopupMenu()
     action->plug( mPopupMenu );
   mPopupMenu->insertSeparator();
 
-  KMainWindow *mainWin = ::tqqt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->tqtopLevelWidget());
+  KMainWindow *mainWin = ::tqqt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->topLevelWidget());
   mPopupMenu->insertItem( SmallIcon("exit"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) );
 }
 
@@ -385,7 +385,7 @@ bool KMSystemTray::mainWindowIsOnCurrentDesktop()
   if ( !mainWidget )
     return false;
 
-  TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget();
+  TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget();
   if ( !mainWin )
     return false;
 
@@ -401,7 +401,7 @@ void KMSystemTray::showKMail()
 {
   if (!kmkernel->getKMMainWidget())
     return;
-  TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget();
+  TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget();
   assert(mainWin);
   if(mainWin)
   {
@@ -429,7 +429,7 @@ void KMSystemTray::hideKMail()
 {
   if (!kmkernel->getKMMainWidget())
     return;
-  TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget();
+  TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget();
   assert(mainWin);
   if(mainWin)
   {
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index c74c87f89..407a0bd99 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -291,7 +291,7 @@ KMTransportDialog::KMTransportDialog( const TQString & caption,
 {
   assert(transportInfo != 0);
 
-  if( transportInfo->type == TQString::tqfromLatin1("sendmail") )
+  if( transportInfo->type == TQString::fromLatin1("sendmail") )
   {
     makeSendmailPage();
   } else {
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index 29dd8d8b0..e9e4a9361 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -109,16 +109,16 @@ void ListJob::execute()
   jd.curNamespace = mNamespace;
   if ( mParentProgressItem )
   {
-    TQString escapedtqStatus = mDestFolder ? TQStyleSheet::escape( mDestFolder->prettyURL() )
+    TQString escapedStatus = mDestFolder ? TQStyleSheet::escape( mDestFolder->prettyURL() )
                                         : TQString();
     jd.progressItem = ProgressManager::createProgressItem(
         mParentProgressItem,
         "ListDir" + ProgressManager::getUniqueID(),
-        escapedtqStatus,
+        escapedStatus,
         i18n("retrieving folders"),
         false,
         mAccount->useSSL() || mAccount->useTLS() );
-    mParentProgressItem->setqStatus( escapedtqStatus );
+    mParentProgressItem->seStatus( escapedStatus );
   }
 
   // make the URL
diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp
index 85c0c3408..2e85c38dd 100644
--- a/kmail/mailinglistpropertiesdialog.cpp
+++ b/kmail/mailinglistpropertiesdialog.cpp
@@ -144,7 +144,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
                     TQT_SLOT(slotAddressChanged(int)) );
 
   load();
-  resize( TQSize(295, 204).expandedTo(tqminimumSizeHint()) );
+  resize( TQSize(295, 204).expandedTo(minimumSizeHint()) );
   clearWState( WState_Polished );
 }
 
diff --git a/kmail/main.cpp b/kmail/main.cpp
index 0cca3cb20..ae2d5a06f 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -28,7 +28,7 @@
 
 #include <kdebug.h>
 
-#undef tqStatus // stupid X headers
+#undef Status // stupid X headers
 
 #include "aboutdata.h"
 
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index b65acadf8..ba32c0089 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -54,7 +54,7 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co
            this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
   vlay->addWidget( mListView );
 
-  resize( 2 * tqsizeHint().width(), tqsizeHint().height() );
+  resize( 2 * sizeHint().width(), sizeHint().height() );
 
   slotRefresh();
 }
@@ -322,7 +322,7 @@ KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name )
   mTextEdit->setWordWrap( TQTextEdit::NoWrap );
   mTextEdit->setFont( KGlobalSettings::fixedFont() );
   connect( mTextEdit, TQT_SIGNAL( textChanged () ), TQT_SLOT( slotTextChanged() ) );
-  resize( 3 * tqsizeHint() );
+  resize( 3 * sizeHint() );
 }
 
 KMail::SieveEditor::~SieveEditor() {}
diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index 6dc248e7b..c1f569925 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -223,30 +223,30 @@ void MessageActions::slotNoQuoteReplyToMsg()
 
 void MessageActions::slotSetMsgStatusNew()
 {
-  setMessagetqStatus( KMMsgStatusNew );
+  setMessageStatus( KMMsgStatusNew );
 }
 
 void MessageActions::slotSetMsgStatusUnread()
 {
-  setMessagetqStatus( KMMsgStatusUnread );
+  setMessageStatus( KMMsgStatusUnread );
 }
 
 void MessageActions::slotSetMsgStatusRead()
 {
-  setMessagetqStatus( KMMsgStatusRead );
+  setMessageStatus( KMMsgStatusRead );
 }
 
 void MessageActions::slotSetMsgStatusFlag()
 {
-  setMessagetqStatus( KMMsgStatusFlag, true );
+  setMessageStatus( KMMsgStatusFlag, true );
 }
 
 void MessageActions::slotSetMsgStatusTodo()
 {
-  setMessagetqStatus( KMMsgStatusTodo, true );
+  setMessageStatus( KMMsgStatusTodo, true );
 }
 
-void MessageActions::setMessagetqStatus( KMMsgtqStatus status, bool toggle )
+void MessageActions::setMessageStatus( KMMsgStatus status, bool toggle )
 {
   TQValueList<TQ_UINT32> serNums = mVisibleSernums;
   if ( serNums.isEmpty() && mCurrentMessage )
diff --git a/kmail/messageactions.h b/kmail/messageactions.h
index a99e555b7..f0b47372d 100644
--- a/kmail/messageactions.h
+++ b/kmail/messageactions.h
@@ -70,7 +70,7 @@ class MessageActions : public TQObject
   private:
     void updateActions();
     template<typename T> void replyCommand();
-    void setMessagetqStatus( KMMsgtqStatus status, bool toggle = false );
+    void setMessageStatus( KMMsgStatus status, bool toggle = false );
 
   private slots:
     void slotReplyToMsg();
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index c69aa525b..d3a0233d6 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -599,7 +599,7 @@ void MessageComposer::chiasmusEncryptAllAttachments() {
   for ( TQValueVector<Attachment>::iterator it = mAttachments.begin(), end = mAttachments.end() ; it != end ; ++it ) {
     KMMessagePart * part = it->part;
     const TQString filename = part->fileName();
-    if ( filename.tqendsWith( ".xia", false ) )
+    if ( filename.endsWith( ".xia", false ) )
       continue; // already encrypted
     const TQByteArray body = part->bodyDecodedBinary();
     TQByteArray resultData;
@@ -2092,7 +2092,7 @@ TQByteArray MessageComposer::breakLinesAndApplyCodec()
 
   if( mCharset == "us-ascii" ) {
     cText = KMMsgBase::toUsAscii( text );
-    newText = TQString::tqfromLatin1( cText );
+    newText = TQString::fromLatin1( cText );
   } else if( codec == 0 ) {
     kdDebug(5006) << "Something is wrong and I can not get a codec." << endl;
     cText = text.local8Bit();
diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp
index e6fed27be..b5848dcc8 100644
--- a/kmail/newfolderdialog.cpp
+++ b/kmail/newfolderdialog.cpp
@@ -176,7 +176,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
     }
   }
 
-  resize( TQSize(282, 108).expandedTo(tqminimumSizeHint()) );
+  resize( TQSize(282, 108).expandedTo(minimumSizeHint()) );
   clearWState( WState_Polished );
   slotFolderNameChanged( mNameLineEdit->text());
 }
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 0e5103e29..518610d99 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -272,7 +272,7 @@ namespace KMail {
       ProcessResult processResult;
 
       if ( mReader ) {
-        htmlWriter()->queue( TQString::tqfromLatin1("<a name=\"att%1\"/>").tqarg( node->nodeId() ) );
+        htmlWriter()->queue( TQString::fromLatin1("<a name=\"att%1\"/>").tqarg( node->nodeId() ) );
       }
 
       if ( const Interface::BodyPartFormatter * formatter
@@ -391,7 +391,7 @@ namespace KMail {
   //////////////////
   //////////////////
 
-  static int signatureTotqStatus( const GpgME::Signature &sig )
+  static int signatureToStatus( const GpgME::Signature &sig )
   {
     switch ( sig.status().code() ) {
       case GPG_ERR_NO_ERROR:
@@ -586,10 +586,10 @@ namespace KMail {
       //kdDebug(5006) << "\nObjectTreeParser::writeOpaqueOrMultipartSignedData: found signature" << endl;
       GpgME::Signature signature = signatures[0];
 
-      messagePart.status_code = signatureTotqStatus( signature );
+      messagePart.status_code = signatureToStatus( signature );
       messagePart.status = TQString::fromUtf8( signature.status().asString() );
       for ( uint i = 1; i < signatures.size(); ++i ) {
-        if ( signatureTotqStatus( signatures[i] ) != messagePart.status_code ) {
+        if ( signatureToStatus( signatures[i] ) != messagePart.status_code ) {
           messagePart.status_code = GPGME_SIG_STAT_DIFF;
           messagePart.status = i18n("Different results for signatures");
         }
diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp
index 947c76ae3..a645b3989 100644
--- a/kmail/objecttreeparser_p.cpp
+++ b/kmail/objecttreeparser_p.cpp
@@ -190,7 +190,7 @@ bool VerifyDetachedBodyPartMemento::canStartKeyListJob() const
 TQStringList VerifyDetachedBodyPartMemento::keyListPattern() const
 {
   assert( canStartKeyListJob() );
-  return TQStringList( TQString::tqfromLatin1( m_vr.signature( 0 ).fingerprint() ) );
+  return TQStringList( TQString::fromLatin1( m_vr.signature( 0 ).fingerprint() ) );
 }
 
 void VerifyDetachedBodyPartMemento::saveResult( const VerificationResult & vr )
@@ -297,7 +297,7 @@ bool VerifyOpaqueBodyPartMemento::canStartKeyListJob() const
 TQStringList VerifyOpaqueBodyPartMemento::keyListPattern() const
 {
   assert( canStartKeyListJob() );
-  return TQStringList( TQString::tqfromLatin1( m_vr.signature( 0 ).fingerprint() ) );
+  return TQStringList( TQString::fromLatin1( m_vr.signature( 0 ).fingerprint() ) );
 }
 
 void VerifyOpaqueBodyPartMemento::saveResult( const VerificationResult & vr,
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index 333d14b0d..29cdac078 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -269,7 +269,7 @@ TQString partNode::contentTypeParameter( const char * name ) const {
     DwString this_attr = param->Attribute();
     this_attr.ConvertToLowerCase(); // what a braindead design!
     if ( this_attr == attr )
-      return TQString::tqfromLatin1( param->Value().data(), param->Value().size() );
+      return TQString::fromLatin1( param->Value().data(), param->Value().size() );
     // warning: misses rfc2231 handling!
   }
   return TQString();
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index a37bc6d58..15efb0e87 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -747,7 +747,7 @@ void PopAccount::slotJobFinished() {
     if ( !idsOfMsgsToDelete.isEmpty() ) {
       stage = Dele;
       if ( mMailCheckProgressItem )
-        mMailCheckProgressItem->setqStatus(
+        mMailCheckProgressItem->seStatus(
           i18n( "Fetched 1 message from %1. Deleting messages from server...",
                 "Fetched %n messages from %1. Deleting messages from server...",
                 numMsgs )
@@ -757,7 +757,7 @@ void PopAccount::slotJobFinished() {
     } else {
       stage = Quit;
       if ( mMailCheckProgressItem )
-        mMailCheckProgressItem->setqStatus(
+        mMailCheckProgressItem->seStatus(
           i18n( "Fetched 1 message from %1. Terminating transmission...",
                 "Fetched %n messages from %1. Terminating transmission...",
                 numMsgs )
@@ -777,7 +777,7 @@ void PopAccount::slotJobFinished() {
     }
     idsOfMsgsToDelete.clear();
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->setqStatus(
+      mMailCheckProgressItem->seStatus(
         i18n( "Fetched 1 message from %1. Terminating transmission...",
               "Fetched %n messages from %1. Terminating transmission...",
               numMsgs )
@@ -913,7 +913,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
           .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024)
           .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost);
       }
-      mMailCheckProgressItem->setqStatus( msg );
+      mMailCheckProgressItem->seStatus( 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/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 5b18e044b..1b39cee80 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -288,7 +288,7 @@ void RecipientLine::keyPressEvent( TQKeyEvent *ev )
 
 int RecipientLine::setComboWidth( int w )
 {
-  w = TQMAX( w, mCombo->tqsizeHint().width() );
+  w = TQMAX( w, mCombo->sizeHint().width() );
   mCombo->setFixedWidth( w );
   mCombo->updateGeometry();
   parentWidget()->updateGeometry();
@@ -331,7 +331,7 @@ RecipientsView::RecipientsView( TQWidget *parent )
 
   addLine();
   setResizePolicy( TQScrollView::Manual );
-  tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+  setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
 
   viewport()->setPaletteBackgroundColor( paletteBackgroundColor() );
 }
@@ -400,7 +400,7 @@ RecipientLine *RecipientsView::addLine()
 
   mFirstColumnWidth = line->setComboWidth( mFirstColumnWidth );
 
-  mLineHeight = line->tqminimumSizeHint().height();
+  mLineHeight = line->minimumSizeHint().height();
 
   line->resize( viewport()->width(), mLineHeight );
 
@@ -555,12 +555,12 @@ void RecipientsView::viewportResizeEvent ( TQResizeEvent *ev )
   ensureVisible( 0, mLines.count() * mLineHeight );
 }
 
-TQSize RecipientsView::tqsizeHint() const
+TQSize RecipientsView::sizeHint() const
 {
   return TQSize( 200, mLineHeight * mLines.count() );
 }
 
-TQSize RecipientsView::tqminimumSizeHint() const
+TQSize RecipientsView::minimumSizeHint() const
 {
   int height;
   uint numLines = 5;
@@ -757,7 +757,7 @@ SideWidget::SideWidget( RecipientsView *view, TQWidget *parent )
   topLayout->addStretch( 1 );
 
   mTotalLabel = new TQLabel( this );
-  mTotalLabel->tqsetAlignment( AlignCenter );
+  mTotalLabel->setAlignment( AlignCenter );
   topLayout->addWidget( mTotalLabel );
   mTotalLabel->hide();
 
diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h
index 0c4aafbcf..db63c8fe6 100644
--- a/kmail/recipientseditor.h
+++ b/kmail/recipientseditor.h
@@ -177,8 +177,8 @@ class RecipientsView : public TQScrollView
   public:
     RecipientsView( TQWidget *parent );
 
-    TQSize tqminimumSizeHint() const;
-    TQSize tqsizeHint() const;
+    TQSize minimumSizeHint() const;
+    TQSize sizeHint() const;
 
     RecipientLine *activeLine();
 
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index 05e552530..5d8b02ee3 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -54,7 +54,7 @@ Composer::Composer( TQWidget *parent )
   mRecipients = new RecipientsEditor( this );
   topLayout->addMultiCellWidget( mRecipients, 1, 1, 0, 1 );
 
-  kdDebug() << "SIZEHINT: " << mRecipients->tqsizeHint() << endl;
+  kdDebug() << "SIZEHINT: " << mRecipients->sizeHint() << endl;
 
 //  mRecipients->setFixedHeight( 10 );
   
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index 6d00e41c4..dcf43f794 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -241,7 +241,7 @@ void RecipientsListToolTip::maybeTip( const TQPoint & pos )
   RecipientViewItem *i = static_cast<RecipientViewItem *>( item );
 
   if( item ) {
-    r = mListView->tqitemRect( item );
+    r = mListView->itemRect( item );
     TQString tipText( i->recipientItem()->tooltip() );
     if ( !tipText.isEmpty() ) {
       tip( r, tipText );
diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp
index 4027375b9..88951fcf7 100644
--- a/kmail/redirectdialog.cpp
+++ b/kmail/redirectdialog.cpp
@@ -68,7 +68,7 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name,
 
   mBtnTo = new TQPushButton( TQString(), hbox, "toBtn" );
   mBtnTo->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) );
-  mBtnTo->setMinimumSize( mBtnTo->tqsizeHint() * 1.2 );
+  mBtnTo->setMinimumSize( mBtnTo->sizeHint() * 1.2 );
   TQToolTip::add( mBtnTo, i18n("Use the Address-Selection Dialog") );
   TQWhatsThis::add( mBtnTo, i18n("This button opens a separate dialog "
                                  "where you can select recipients out "
diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp
index 0b2b2fb50..0da122891 100644
--- a/kmail/regexplineedit.cpp
+++ b/kmail/regexplineedit.cpp
@@ -82,7 +82,7 @@ namespace KMail {
     if( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
       mRegExpEditButton = new TQPushButton( i18n("Edit..."), this,
                                            "mRegExpEditButton" );
-      mRegExpEditButton->tqsetSizePolicy( TQSizePolicy::Minimum,
+      mRegExpEditButton->setSizePolicy( TQSizePolicy::Minimum,
                                         TQSizePolicy::Fixed );
       hlay->addWidget( mRegExpEditButton );
 
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index 9cc9e3ecb..4dc7eb6bf 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -1123,7 +1123,7 @@ namespace {
 
     const int status = currenStatusValue( valueStack );
     if ( status != -1 )
-      return TQString::tqfromLatin1( KMail::StatusValues[ status ].text );
+      return TQString::fromLatin1( KMail::StatusValues[ status ].text );
     else
       return TQString();
   }
@@ -1215,7 +1215,7 @@ namespace {
     const TQString value = rule->contents();
     int valueIndex = 0;
     for ( ; valueIndex < KMail::StatusValueCountWithoutHidden; ++valueIndex )
-      if ( value == TQString::tqfromLatin1(
+      if ( value == TQString::fromLatin1(
                KMail::StatusValues[ valueIndex ].text ) )
         break;
     TQComboBox *statusCombo =
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index ff2248832..1a5da2688 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -360,7 +360,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" );
   mCutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" );
 
-  connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updtqStatus()));
+  connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updStatus()));
   connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
           TQT_TQOBJECT(this), TQT_SLOT(folderInvalidated(KMFolder*)));
 
@@ -400,7 +400,7 @@ void SearchWindow::setEnabledSearchButton(bool)
 }
 
 //-----------------------------------------------------------------------------
-void SearchWindow::updtqStatus(void)
+void SearchWindow::updStatus(void)
 {
     TQString genMsg, detailMsg, procMsg;
     int numMatches = 0, numProcessed = 0;
@@ -466,7 +466,7 @@ void SearchWindow::activateFolder(KMFolder *curFolder)
 //-----------------------------------------------------------------------------
 void SearchWindow::slotSearch()
 {
-    mLastFocus = tqfocusWidget();
+    mLastFocus = focusWidget();
     mBtnSearch->setFocus();     // set focus so we don't miss key event
 
     mStopped = false;
@@ -541,7 +541,7 @@ void SearchWindow::slotSearch()
 void SearchWindow::searchDone()
 {
     mTimer->stop();
-    updtqStatus();
+    updStatus();
 
     TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(enableGUI()));
     if(mLastFocus)
diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h
index 6ea4adf86..19183e66d 100644
--- a/kmail/searchwindow.h
+++ b/kmail/searchwindow.h
@@ -105,7 +105,7 @@ public:
 
 protected slots:
   /** Update status line widget. */
-  virtual void updtqStatus(void);
+  virtual void updStatus(void);
 
   virtual void slotClose();
   virtual void slotSearch();
diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp
index fb3c7c40d..e29551676 100644
--- a/kmail/signatureconfigurator.cpp
+++ b/kmail/signatureconfigurator.cpp
@@ -260,7 +260,7 @@ namespace KMail {
     // slotEnableEditButton should prevent this assert from being hit:
     assert( !url.isEmpty() );
 
-    (void)KRun::runURL( KURL( url ), TQString::tqfromLatin1("text/plain") );
+    (void)KRun::runURL( KURL( url ), TQString::fromLatin1("text/plain") );
   }
 
 } // namespace KMail
diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui
index 287605aa3..a1a34d397 100644
--- a/kmail/smimeconfiguration.ui
+++ b/kmail/smimeconfiguration.ui
@@ -38,7 +38,7 @@
                 <string>Validate certificates online (OCSP)</string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>If this option is selected, S/MIME certificates are validated online using the Online Certificates tqStatus Protocol (OCSP). Fill in the URL of the OCSP responder below.</string>
+                <string>If this option is selected, S/MIME certificates are validated online using the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP responder below.</string>
             </property>
         </widget>
         <widget class="TQGroupBox">
@@ -109,7 +109,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>150</width>
                                     <height>20</height>
@@ -351,7 +351,7 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>73</height>
diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui
index 5cdf04c73..429b598b9 100644
--- a/kmail/snippetdlgbase.ui
+++ b/kmail/snippetdlgbase.ui
@@ -37,7 +37,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -85,7 +85,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>80</height>
diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui
index a9949cb55..83eba9643 100644
--- a/kmail/snippetsettingsbase.ui
+++ b/kmail/snippetsettingsbase.ui
@@ -56,7 +56,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>70</height>
@@ -144,7 +144,7 @@
                             <property name="name">
                                 <cstring>leDelimiter</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>40</width>
                                     <height>32767</height>
@@ -164,7 +164,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index aff2e8067..afa610df8 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -521,7 +521,7 @@ void SnippetWidget::maybeTip( const TQPoint & p )
 	if (!item)
 	  return;
 
-	TQRect r = tqitemRect( item );
+	TQRect r = itemRect( item );
 
 	if (r.isValid() &&
         _SnippetConfig.useToolTips() )
@@ -670,7 +670,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   TQCheckBox * cb = NULL;
 
   labTop = new TQLabel( &dlg, "label" );
-  labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  labTop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          labTop->sizePolicy().hasHeightForWidth() ) );
   labTop->setText(i18n("Enter the replacement values for these variables:"));
   layoutTop->addWidget(labTop, 0, 0);
@@ -708,13 +708,13 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" );
-  btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn1->sizePolicy().hasHeightForWidth() ) );
   layoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
   btn2->setDefault( TRUE );
-  btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn2->sizePolicy().hasHeightForWidth() ) );
   layoutBtn->addWidget( btn2, 0, 1 );
 
@@ -912,7 +912,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *)
     group = dynamic_cast<SnippetGroup *>(item2->parent());
 
   TQCString dropped;
-  TQByteArray data = e->tqencodedData("text/plain");
+  TQByteArray data = e->encodedData("text/plain");
   if ( e->provides("text/plain") && data.size()>0 ) {
     //get the data from the event...
     TQString encData(data.data());
diff --git a/kmail/stringutil.cpp b/kmail/stringutil.cpp
index e3a2243c8..907c5e1fb 100644
--- a/kmail/stringutil.cpp
+++ b/kmail/stringutil.cpp
@@ -29,7 +29,7 @@ namespace StringUtil
 TQString encodeMailtoUrl( const TQString& str )
 {
   TQString result;
-  result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str,
+  result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str,
                                 "utf-8" ) );
   result = KURL::encode_string( result );
   return result;
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 8dce59d4e..f3d48fecc 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -693,7 +693,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
       } else if ( cmd.startsWith( "DATEEN" ) ) {
         kdDebug() << "Command: DATEEN" << endl;
         i += strlen( "DATEEN" );
-        TQDateTime date = TQDateTime::tqcurrentDateTime();
+        TQDateTime date = TQDateTime::currentDateTime();
         KLocale locale( "C" );
         TQString str = locale.formatDate( date.date(), false );
         body.append( str );
@@ -701,28 +701,28 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
       } else if ( cmd.startsWith( "DATESHORT" ) ) {
         kdDebug() << "Command: DATESHORT" << endl;
         i += strlen( "DATESHORT" );
-        TQDateTime date = TQDateTime::tqcurrentDateTime();
+        TQDateTime date = TQDateTime::currentDateTime();
         TQString str = KGlobal::locale()->formatDate( date.date(), true );
         body.append( str );
 
       } else if ( cmd.startsWith( "DATE" ) ) {
         kdDebug() << "Command: DATE" << endl;
         i += strlen( "DATE" );
-        TQDateTime date = TQDateTime::tqcurrentDateTime();
+        TQDateTime date = TQDateTime::currentDateTime();
         TQString str = KGlobal::locale()->formatDate( date.date(), false );
         body.append( str );
 
       } else if ( cmd.startsWith( "DOW" ) ) {
         kdDebug() << "Command: DOW" << endl;
         i += strlen( "DOW" );
-        TQDateTime date = TQDateTime::tqcurrentDateTime();
+        TQDateTime date = TQDateTime::currentDateTime();
         TQString str = KGlobal::locale()->calendar()->weekDayName( date.date(), false );
         body.append( str );
 
       } else if ( cmd.startsWith( "TIMELONGEN" ) ) {
         kdDebug() << "Command: TIMELONGEN" << endl;
         i += strlen( "TIMELONGEN" );
-        TQDateTime date = TQDateTime::tqcurrentDateTime();
+        TQDateTime date = TQDateTime::currentDateTime();
         KLocale locale( "C");
         TQString str = locale.formatTime( date.time(), true );
         body.append( str );
@@ -730,14 +730,14 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
       } else if ( cmd.startsWith( "TIMELONG" ) ) {
         kdDebug() << "Command: TIMELONG" << endl;
         i += strlen( "TIMELONG" );
-        TQDateTime date = TQDateTime::tqcurrentDateTime();
+        TQDateTime date = TQDateTime::currentDateTime();
         TQString str = KGlobal::locale()->formatTime( date.time(), true );
         body.append( str );
 
       } else if ( cmd.startsWith( "TIME" ) ) {
         kdDebug() << "Command: TIME" << endl;
         i += strlen( "TIME" );
-        TQDateTime date = TQDateTime::tqcurrentDateTime();
+        TQDateTime date = TQDateTime::currentDateTime();
         TQString str = KGlobal::locale()->formatTime( date.time(), false );
         body.append( str );
 
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index b3c05c293..6f39a29c0 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -47,8 +47,8 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na
   textEdit_reply_all->setFont( f );
   textEdit_forward->setFont( f );
 
-  tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
-  tqsizeHint();
+  setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+  sizeHint();
 
   connect( textEdit_new, TQT_SIGNAL( textChanged() ),
            this, TQT_SLOT( slotTextChanged( void ) ) );
diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui
index fba3da7ef..a6419987f 100644
--- a/kmail/templatesconfiguration_base.ui
+++ b/kmail/templatesconfiguration_base.ui
@@ -20,7 +20,7 @@
             <verstretch>3</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>400</width>
             <height>300</height>
@@ -45,7 +45,7 @@
                     <verstretch>3</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -86,7 +86,7 @@
                                 <verstretch>3</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>0</width>
                                 <height>0</height>
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index 825585633..f084be379 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -325,7 +325,7 @@ TemplatesInsertCommand::~TemplatesInsertCommand()
 
 void TemplatesInsertCommand::slotClicked()
 {
-  TQSize ps = mMenu->popupMenu()->tqsizeHint();
+  TQSize ps = mMenu->popupMenu()->sizeHint();
   mMenu->popup( mapToGlobal( TQPoint( 0, -(ps.height()) ) ) );
 }
 
diff --git a/kmail/tests/signedmail.mbox b/kmail/tests/signedmail.mbox
index 5d1a286ab..1df5f3eed 100644
--- a/kmail/tests/signedmail.mbox
+++ b/kmail/tests/signedmail.mbox
@@ -31,7 +31,7 @@ Content-Type: multipart/signed;
 Message-Id: <20070403084156.C961269606@smtp4-g19.free.fr>
 To: undisclosed-recipients:;
 X-Virus-Scanned: by amavisd-new at kdab.net
-X-Spam-tqStatus: Yes, score=7.598 tagged_above=3 required=6.3
+X-Spam-Status: Yes, score=7.598 tagged_above=3 required=6.3
  tests=[BAYES_50=0.001, DATE_IN_PAST_96_XX=2.02, DNS_FROM_AHBL_RHSBL=0.231,
  DNS_FROM_RFC_ABUSE=0.2, DNS_FROM_RFC_DSN=2.597, DNS_FROM_RFC_POST=1.708,
  UNDISC_RECIPS=0.841]
@@ -41,8 +41,8 @@ X-Spam-Flag: YES
 X-Kolab-Scheduling-Message: FALSE
 X-UID: 68768
 X-Length: 3235
-tqStatus: RO
-X-tqStatus: RPT
+Status: RO
+X-Status: RPT
 X-KMail-EncryptionState:  
 X-KMail-SignatureState:  
 X-KMail-MDN-Sent:  
diff --git a/kmail/twindowpositioner.cpp b/kmail/twindowpositioner.cpp
index fbcb97607..dde045845 100644
--- a/kmail/twindowpositioner.cpp
+++ b/kmail/twindowpositioner.cpp
@@ -29,7 +29,7 @@ KWindowPositioner::KWindowPositioner( TQWidget *master, TQWidget *slave,
   Mode mode )
   : TQObject( master ), mMaster( master ), mSlave( slave ), mMode( mode )
 {
-  master->tqtopLevelWidget()->installEventFilter( this );
+  master->topLevelWidget()->installEventFilter( this );
 }
 
 bool KWindowPositioner::eventFilter( TQObject *, TQEvent *e )
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index fbcf46c82..7011185d5 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -469,21 +469,21 @@ namespace KMail {
       }
       addressesArgument += sl.join( ", " ) + " ] ";
     }
-    TQString script = TQString::tqfromLatin1("require \"vacation\";\n\n" );
+    TQString script = TQString::fromLatin1("require \"vacation\";\n\n" );
     if ( !sendForSpam )
-      script += TQString::tqfromLatin1( "if header :contains \"X-Spam-Flag\" \"YES\""
+      script += TQString::fromLatin1( "if header :contains \"X-Spam-Flag\" \"YES\""
                                      " { keep; stop; }\n" ); // FIXME?
 
     if ( !domain.isEmpty() ) // FIXME
-      script += TQString::tqfromLatin1( "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" ).tqarg( domain );
 
     script += "vacation ";
     script += addressesArgument;
     if ( notificationInterval > 0 )
-      script += TQString::tqfromLatin1(":days %1 ").tqarg( notificationInterval );
-    script += TQString::tqfromLatin1("text:\n");
+      script += TQString::fromLatin1(":days %1 ").tqarg( notificationInterval );
+    script += TQString::fromLatin1("text:\n");
     script += dotstuff( messageText.isEmpty() ? defaultMessageText() : messageText );
-    script += TQString::tqfromLatin1( "\n.\n;\n" );
+    script += TQString::fromLatin1( "\n.\n;\n" );
     return script;
   }
 
@@ -573,7 +573,7 @@ namespace KMail {
 		"\n"
 		"Yours sincerely,\n"
 		"-- <enter your name and email address here>\n")
-      .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate().addDays( 1 ) ) );
+      .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) );
   }
 
   int Vacation::defaultNotificationInterval() {
diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui
index c31bdb381..12d1c405f 100644
--- a/kmail/warningconfiguration.ui
+++ b/kmail/warningconfiguration.ui
@@ -329,7 +329,7 @@ The recommended SPHINX setting is 14 days.
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -348,7 +348,7 @@ The recommended SPHINX setting is 14 days.
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
@@ -373,7 +373,7 @@ The recommended SPHINX setting is 14 days.
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index 5b56e2919..afd9f5fe6 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -165,7 +165,7 @@ namespace KMail {
         "monochrome picture with every message. "
         "For example, this could be a picture of you or a glyph. "
         "It is shown in the recipient's mail client (if supported)." ), page );
-    label1->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+    label1->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
     page_vlay->addWidget( label1 );
 
     widgetStack->raiseWidget( 0 ); // since mSourceCombo->currentItem() == 0
@@ -266,7 +266,7 @@ namespace KMail {
     TQString str = mTextEdit->text();
     if ( !str.isEmpty() )
     {
-      if ( str.tqstartsWith("x-face:", false) )
+      if ( str.startsWith("x-face:", false) )
       {
         str = str.remove("x-face:", false);
         mTextEdit->setText(str);
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-18 18:34:45 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-18 18:34:45 -0600
commit	0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 (patch)
tree	4138783f7dad757fc5fbfaa8d66a355288d3125e /kmail
parent	9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (diff)
download	tdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.tar.gz tdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.zip