Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
author: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-02-16 20:17:18 +0000
committer: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-02-16 20:17:18 +0000
commit: f4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
tree: d8c5d93232235cd635f3310b4d95490df181ba2d /kmail
parent: 125c0a08265b75a133644d3b55f47e37c919f45d (diff)
download: tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
223 files changed, 1941 insertions, 1941 deletions
diff --git a/kmail/Makefile.am b/kmail/Makefile.am
index 629390928..7d0ed2382 100644
--- a/kmail/Makefile.am
+++ b/kmail/Makefile.am
@@ -25,8 +25,8 @@ INDEXLIB=../indexlib/libindex.la
 endif
 
 lib_LTLIBRARIES = libkmailprivate.la
-libkmailprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
-libkmailprivate_la_LIBADD  = \
+libkmailprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined -L$(top_builddir)/libkdepim
+libkmailprivate_la_LIBADD = \
         ../libkmime/libkmime.la ../libkpgp/libkpgp.la ../libkdepim/libkdepim.la \
         ../libkpimidentities/libkpimidentities.la ../mimelib/libmimelib.la \
         ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
@@ -49,7 +49,7 @@ linkdir = $(kde_datadir)/kmail/plugins/bodypartformatter
 link_DATA = application_octetstream.desktop
 
 bin_PROGRAMS = kmail
-kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libkdepim -lkdepim
 kmail_LDADD   = libkmailprivate.la
 
 libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index e525fae49..19d25574f 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -156,7 +156,7 @@ namespace KMail {
   };
 
   static const about_data credits[] = {
-    { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons replacement
+    { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons tqreplacement
     { "Joern Ahrens", 0, 0, 0 }, // implement wish 77182 (Add some separators to "Mark Message as" popup menu)
     { "Tom Albers", 0, 0, 0 }, // small fixes, bugzilla maintenance
     { "Albert Cervera Areny", 0, 0, 0 }, // implemented wish 88309 (optional compression of attachments)
@@ -196,7 +196,7 @@ namespace KMail {
       "[email protected]", 0 },
     { "Paul Sprakes", 0, 0, 0 }, // fix for bug:63619 (filter button in toolbar doesn't work), context menu clean up
     { "Will Stephenson", 0, 0, 0 }, // added IM status indicator
-    { "Hasso Tepper", 0, 0, 0 }, // improve layout of recipients editor
+    { "Hasso Tepper", 0, 0, 0 }, // improve tqlayout of recipients editor
     { "Patrick S. Vogt", I18N_NOOP("timestamp for 'Transmission completed' status messages"),
       "[email protected]", 0 },
     { "Jan-Oliver Wagner", I18N_NOOP("\xC3\x84gypten and Kroupware project management"),
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 8254bac9a..51c729772 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -156,11 +156,11 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
     default_Location += '/';
     default_Location += getenv("USER");
   }
-  if ( !mSpoolFiles.contains(default_Location) )
+  if ( !mSpoolFiles.tqcontains(default_Location) )
     mSpoolFiles << default_Location;
 
   default_Location = default_Location + ".lock";
-  if ( !mLockFiles.contains(default_Location) )
+  if ( !mLockFiles.tqcontains(default_Location) )
     mLockFiles << default_Location;
 }
 
@@ -173,7 +173,7 @@ void
 ProcmailRCParser::processGlobalLock(const TQString &s)
 {
   TQString val = expandVars(s.mid(s.find('=') + 1).stripWhiteSpace());
-  if ( !mLockFiles.contains(val) )
+  if ( !mLockFiles.tqcontains(val) )
     mLockFiles << val;
 }
 
@@ -215,7 +215,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
       line.insert(0, *(mVars["MAILDIR"]) + '/');
 
     // now we have the spoolfile name
-    if ( !mSpoolFiles.contains(line) )
+    if ( !mSpoolFiles.tqcontains(line) )
       mSpoolFiles << line;
 
     if( colonPos > 0 && (!val || val.isEmpty()) ) {
@@ -230,7 +230,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
         val += ".lock";
     }
 
-    if ( !val.isNull() && !mLockFiles.contains(val) ) {
+    if ( !val.isNull() && !mLockFiles.tqcontains(val) ) {
       mLockFiles << val;
     }
   }
@@ -258,7 +258,7 @@ ProcmailRCParser::expandVars(const TQString &s)
   TQAsciiDictIterator<TQString> it( mVars ); // iterator for dict
 
   while ( it.current() ) {
-    expS.replace(TQString::fromLatin1("$") + it.currentKey(), *it.current());
+    expS.tqreplace(TQString::tqfromLatin1("$") + 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( topLevelWidget(),msg,i18n("Configure Account") );
+    KMessageBox::information( tqtopLevelWidget(),msg,i18n("Configure Account") );
     return;
   }
 
@@ -358,10 +358,10 @@ void AccountDialog::makeLocalAccountPage()
 
   TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page );
   group->setColumnLayout(0, Qt::Horizontal);
-  group->layout()->setSpacing( 0 );
-  group->layout()->setMargin( 0 );
-  TQGridLayout *groupLayout = new TQGridLayout( group->layout() );
-  groupLayout->setAlignment( Qt::AlignTop );
+  group->tqlayout()->setSpacing( 0 );
+  group->tqlayout()->setMargin( 0 );
+  TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() );
+  groupLayout->tqsetAlignment( Qt::AlignTop );
   groupLayout->setSpacing( 6 );
   groupLayout->setMargin( 11 );
 
@@ -806,7 +806,7 @@ void AccountDialog::makePopAccountPage()
   mPop.authDigestMd5 = new TQRadioButton( i18n("&DIGEST-MD5"), mPop.authGroup, "auth digest-md5" );
   mPop.authNTLM = new TQRadioButton( i18n("&NTLM"), mPop.authGroup, "auth ntlm" );
   mPop.authGSSAPI = new TQRadioButton( i18n("&GSSAPI"), mPop.authGroup, "auth gssapi" );
-  if ( KProtocolInfo::capabilities("pop3").contains("SASL") == 0 )
+  if ( KProtocolInfo::capabilities("pop3").tqcontains("SASL") == 0 )
   {
     mPop.authNTLM->hide();
     mPop.authGSSAPI->hide();
@@ -905,7 +905,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   // button to reload
   TQToolButton* button = new TQToolButton( box );
   button->setAutoRaise(true);
-  button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  button->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mImap.editPNS->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mImap.editONS->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mImap.editSNS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mImap.editSNS->setFixedSize( 22, 22 );
   connect( mImap.editSNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSharedNamespace()) );
 
@@ -1127,7 +1127,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
 
   // TODO (marc/bo): Test this
   mSieveConfigEditor = new SieveConfigEditor( tabWidget );
-  mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() );
+  mSieveConfigEditor->tqlayout()->setMargin( KDialog::marginHint() );
   tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") );
 
   connect(kapp,TQT_SIGNAL(kdisplayFontChanged()),TQT_SLOT(slotFontChanged()));
@@ -1451,7 +1451,7 @@ void AccountDialog::slotLeaveOnServerClicked()
     slotEnableLeaveOnServerSize( state );
   }
   if ( !( mCurCapa & UIDL ) && mPop.leaveOnServerCheck->isChecked() ) {
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               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( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               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( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
       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( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               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( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               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( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               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->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+    button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
     button->setFixedSize( 22, 22 );
     mLineEditMap[ mBg->insert( button ) ] = edit;
   }
@@ -2315,7 +2315,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
 
 void NamespaceEditDialog::slotRemoveEntry( int id )
 {
-  if ( mLineEditMap.contains( id ) ) {
+  if ( mLineEditMap.tqcontains( id ) ) {
     // delete the lineedit and remove namespace from map
     NamespaceLineEdit* edit = mLineEditMap[id];
     mDelimMap.remove( edit->text() );
@@ -2343,7 +2343,7 @@ void NamespaceEditDialog::slotOk()
       mDelimMap.remove( edit->lastText() );
     }
   }
-  mNamespaceMap->replace( mType, mDelimMap );
+  mNamespaceMap->tqreplace( mType, mDelimMap );
   KDialogBase::slotOk();
 }
 
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 0610622f7..5484c66d8 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -155,7 +155,7 @@ void AccountManager::processNextCheck( bool _newMail )
   if ( mAcctChecking.isEmpty() ) {
     // all checks finished, display summary
     if ( mDisplaySummary )
-      KPIM::BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
+      KPIM::BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
           mTotalNewMailsArrived );
     emit checkedMail( mNewMailArrived, mInteractive, mTotalNewInFolder );
     mTotalNewMailsArrived = 0;
@@ -222,7 +222,7 @@ void AccountManager::processNextCheck( bool _newMail )
   connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                 this, TQT_SLOT( processNextCheck( bool ) ) );
 
-  KPIM::BroadcastStatus::instance()->setStatusMsg(
+  KPIM::BroadcasStatus::instance()->seStatusMsg(
       i18n("Checking account %1 for new mail").arg(curAccount->name()));
 
   kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl;
@@ -358,11 +358,11 @@ void AccountManager::checkMail( bool _interactive )
 
 //-----------------------------------------------------------------------------
 void AccountManager::singleInvalidateIMAPFolders(KMAccount *account) {
-  account->invalidateIMAPFolders();
+  account->tqinvalidateIMAPFolders();
 }
 
 
-void AccountManager::invalidateIMAPFolders()
+void AccountManager::tqinvalidateIMAPFolders()
 {
   for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it )
     singleInvalidateIMAPFolders( *it );
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index 94bf470ad..f693180f1 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -82,7 +82,7 @@ public:
   void checkMail( bool interactive = true );
 
   /** Delete all IMAP folders and resync them */
-  void invalidateIMAPFolders();
+  void tqinvalidateIMAPFolders();
 
   TQStringList getAccounts() const;
 
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 589ef5d63..0dfb503d9 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -215,29 +215,29 @@ void AccountWizard::setupAccountTypePage()
 void AccountWizard::setupAccountInformationPage()
 {
   mAccountInformationPage = new TQWidget( this );
-  TQGridLayout *layout = new TQGridLayout( mAccountInformationPage, 3, 2,
+  TQGridLayout *tqlayout = new TQGridLayout( mAccountInformationPage, 3, 2,
                                          KDialog::marginHint(), KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Real name:" ), mAccountInformationPage );
   mRealName = new KLineEdit( mAccountInformationPage );
   label->setBuddy( mRealName );
 
-  layout->addWidget( label, 0, 0 );
-  layout->addWidget( mRealName, 0, 1 );
+  tqlayout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( mRealName, 0, 1 );
 
   label = new TQLabel( i18n( "E-mail address:" ), mAccountInformationPage );
   mEMailAddress = new KLineEdit( mAccountInformationPage );
   label->setBuddy( mEMailAddress );
 
-  layout->addWidget( label, 1, 0 );
-  layout->addWidget( mEMailAddress, 1, 1 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( mEMailAddress, 1, 1 );
 
   label = new TQLabel( i18n( "Organization:" ), mAccountInformationPage );
   mOrganization = new KLineEdit( mAccountInformationPage );
   label->setBuddy( mOrganization );
 
-  layout->addWidget( label, 2, 0 );
-  layout->addWidget( mOrganization, 2, 1 );
+  tqlayout->addWidget( label, 2, 0 );
+  tqlayout->addWidget( mOrganization, 2, 1 );
 
   addPage( mAccountInformationPage, i18n( "Account Information" ) );
 }
@@ -245,23 +245,23 @@ void AccountWizard::setupAccountInformationPage()
 void AccountWizard::setupLoginInformationPage()
 {
   mLoginInformationPage = new TQWidget( this );
-  TQGridLayout *layout = new TQGridLayout( mLoginInformationPage, 2, 2,
+  TQGridLayout *tqlayout = new TQGridLayout( mLoginInformationPage, 2, 2,
                                          KDialog::marginHint(), KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Login name:" ), mLoginInformationPage );
   mLoginName = new KLineEdit( mLoginInformationPage );
   label->setBuddy( mLoginName );
 
-  layout->addWidget( label, 0, 0 );
-  layout->addWidget( mLoginName, 0, 1 );
+  tqlayout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( mLoginName, 0, 1 );
 
   label = new TQLabel( i18n( "Password:" ), mLoginInformationPage );
   mPassword = new KLineEdit( mLoginInformationPage );
   mPassword->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPassword );
 
-  layout->addWidget( label, 1, 0 );
-  layout->addWidget( mPassword, 1, 1 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( mPassword, 1, 1 );
 
   addPage( mLoginInformationPage, i18n( "Login Information" ) );
 }
@@ -269,7 +269,7 @@ void AccountWizard::setupLoginInformationPage()
 void AccountWizard::setupServerInformationPage()
 {
   mServerInformationPage = new TQWidget( this );
-  TQGridLayout *layout = new TQGridLayout( mServerInformationPage, 3, 2,
+  TQGridLayout *tqlayout = new TQGridLayout( mServerInformationPage, 3, 2,
                                          KDialog::marginHint(), KDialog::spacingHint() );
 
   mIncomingLabel = new TQLabel( mServerInformationPage );
@@ -285,23 +285,23 @@ void AccountWizard::setupServerInformationPage()
   connect( mChooseLocation, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( chooseLocation() ) );
 
-  layout->addWidget( mIncomingLabel, 0, 0, AlignTop );
-  layout->addWidget( mIncomingLocationWdg, 0, 1 );
-  layout->addWidget( mIncomingServerWdg, 0, 1 );
+  tqlayout->addWidget( mIncomingLabel, 0, 0, AlignTop );
+  tqlayout->addWidget( mIncomingLocationWdg, 0, 1 );
+  tqlayout->addWidget( mIncomingServerWdg, 0, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Outgoing server:" ), mServerInformationPage );
   mOutgoingServer = new KLineEdit( mServerInformationPage );
   label->setBuddy( mOutgoingServer );
 
-  layout->addWidget( label, 1, 0 );
-  layout->addWidget( mOutgoingServer, 1, 1 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( mOutgoingServer, 1, 1 );
 
   mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mServerInformationPage );
-  layout->addWidget( mOutgoingUseSSL, 2, 1 );
+  tqlayout->addWidget( mOutgoingUseSSL, 2, 1 );
 
   mLocalDelivery = new TQCheckBox( i18n( "Use local delivery" ),
                                   mServerInformationPage );
-  layout->addWidget( mLocalDelivery, 3, 0 );
+  tqlayout->addWidget( mLocalDelivery, 3, 0 );
 
   connect( mLocalDelivery, TQT_SIGNAL( toggled( bool ) ),
            mOutgoingServer, TQT_SLOT( setDisabled( bool ) ) );
diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp
index 1f9b6bb5d..9926cc463 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::fromLatin1( permissionsToIMAPRights( permissions ) );
+  TQString perm = TQString::tqfromLatin1( permissionsToIMAPRights( permissions ) );
 
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
diff --git a/kmail/acljobs.h b/kmail/acljobs.h
index 2a868540b..d6a9b245b 100644
--- a/kmail/acljobs.h
+++ b/kmail/acljobs.h
@@ -51,7 +51,7 @@ namespace KMail {
   typedef TQValueVector<ACLListEntry> ACLList;
 
 /**
- * This namespace contains functions that return jobs for ACL operations.
+ * This namespace tqcontains functions that return jobs for ACL operations.
  *
  * The current implementation is tied to IMAP.
  * If someone wants to extend this to other protocols, turn the class into a namespace
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 0af6cdd4f..6975b3fcd 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -157,8 +157,8 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder )
 {
   srcFolder->open("actionschedsrc");
   if (mSrcFolder) {
-    disconnect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-		this, TQT_SLOT(msgAdded(KMFolder*, Q_UINT32)) );
+    disconnect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+		this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
     disconnect( mSrcFolder, TQT_SIGNAL(closed()),
                 this, TQT_SLOT(folderClosedOrExpunged()) );
     disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)),
@@ -170,8 +170,8 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder )
   for (i = 0; i < mSrcFolder->count(); ++i)
     enqueue( mSrcFolder->getMsgBase( i )->getMsgSerNum() );
   if (mSrcFolder) {
-    connect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-	     this, TQT_SLOT(msgAdded(KMFolder*, Q_UINT32)) );
+    connect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+	     this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
     connect( mSrcFolder, TQT_SIGNAL(closed()),
              this, TQT_SLOT(folderClosedOrExpunged()) );
     connect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)),
@@ -230,9 +230,9 @@ void ActionScheduler::tempCloseFolders()
   mOpenFolders.clear();
 }
 
-void ActionScheduler::execFilters(const TQValueList<Q_UINT32> serNums)
+void ActionScheduler::execFilters(const TQValueList<TQ_UINT32> serNums)
 {
-  TQValueListConstIterator<Q_UINT32> it;
+  TQValueListConstIterator<TQ_UINT32> it;
   for (it = serNums.begin(); it != serNums.end(); ++it)
     execFilters( *it );
 }
@@ -250,7 +250,7 @@ void ActionScheduler::execFilters(KMMsgBase* msgBase)
   execFilters( msgBase->getMsgSerNum() );
 }
 
-void ActionScheduler::execFilters(Q_UINT32 serNum)
+void ActionScheduler::execFilters(TQ_UINT32 serNum)
 {
   if (mResult != ResultOk) {
       if ((mResult != ResultCriticalError) &&
@@ -279,7 +279,7 @@ void ActionScheduler::execFilters(Q_UINT32 serNum)
   }
 }
 
-KMMsgBase *ActionScheduler::messageBase(Q_UINT32 serNum)
+KMMsgBase *ActionScheduler::messageBase(TQ_UINT32 serNum)
 {
   int idx = -1;
   KMFolder *folder = 0;
@@ -299,7 +299,7 @@ KMMsgBase *ActionScheduler::messageBase(Q_UINT32 serNum)
   return msg;
 }
 
-KMMessage *ActionScheduler::message(Q_UINT32 serNum)
+KMMessage *ActionScheduler::message(TQ_UINT32 serNum)
 {
   int idx = -1;
   KMFolder *folder = 0;
@@ -380,7 +380,7 @@ void ActionScheduler::finish()
 
 void ActionScheduler::fetchMessage()
 {
-  TQValueListIterator<Q_UINT32> mFetchMessageIt = mFetchSerNums.begin();
+  TQValueListIterator<TQ_UINT32> mFetchMessageIt = mFetchSerNums.begin();
   while (mFetchMessageIt != mFetchSerNums.end()) {
     if (!MessageProperty::transferInProgress(*mFetchMessageIt))
       break;
@@ -454,7 +454,7 @@ void ActionScheduler::messageFetched( KMMessage *msg )
     serNumS.setNum( msg->getMsgSerNum() );
     KMMessage *newMsg = new KMMessage;
     newMsg->fromString(msg->asString());
-    newMsg->setStatus(msg->status());
+    newMsg->seStatus(msg->status());
     newMsg->setComplete(msg->isComplete());
     newMsg->setHeaderField( "X-KMail-Filtered", serNumS );
     mSrcFolder->addMsg( newMsg );
@@ -466,13 +466,13 @@ void ActionScheduler::messageFetched( KMMessage *msg )
   return;
 }
 
-void ActionScheduler::msgAdded( KMFolder*, Q_UINT32 serNum )
+void ActionScheduler::msgAdded( KMFolder*, TQ_UINT32 serNum )
 {
   if (!mIgnore)
     enqueue( serNum );
 }
 
-void ActionScheduler::enqueue(Q_UINT32 serNum)
+void ActionScheduler::enqueue(TQ_UINT32 serNum)
 {
   if (mResult != ResultOk)
     return; // An error has already occurred don't even try to process this msg
diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h
index e785210b6..3c9894502 100644
--- a/kmail/actionscheduler.h
+++ b/kmail/actionscheduler.h
@@ -84,10 +84,10 @@ public:
   void clearAccountId() { mAccountId = 0; mAccount = false; }
 
   /** Queue a message for filtering */
-  void execFilters(const TQValueList<Q_UINT32> serNums);
+  void execFilters(const TQValueList<TQ_UINT32> serNums);
   void execFilters(const TQPtrList<KMMsgBase> msgList);
   void execFilters(KMMsgBase* msgBase);
-  void execFilters(Q_UINT32 serNum);
+  void execFilters(TQ_UINT32 serNum);
 
   static TQString debug();
   static bool isEnabled();
@@ -101,7 +101,7 @@ public:
 signals:
   /** Emitted when filtering is completed */
   void result(ReturnCode);
-  void filtered(Q_UINT32);
+  void filtered(TQ_UINT32);
 
 public slots:
   /** Called back by asynchronous actions when they have completed */
@@ -111,8 +111,8 @@ public slots:
   void copyMessageFinished( KMCommand *command );
 
 private slots:
-  KMMsgBase* messageBase(Q_UINT32 serNum);
-  KMMessage* message(Q_UINT32 serNum);
+  KMMsgBase* messageBase(TQ_UINT32 serNum);
+  KMMessage* message(TQ_UINT32 serNum);
   void finish();
 
   void folderClosedOrExpunged();
@@ -123,8 +123,8 @@ private slots:
   //Fetching slots
   void fetchMessage();
   void messageFetched( KMMessage *msg );
-  void msgAdded( KMFolder*, Q_UINT32 );
-  void enqueue(Q_UINT32 serNum);
+  void msgAdded( KMFolder*, TQ_UINT32 );
+  void enqueue(TQ_UINT32 serNum);
 
   //Filtering slots
   void processMessage();
@@ -140,9 +140,9 @@ private:
   static KMFolderMgr *tempFolderMgr;
   static int refCount, count;
   static bool sEnabled, sEnabledChecked;
-  TQValueListIterator<Q_UINT32> mMessageIt;
+  TQValueListIterator<TQ_UINT32> mMessageIt;
   TQValueListIterator<KMFilter> mFilterIt;
-  TQValueList<Q_UINT32> mSerNums, mFetchSerNums;
+  TQValueList<TQ_UINT32> mSerNums, mFetchSerNums;
   TQValueList<TQGuardedPtr<KMFolder> > mOpenFolders;
   TQValueList<KMFilter> mFilters, mQueuedFilters;
   KMFilterAction* mFilterAction;
@@ -157,7 +157,7 @@ private:
   bool mAlwaysMatch;
   bool mAccount;
   uint mAccountId;
-  Q_UINT32 mOriginalSerNum;
+  TQ_UINT32 mOriginalSerNum;
   bool mDeleteSrcFolder;
   ReturnCode mResult;
   TQTimer *finishTimer, *fetchMessageTimer, *tempCloseFoldersTimer;
diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index 2c6ca984d..df3da1ad0 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -50,7 +50,7 @@ struct AnnotationAttribute {
 typedef TQValueVector<AnnotationAttribute> AnnotationList;
 
 /**
- * This namespace contains functions that return jobs for annotation operations.
+ * This namespace tqcontains functions that return jobs for annotation operations.
  *
  * The current implementation is tied to IMAP.
  * If someone wants to extend this to other protocols, turn the namespace into a class
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 17d7ed1ed..15b3e7f79 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -150,7 +150,7 @@ void AntiSpamWizard::accept()
 
   KMFilterActionDict dict;
   TQValueList<KMFilter*> filterList;
-  bool replaceExistingFilters = false;
+  bool tqreplaceExistingFilters = false;
 
   // Let's start with virus detection and handling,
   // so we can avoid spam checks for viral messages
@@ -227,10 +227,10 @@ void AntiSpamWizard::accept()
     }
   }
   else { // AntiSpam mode
-    // TODO Existing filters with same name are replaced. This is hardcoded
-    // ATM and needs to be replaced with a value from a (still missing)
-    // checkbox in the GUI. At least, the replacement is announced in the GUI.
-    replaceExistingFilters = true;
+    // TODO Existing filters with same name are tqreplaced. This is hardcoded
+    // ATM and needs to be tqreplaced with a value from a (still missing)
+    // checkbox in the GUI. At least, the tqreplacement is announced in the GUI.
+    tqreplaceExistingFilters = true;
     for ( TQValueListIterator<SpamToolConfig> it = mToolList.begin();
           it != mToolList.end(); ++it ) {
       if ( mInfoPage->isProgramSelected( (*it).getVisibleName() ) &&
@@ -245,7 +245,7 @@ void AntiSpamWizard::accept()
         pipeFilterAction->argsFromString( (*it).getDetectCmd() );
         pipeFilterActions->append( pipeFilterAction );
         KMSearchPattern* pipeFilterPattern = pipeFilter->pattern();
-        if ( replaceExistingFilters )
+        if ( tqreplaceExistingFilters )
           pipeFilterPattern->setName( (*it).getFilterName() );
         else
           pipeFilterPattern->setName( uniqueNameFor( (*it).getFilterName() ) );
@@ -279,7 +279,7 @@ void AntiSpamWizard::accept()
       spamFilterActions->append( spamFilterAction3 );
     }
     KMSearchPattern* spamFilterPattern = spamFilter->pattern();
-    if ( replaceExistingFilters )
+    if ( tqreplaceExistingFilters )
       spamFilterPattern->setName( i18n( "Spam handling" ) );
     else
       spamFilterPattern->setName( uniqueNameFor( i18n( "Spam handling" ) ) );
@@ -320,7 +320,7 @@ void AntiSpamWizard::accept()
       unsureFilterAction1->argsFromString( mSpamRulesPage->selectedUnsureFolderName() );
       unsureFilterActions->append( unsureFilterAction1 );
       KMSearchPattern* unsureFilterPattern = unsureFilter->pattern();
-      if ( replaceExistingFilters )
+      if ( tqreplaceExistingFilters )
         unsureFilterPattern->setName( i18n( "Semi spam (unsure) handling" ) );
       else
         unsureFilterPattern->setName( uniqueNameFor( i18n( "Semi spam (unsure) handling" ) ) );
@@ -382,7 +382,7 @@ void AntiSpamWizard::accept()
     }
 
     KMSearchPattern* classSpamFilterPattern = classSpamFilter->pattern();
-    if ( replaceExistingFilters )
+    if ( tqreplaceExistingFilters )
       classSpamFilterPattern->setName( i18n( "Classify as spam" ) );
     else
       classSpamFilterPattern->setName( uniqueNameFor( i18n( "Classify as spam" ) ) );
@@ -414,7 +414,7 @@ void AntiSpamWizard::accept()
       }
     }
     KMSearchPattern* classHamFilterPattern = classHamFilter->pattern();
-    if ( replaceExistingFilters )
+    if ( tqreplaceExistingFilters )
       classHamFilterPattern->setName( i18n( "Classify as NOT spam" ) );
     else
       classHamFilterPattern->setName( uniqueNameFor( i18n( "Classify as NOT spam" ) ) );
@@ -441,7 +441,7 @@ void AntiSpamWizard::accept()
    * initialized. This should happend only once. */
   if ( !filterList.isEmpty() )
     KMKernel::self()->filterMgr()->appendFilters(
-          filterList, replaceExistingFilters );
+          filterList, tqreplaceExistingFilters );
 
   TQDialog::accept();
 }
@@ -505,9 +505,9 @@ void AntiSpamWizard::checkToolAvailability()
       AccountManager* mgr = kmkernel->acctMgr();
       KMAccount* account = mgr->first();
       while ( account ) {
-        if ( account->type() == "pop" || account->type().contains( "imap" ) ) {
+        if ( account->type() == "pop" || account->type().tqcontains( "imap" ) ) {
           const NetworkAccount * n = dynamic_cast<const NetworkAccount*>( account );
-          if ( n && n->host().lower().contains( pattern.lower() ) ) {
+          if ( n && n->host().lower().tqcontains( pattern.lower() ) ) {
             mInfoPage->addAvailableTool( (*it).getVisibleName() );
             found = true;
           }
@@ -550,7 +550,7 @@ void AntiSpamWizard::slotBuildSummary()
 {
   TQString text;
   TQString newFilters;
-  TQString replaceFilters;
+  TQString tqreplaceFilters;
 
   if ( mMode == AntiVirus ) {
     text = ""; // TODO add summary for the virus part
@@ -571,10 +571,10 @@ void AntiSpamWizard::slotBuildSummary()
           it != mToolList.end(); ++it ) {
       if ( mInfoPage->isProgramSelected( (*it).getVisibleName() ) &&
          (*it).isSpamTool() && !(*it).isDetectionOnly() ) {
-        sortFilterOnExistance( (*it).getFilterName(), newFilters, replaceFilters );
+        sortFilterOnExistance( (*it).getFilterName(), newFilters, tqreplaceFilters );
       }
     }
-    sortFilterOnExistance( i18n( "Spam handling" ), newFilters, replaceFilters );
+    sortFilterOnExistance( i18n( "Spam handling" ), newFilters, tqreplaceFilters );
 
     // The need for a andling of status "probably spam" depends on the tools chosen
     if ( mSpamRulesPage->moveUnsureSelected() ) {
@@ -588,7 +588,7 @@ void AntiSpamWizard::slotBuildSummary()
       }
       if ( atLeastOneUnsurePattern ) {
         sortFilterOnExistance( i18n( "Semi spam (unsure) handling" ),
-                               newFilters, replaceFilters );
+                               newFilters, tqreplaceFilters );
         text += i18n( "<p>The folder for messages classified as unsure (probably spam) is <i>" )
               + mSpamRulesPage->selectedUnsureFolderName() + "</i>.</p>";
       }
@@ -596,17 +596,17 @@ void AntiSpamWizard::slotBuildSummary()
 
     // Manual classification via toolbar icon / manually applied filter action
     sortFilterOnExistance( i18n( "Classify as spam" ),
-                            newFilters, replaceFilters );
+                            newFilters, tqreplaceFilters );
     sortFilterOnExistance( i18n( "Classify as NOT spam" ),
-                            newFilters, replaceFilters );
+                            newFilters, tqreplaceFilters );
 
     // Show the filters in the summary
     if ( !newFilters.isEmpty() )
       text += i18n( "<p>The wizard will create the following filters:<ul>" )
             + newFilters + "</ul></p>";
-    if ( !replaceFilters.isEmpty() )
-      text += i18n( "<p>The wizard will replace the following filters:<ul>" )
-            + replaceFilters + "</ul></p>";
+    if ( !tqreplaceFilters.isEmpty() )
+      text += i18n( "<p>The wizard will tqreplace the following filters:<ul>" )
+            + tqreplaceFilters + "</ul></p>";
   }
 
   mSummaryPage->setSummaryText( text );
@@ -639,12 +639,12 @@ const TQString AntiSpamWizard::uniqueNameFor( const TQString & name )
 
 void AntiSpamWizard::sortFilterOnExistance(
         const TQString & intendedFilterName,
-        TQString & newFilters, TQString & replaceFilters )
+        TQString & newFilters, TQString & tqreplaceFilters )
 {
   if ( uniqueNameFor( intendedFilterName ) == intendedFilterName )
     newFilters += "<li>" + intendedFilterName + "</li>";
   else
-    replaceFilters += "<li>" + intendedFilterName + "</li>";
+    tqreplaceFilters += "<li>" + intendedFilterName + "</li>";
 }
 
 
@@ -855,7 +855,7 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
                               TQWidget * parent, const char * name )
   : ASWizPage( parent, name )
 {
-  TQBoxLayout * layout = new TQVBoxLayout( mLayout );
+  TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
 
   mIntroText = new TQLabel( this );
   mIntroText->setText(
@@ -879,26 +879,26 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
       "deleting the filter rules created by the wizard to get "
       "back to the former behavior."
       ) );
-  layout->addWidget( mIntroText );
+  tqlayout->addWidget( mIntroText );
 
   mScanProgressText = new TQLabel( this );
   mScanProgressText->setText( "" ) ;
-  layout->addWidget( mScanProgressText );
+  tqlayout->addWidget( mScanProgressText );
 
   mToolsList = new KListBox( this );
   mToolsList->hide();
   mToolsList->setSelectionMode( TQListBox::Multi );
   mToolsList->setRowMode( TQListBox::FixedNumber );
   mToolsList->setRowMode( 10 );
-  layout->addWidget( mToolsList );
+  tqlayout->addWidget( mToolsList );
   connect( mToolsList, TQT_SIGNAL(selectionChanged()),
            this, TQT_SLOT(processSelectionChange(void)) );
 
   mSelectionHint = new TQLabel( this );
   mSelectionHint->setText( "" );
-  layout->addWidget( mSelectionHint );
+  tqlayout->addWidget( mSelectionHint );
 
-  layout->addStretch();
+  tqlayout->addStretch();
 }
 
 
@@ -940,18 +940,18 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
                                         KMFolderTree * mainFolderTree )
   : ASWizPage( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( mLayout );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout );
 
   mMarkRules = new TQCheckBox( i18n("&Mark detected spam messages as read"), this );
   TQWhatsThis::add( mMarkRules,
       i18n( "Mark messages which have been classified as spam as read.") );
-  layout->addWidget( mMarkRules);
+  tqlayout->addWidget( mMarkRules);
 
   mMoveSpamRules = new TQCheckBox( i18n("Move &known spam to:"), this );
   TQWhatsThis::add( mMoveSpamRules,
       i18n( "The default folder for spam messages is the trash folder, "
             "but you may change that in the folder view below.") );
-  layout->addWidget( mMoveSpamRules );
+  tqlayout->addWidget( mMoveSpamRules );
 
   mFolderReqForSpamFolder = new FolderRequester( this, mainFolderTree );
   mFolderReqForSpamFolder->setFolder( "trash" );
@@ -959,7 +959,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
   mFolderReqForSpamFolder->setShowOutbox( false );
   mFolderReqForSpamFolder->setShowImapFolders( false );
 
-  TQHBoxLayout *hLayout1 = new TQHBoxLayout( layout );
+  TQHBoxLayout *hLayout1 = new TQHBoxLayout( tqlayout );
   hLayout1->addSpacing( KDialog::spacingHint() * 3 );
   hLayout1->addWidget( mFolderReqForSpamFolder );
 
@@ -969,7 +969,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
             "in the folder view below.<p>"
             "Not all tools support a classification as unsure. If you haven't "
             "selected a capable tool, you can't select a folder as well.") );
-  layout->addWidget( mMoveUnsureRules );
+  tqlayout->addWidget( mMoveUnsureRules );
 
   mFolderReqForUnsureFolder = new FolderRequester( this, mainFolderTree );
   mFolderReqForUnsureFolder->setFolder( "inbox" );
@@ -977,11 +977,11 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
   mFolderReqForUnsureFolder->setShowOutbox( false );
   mFolderReqForUnsureFolder->setShowImapFolders( false );
 
-  TQHBoxLayout *hLayout2 = new TQHBoxLayout( layout );
+  TQHBoxLayout *hLayout2 = new TQHBoxLayout( tqlayout );
   hLayout2->addSpacing( KDialog::spacingHint() * 3 );
   hLayout2->addWidget( mFolderReqForUnsureFolder );
 
-  layout->addStretch();
+  tqlayout->addStretch();
 
   connect( mMarkRules, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(processSelectionChange(void)) );
@@ -1138,11 +1138,11 @@ void ASWizVirusRulesPage::processSelectionChange()
 ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name )
   : ASWizPage( parent, name )
 {
-  TQBoxLayout * layout = new TQVBoxLayout( mLayout );
+  TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
 
   mSummaryText = new TQLabel( this );
-  layout->addWidget( mSummaryText );
-  layout->addStretch();
+  tqlayout->addWidget( mSummaryText );
+  tqlayout->addStretch();
 }
 
 
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index 738d8516a..e80234263 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -259,7 +259,7 @@ namespace KMail {
       /* convenience method to sort out new and existing filters */
       void sortFilterOnExistance( const TQString & intendedFilterName,
                                   TQString & newFilters, 
-                                  TQString & replaceFilters );
+                                  TQString & tqreplaceFilters );
 
       /* The pages in the wizard */
       ASWizInfoPage * mInfoPage;
diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp
index 5bf2cf93f..979065e4d 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::currentDate().toString( TQt::ISODate ) + ".tar.bz2";
+    "_" + TQDate::tqcurrentDate().toString( TQt::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, minimumSize().height() );
+  resize( 500, tqminimumSize().height() );
 }
 
 void ArchiveFolderDialog::slotUrlChanged( const TQString &text )
diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp
index 11c53f123..49fc3935d 100644
--- a/kmail/attachmentlistview.cpp
+++ b/kmail/attachmentlistview.cpp
@@ -93,7 +93,7 @@ void AttachmentListView::contentsDropEvent( TQDropEvent* e )
     TQBuffer serNumBuffer( serNums );
     serNumBuffer.open( IO_ReadOnly );
     TQDataStream serNumStream( &serNumBuffer );
-    Q_UINT32 serNum;
+    TQ_UINT32 serNum;
     KMFolder *folder = 0;
     int idx;
     TQPtrList<KMMsgBase> messageList;
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index fd53997b3..a20e4118e 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -165,7 +165,7 @@ void BackupJob::finish()
     }
   }
 
-  mProgressItem->setStatus( 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->setStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) );
+  mProgressItem->seStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) );
   if ( mCurrentFolder->open( "BackupJob" ) != 0 ) {
     abort( i18n( "Unable to open folder '%1'.").arg( mCurrentFolder->name() ) );
     return;
diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp
index 6b61b9bce..a69c01bf3 100644
--- a/kmail/bodypartformatter.cpp
+++ b/kmail/bodypartformatter.cpp
@@ -302,7 +302,7 @@ static const KMail::BodyPartFormatter * createForApplication( const char * subty
   return AnyTypeBodyPartFormatter::create();
 }
 
-// OK, replace this with a factory with plugin support later on...
+// OK, tqreplace this with a factory with plugin support later on...
 const KMail::BodyPartFormatter * KMail::BodyPartFormatter::createFor( const char * type, const char * subtype ) {
   if ( type && *type )
     switch ( type[0] ) {
diff --git a/kmail/bodyvisitor.cpp b/kmail/bodyvisitor.cpp
index 04b7a98b8..5c9205849 100644
--- a/kmail/bodyvisitor.cpp
+++ b/kmail/bodyvisitor.cpp
@@ -78,11 +78,11 @@ namespace KMail {
       ++it;
       // skip this part if the parent part is already loading
       if ( part->parent() &&
-           selected.contains( part->parent() ) &&
+           selected.tqcontains( part->parent() ) &&
            part->loadPart() )
         continue;
 
-      if ( part->originalContentTypeStr().contains("SIGNED") )
+      if ( part->originalContentTypeStr().tqcontains("SIGNED") )
       {
         // signed messages have to be loaded completely
         // so construct a new dummy part that loads the body
@@ -115,7 +115,7 @@ namespace KMail {
 
       // check whether to load this part or not:
       // look at the basic list, ask the subclass and check the parent
-      if ( mBasicList.contains( part->originalContentTypeStr() ) ||
+      if ( mBasicList.tqcontains( part->originalContentTypeStr() ) ||
            parentNeedsLoading( part ) ||
            addPartToList( part ) )
       {
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index 2393b2576..f80f56744 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -234,7 +234,7 @@ void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
 
   KURL url = mAccount->getUrl();
   url.setPath( mFolder->imapPath() +
-               TQString::fromLatin1(";UID=%1").arg(uids) );
+               TQString::tqfromLatin1(";UID=%1").arg(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::fromLatin1(";UID=*") );
+  url.setPath( mFolder->imapPath() + TQString::tqfromLatin1(";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->setStatus( index, KMMsgStatusRead, false );
+        mFolder->seStatus( index, KMMsgStatusRead, false );
       }
 
       emit messageRetrieved( mMsg );
@@ -404,7 +404,7 @@ void CachedImapJob::slotPutNextMessage()
   int a = cstr.find("\nX-UID: ");
   int b = cstr.find('\n', a);
   if (a != -1 && b != -1 && cstr.find("\n\n") > a) cstr.remove(a, b-a);
-  TQCString mData(cstr.length() + cstr.contains('\n'));
+  TQCString mData(cstr.length() + cstr.tqcontains('\n'));
   unsigned int i = 0;
   for( char *ch = cstr.data(); *ch; ch++ ) {
     if ( *ch == '\n' ) {
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index be787ff8e..6f5636992 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -94,13 +94,13 @@ bool Callback::mailICal( const TQString& to, const TQString &iCal,
   msg->setSubject( subject );
   if ( GlobalSettings::self()->exchangeCompatibleInvitations() ) {
     if ( status == TQString("cancel") )
-      msg->setSubject( i18n( "Declined: %1" ).arg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Declined: %1" ).arg(subject).tqreplace("Answer: ","") );
     else if ( status == TQString("tentative") )
-      msg->setSubject( i18n( "Tentative: %1" ).arg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Tentative: %1" ).arg(subject).tqreplace("Answer: ","") );
     else if ( status == TQString("accepted") )
-      msg->setSubject( i18n( "Accepted: %1" ).arg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Accepted: %1" ).arg(subject).tqreplace("Answer: ","") );
     else if ( status == TQString("delegated") )
-      msg->setSubject( i18n( "Delegated: %1" ).arg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Delegated: %1" ).arg(subject).tqreplace("Answer: ","") );
   }
   msg->setTo( to );
   msg->setFrom( receiver() );
diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp
index 6c82c379a..ac4d3278a 100644
--- a/kmail/chiasmuskeyselector.cpp
+++ b/kmail/chiasmuskeyselector.cpp
@@ -14,26 +14,26 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt
 {
   TQWidget *page = makeMainWidget();
 
-  TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint());
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint());
 
   mLabel = new TQLabel( i18n( "Please select the Chiasmus key file to use:" ), page );
-  layout->addWidget( mLabel );
+  tqlayout->addWidget( mLabel );
 
   mListBox = new KListBox( page );
   mListBox->insertStringList( keys );
   const int current = keys.findIndex( currentKey );
   mListBox->setSelected( QMAX( 0, current ), true );
   mListBox->ensureCurrentVisible();
-  layout->addWidget( mListBox, 1 );
+  tqlayout->addWidget( mListBox, 1 );
 
   TQLabel* optionLabel = new TQLabel( i18n( "Additional arguments for chiasmus:" ), page );
-  layout->addWidget( optionLabel );
+  tqlayout->addWidget( optionLabel );
 
   mOptions = new KLineEdit( lastOptions, page );
   optionLabel->setBuddy( mOptions );
-  layout->addWidget( mOptions );
+  tqlayout->addWidget( mOptions );
 
-  layout->addStretch();
+  tqlayout->addStretch();
 
   connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) );
   connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) );
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp
index 243a17537..183b72163 100644
--- a/kmail/compactionjob.cpp
+++ b/kmail/compactionjob.cpp
@@ -28,7 +28,7 @@
 #include "compactionjob.h"
 #include "kmfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmfoldermbox.h"
 #include "kmfoldermaildir.h"
 
@@ -97,7 +97,7 @@ int MboxCompactionJob::executeNow( bool silent )
     kdDebug(5006) << storage->location() << " compaction skipped." << endl;
     if ( !mSilent ) {
       TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).arg( mbox->label() );
-      BroadcastStatus::instance()->setStatusMsg( str );
+      BroadcasStatus::instance()->seStatusMsg( str );
     }
     return 0;
   }
@@ -185,7 +185,7 @@ void MboxCompactionJob::done( int rc )
   mErrorCode = rc;
 
   if ( !mSilent )
-    BroadcastStatus::instance()->setStatusMsg( str );
+    BroadcasStatus::instance()->seStatusMsg( str );
 
   mFolderOpen = false;
   deleteLater(); // later, because of the "return mErrorCode"
@@ -266,7 +266,7 @@ void MaildirCompactionJob::done( int rc )
   if ( storage->isOpened() )
     storage->updateIndex();
   if ( !mSilent )
-    BroadcastStatus::instance()->setStatusMsg( str );
+    BroadcasStatus::instance()->seStatusMsg( str );
 
   mFolderOpen = false;
   deleteLater(); // later, because of the "return mErrorCode"
diff --git a/kmail/composercryptoconfiguration.ui b/kmail/composercryptoconfiguration.ui
index c59c7af02..696334e19 100644
--- a/kmail/composercryptoconfiguration.ui
+++ b/kmail/composercryptoconfiguration.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ComposerCryptoConfiguration</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -154,5 +154,5 @@ However, there may be local rules that require you to turn this option on. When
     <tabstop>mAutoEncrypt</tabstop>
     <tabstop>mNeverEncryptWhenSavingInDrafts</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 4378c325d..c5824eadc 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -167,7 +167,7 @@ namespace {
 
   void populateButtonGroup( TQButtonGroup * g, const EnumConfigEntry & e ) {
     g->setTitle( i18n( e.desc ) );
-    g->layout()->setSpacing( KDialog::spacingHint() );
+    g->tqlayout()->setSpacing( KDialog::spacingHint() );
     for ( int i = 0 ; i < e.numItems ; ++i )
       g->insert( new TQRadioButton( i18n( e.items[i].desc ), g ), i );
   }
@@ -233,9 +233,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
   // the KCMultiDialog starts with the size of the first kcm, not
   // the largest one. This way at least after the first showing of
   // the largest kcm the size is kept.
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  int width = geometry.readNumEntry( "ConfigureDialogWidth" );
-  int height = geometry.readNumEntry( "ConfigureDialogHeight" );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" );
+  int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" );
   if ( width != 0 && height != 0 ) {
      setMinimumSize( width, height );
   }
@@ -243,9 +243,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
 }
 
 void ConfigureDialog::hideEvent( TQHideEvent *ev ) {
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  geometry.writeEntry( "ConfigureDialogWidth", width() );
-  geometry.writeEntry( "ConfigureDialogHeight",height() );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  tqgeometry.writeEntry( "ConfigureDialogWidth", width() );
+  tqgeometry.writeEntry( "ConfigureDialogHeight",height() );
   KDialogBase::hideEvent( ev );
 }
 
@@ -281,7 +281,7 @@ void ConfigureDialog::slotUser2() {
 // *                                                           *
 // *************************************************************
 TQString IdentityPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-identity");
+  return TQString::tqfromLatin1("configure-identity");
 }
 
 IdentityPage::IdentityPage( TQWidget * parent, const char * name )
@@ -480,7 +480,7 @@ void IdentityPage::slotRenameIdentity( TQListViewItem * i,
 
   TQString newName = s.stripWhiteSpace();
   if ( !newName.isEmpty() &&
-       !kmkernel->identityManager()->shadowIdentities().contains( newName ) ) {
+       !kmkernel->identityManager()->shadowIdentities().tqcontains( newName ) ) {
     KPIM::Identity & ident = item->identity();
     ident.setIdentityName( newName );
     emit changed(true);
@@ -552,7 +552,7 @@ void IdentityPage::slotUpdateTransportCombo( const TQStringList & sl )
 // *                                                           *
 // *************************************************************
 TQString AccountsPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-accounts");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-accounts-sending");
+  return TQString::tqfromLatin1("configure-accounts-sending");
 }
 
 AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name )
@@ -597,9 +597,9 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
   // label: zero stretch ### FIXME more
   vlay->addWidget( new TQLabel( i18n("Outgoing accounts (add at least one):"), this ) );
 
-  // hbox layout: stretch 10, spacing inherited from vlay
+  // hbox tqlayout: stretch 10, spacing inherited from vlay
   hlay = new TQHBoxLayout();
-  vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's sizeHint
+  vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's tqsizeHint
 
   // transport list: left widget in hlay; stretch 1
   // ### FIXME: allow inline renaming of the account:
@@ -614,7 +614,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
            this, TQT_SLOT(slotModifySelectedTransport()) );
   hlay->addWidget( mTransportList, 1 );
 
-  // a vbox layout for the buttons: zero stretch, spacing inherited from hlay
+  // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay
   btn_vlay = new TQVBoxLayout( hlay );
 
   // "add..." button: stretch 0
@@ -653,8 +653,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
                          i18n("Common Options"), this );
   vlay->addWidget(group);
 
-  // a grid layout for the contents of the "common options" group box
-  glay = new TQGridLayout( group->layout(), 5, 3, KDialog::spacingHint() );
+  // a grid tqlayout for the contents of the "common options" group box
+  glay = new TQGridLayout( group->tqlayout(), 5, 3, KDialog::spacingHint() );
   glay->setColStretch( 2, 10 );
 
   // "confirm before send" check box:
@@ -787,10 +787,10 @@ void AccountsPage::SendingTab::slotAddTransport()
   KMTransportInfo *transportInfo = new KMTransportInfo();
   switch ( transportType ) {
   case 0: // smtp
-    transportInfo->type = TQString::fromLatin1("smtp");
+    transportInfo->type = TQString::tqfromLatin1("smtp");
     break;
   case 1: // sendmail
-    transportInfo->type = TQString::fromLatin1("sendmail");
+    transportInfo->type = TQString::tqfromLatin1("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::fromLatin1( *buffer ? buffer : "localhost" );
+    str = TQString::tqfromLatin1( *buffer ? buffer : "localhost" );
   }
   mDefaultDomainEdit->setText( str );
 }
@@ -1053,7 +1053,7 @@ void AccountsPage::SendingTab::save() {
 }
 
 TQString AccountsPage::ReceivingTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-accounts-receiving");
+  return TQString::tqfromLatin1("configure-accounts-receiving");
 }
 
 AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name )
@@ -1071,7 +1071,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
   // label: zero stretch
   vlay->addWidget( new TQLabel( i18n("Incoming accounts (add at least one):"), this ) );
 
-  // hbox layout: stretch 10, spacing inherited from vlay
+  // hbox tqlayout: stretch 10, spacing inherited from vlay
   hlay = new TQHBoxLayout();
   vlay->addLayout( hlay, 10 ); // high stretch to suppress groupbox's growing
 
@@ -1088,7 +1088,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
            this, TQT_SLOT(slotModifySelectedAccount()) );
   hlay->addWidget( mAccountList, 1 );
 
-  // a vbox layout for the buttons: zero stretch, spacing inherited from hlay
+  // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay
   btn_vlay = new TQVBoxLayout( hlay );
 
   // "add..." button: stretch 0
@@ -1123,11 +1123,11 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
   // "New Mail Notification" group box: stretch 0
   group = new TQVGroupBox( i18n("New Mail Notification"), this );
   vlay->addWidget( group );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   // "beep on new mail" check box:
   mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group );
-  mBeepNewMailCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  mBeepNewMailCheck->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  mVerboseNotificationCheck->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
+  mOtherNewMailActionsButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
                                                           TQSizePolicy::Fixed ) );
   connect( mOtherNewMailActionsButton, TQT_SIGNAL(clicked()),
            this, TQT_SLOT(slotEditNotifications()) );
@@ -1223,13 +1223,13 @@ void AccountsPage::ReceivingTab::slotAddAccount() {
 
     default:
       // ### FIXME: How should this happen???
-      // replace with assert.
+      // tqreplace with assert.
       KMessageBox::sorry( this, i18n("Unknown account type selected") );
       return;
   }
 
   KMAccount *account
-    = kmkernel->acctMgr()->create( TQString::fromLatin1( accountType ) );
+    = kmkernel->acctMgr()->create( TQString::tqfromLatin1( 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::fromLatin1("configure-appearance");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-appearance-fonts");
+  return TQString::tqfromLatin1("configure-appearance-fonts");
 }
 
 static const struct {
@@ -1694,7 +1694,7 @@ void AppearancePage::FontsTab::save() {
 }
 
 TQString AppearancePage::ColorsTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-colors");
+  return TQString::tqfromLatin1("configure-appearance-colors");
 }
 
 
@@ -1857,7 +1857,7 @@ void AppearancePage::ColorsTab::save() {
 }
 
 TQString AppearancePage::LayoutTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-layout");
+  return TQString::tqfromLatin1("configure-appearance-tqlayout");
 }
 
 static const EnumConfigEntryItem folderListModes[] = {
@@ -1941,33 +1941,33 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char
 
 void AppearancePage::LayoutTab::doLoadOther() {
   const KConfigGroup reader( KMKernel::config(), "Reader" );
-  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
 
-  loadWidget( mFolderListGroup, geometry, folderListMode );
+  loadWidget( mFolderListGroup, tqgeometry, folderListMode );
   loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation );
   loadWidget( mMIMETreeModeGroup, reader, mimeTreeMode );
-  loadWidget( mReaderWindowModeGroup, geometry, readerWindowMode );
+  loadWidget( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
   mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() );
 }
 
 void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
   const KConfigGroup reader( profile, "Reader" );
-  const KConfigGroup geometry( profile, "Geometry" );
+  const KConfigGroup tqgeometry( profile, "Geometry" );
 
-  loadProfile( mFolderListGroup, geometry, folderListMode );
+  loadProfile( mFolderListGroup, tqgeometry, folderListMode );
   loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation );
   loadProfile( mMIMETreeModeGroup, reader, mimeTreeMode );
-  loadProfile( mReaderWindowModeGroup, geometry, readerWindowMode );
+  loadProfile( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
 }
 
 void AppearancePage::LayoutTab::save() {
   KConfigGroup reader( KMKernel::config(), "Reader" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
 
-  saveButtonGroup( mFolderListGroup, geometry, folderListMode );
+  saveButtonGroup( mFolderListGroup, tqgeometry, folderListMode );
   saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation );
   saveButtonGroup( mMIMETreeModeGroup, reader, mimeTreeMode );
-  saveButtonGroup( mReaderWindowModeGroup, geometry, readerWindowMode );
+  saveButtonGroup( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
   GlobalSettings::self()->setEnableFavoriteFolderView( mFavoriteFolderViewCB->isChecked() );
 }
 
@@ -1976,7 +1976,7 @@ void AppearancePage::LayoutTab::save() {
 //
 
 TQString AppearancePage::HeadersTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-headers");
+  return TQString::tqfromLatin1("configure-appearance-headers");
 }
 
 static const struct {
@@ -2004,7 +2004,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 
   // "General Options" group:
   group = new TQVButtonGroup( i18n( "General Options" ), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mMessageSizeCheck = new TQCheckBox( i18n("Display messa&ge sizes"), group );
 
@@ -2030,7 +2030,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
   // "Message Header Threading Options" group:
   mNestingPolicy =
     new TQVButtonGroup( i18n("Threaded Message List Options"), this );
-  mNestingPolicy->layout()->setSpacing( KDialog::spacingHint() );
+  mNestingPolicy->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mNestingPolicy->insert(
     new TQRadioButton( i18n("Always &keep threads open"),
@@ -2053,11 +2053,11 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 
   // "Date Display" group:
   mDateDisplay = new TQVButtonGroup( i18n("Date Display"), this );
-  mDateDisplay->layout()->setSpacing( KDialog::spacingHint() );
+  mDateDisplay->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) {
     TQString buttonLabel = i18n(dateDisplayConfig[i].displayName);
-    if ( buttonLabel.contains("%1") )
+    if ( buttonLabel.tqcontains("%1") )
       buttonLabel = buttonLabel.arg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) );
     radio = new TQRadioButton( buttonLabel, mDateDisplay );
     mDateDisplay->insert( radio, i );
@@ -2094,8 +2094,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
              "<li>ss - the seconds with a leading zero (00-59)</li>"
              "<li>z - the milliseconds without leading zeroes (0-999)</li>"
              "<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-             "<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or \"PM\".</li>"
-             "<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li>"
+             "<li>AP - switch to AM/PM display. AP will be tqreplaced by either \"AM\" or \"PM\".</li>"
+             "<li>ap - switch to AM/PM display. ap will be tqreplaced by either \"am\" or \"pm\".</li>"
              "<li>Z - time zone in numeric form (-0500)</li>"
              "</ul>"
              "<p><strong>All other input characters will be ignored."
@@ -2115,16 +2115,16 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 
 void AppearancePage::HeadersTab::doLoadOther() {
   KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
 
   // "General Options":
-  mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) );
+  mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages", false ) );
   mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize", false ) );
   mCryptoIconsCheck->setChecked( general.readBoolEntry( "showCryptoIcons", false ) );
   mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon", true ) );
 
   // "Message Header Threading Options":
-  int num = geometry.readNumEntry( "nestingPolicy", 3 );
+  int num = tqgeometry.readNumEntry( "nestingPolicy", 3 );
   if ( num < 0 || num > 3 ) num = 3;
   mNestingPolicy->setButton( num );
 
@@ -2152,10 +2152,10 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma
 
 void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
   KConfigGroup general( profile, "General" );
-  KConfigGroup geometry( profile, "Geometry" );
+  KConfigGroup tqgeometry( profile, "Geometry" );
 
-  if ( geometry.hasKey( "nestedMessages" ) )
-    mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) );
+  if ( tqgeometry.hasKey( "nestedMessages" ) )
+    mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages" ) );
   if ( general.hasKey( "showMessageSize" ) )
     mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize" ) );
 
@@ -2164,8 +2164,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
   if ( general.hasKey( "showAttachmentIcon" ) )
     mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon" ) );
 
-  if ( geometry.hasKey( "nestingPolicy" ) ) {
-    int num = geometry.readNumEntry( "nestingPolicy" );
+  if ( tqgeometry.hasKey( "nestingPolicy" ) ) {
+    int num = tqgeometry.readNumEntry( "nestingPolicy" );
     if ( num < 0 || num > 3 ) num = 3;
     mNestingPolicy->setButton( num );
   }
@@ -2177,16 +2177,16 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
 
 void AppearancePage::HeadersTab::save() {
   KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
 
-  if ( geometry.readBoolEntry( "nestedMessages", false )
+  if ( tqgeometry.readBoolEntry( "nestedMessages", false )
        != mNestedMessagesCheck->isChecked() ) {
     int result = KMessageBox::warningContinueCancel( this,
                    i18n("Changing the global threading setting will override "
                         "all folder specific values."),
                    TQString::null, KStdGuiItem::cont(), "threadOverride" );
     if ( result == KMessageBox::Continue ) {
-      geometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() );
+      tqgeometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() );
       // remove all threadMessagesOverride keys from all [Folder-*] groups:
       TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") );
       kdDebug(5006) << "groups.count() == " << groups.count() << endl;
@@ -2197,7 +2197,7 @@ void AppearancePage::HeadersTab::save() {
     }
   }
 
-  geometry.writeEntry( "nestingPolicy",
+  tqgeometry.writeEntry( "nestingPolicy",
                        mNestingPolicy->id( mNestingPolicy->selected() ) );
   general.writeEntry( "showMessageSize", mMessageSizeCheck->isChecked() );
   general.writeEntry( "showCryptoIcons", mCryptoIconsCheck->isChecked() );
@@ -2246,7 +2246,7 @@ static const BoolConfigEntry showCurrentTime = {
 };
 
 TQString AppearancePage::ReaderTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-reader");
+  return TQString::tqfromLatin1("configure-appearance-reader");
 }
 
 AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
@@ -2276,7 +2276,7 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
   connect( mShowSpamStatusCheck, TQT_SIGNAL ( stateChanged( int ) ),
            this, TQT_SLOT( slotEmitChanged() ) );
 
-  // "replace smileys by emoticons" check box;
+  // "tqreplace smileys by emoticons" check box;
   populateCheckBox( mShowEmoticonsCheck = new TQCheckBox( this ), showEmoticons );
   vlay->addWidget( mShowEmoticonsCheck );
   connect( mShowEmoticonsCheck, TQT_SIGNAL ( stateChanged( int ) ),
@@ -2367,7 +2367,7 @@ void AppearancePage::ReaderTab::readCurrentFallbackCodec()
   TQStringList::ConstIterator it( encodings.begin() );
   TQStringList::ConstIterator end( encodings.end() );
   TQString currentEncoding = GlobalSettings::self()->fallbackCharacterEncoding();
-  currentEncoding = currentEncoding.replace( "iso ", "iso-", false );
+  currentEncoding = currentEncoding.tqreplace( "iso ", "iso-", false );
   ///kdDebug(5006) << "Looking for encoding: " << currentEncoding << endl;
   int i = 0;
   int indexOfLatin9 = 0;
@@ -2472,7 +2472,7 @@ void AppearancePage::ReaderTab::installProfile( KConfig * /* profile */ ) {
 
 
 TQString AppearancePage::SystemTrayTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-systemtray");
+  return TQString::tqfromLatin1("configure-appearance-systemtray");
 }
 
 AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent,
@@ -2490,7 +2490,7 @@ AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent,
 
   // System tray modes
   mSystemTrayGroup = new TQVButtonGroup( i18n("System Tray Mode"), this );
-  mSystemTrayGroup->layout()->setSpacing( KDialog::spacingHint() );
+  mSystemTrayGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
   vlay->addWidget( mSystemTrayGroup );
   connect( mSystemTrayGroup, TQT_SIGNAL( clicked( int ) ),
            this, TQT_SLOT( slotEmitChanged( void ) ) );
@@ -2537,7 +2537,7 @@ void AppearancePage::SystemTrayTab::save() {
 // *************************************************************
 
 TQString ComposerPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-composer-general");
+  return TQString::tqfromLatin1("configure-composer-general");
 }
 
 ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name )
@@ -2766,7 +2766,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
 
   // The "external editor" group:
   group = new TQVGroupBox( i18n("External Editor"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mExternalEditorCheck = new TQCheckBox(
            GlobalSettings::self()->useExternalEditorItem()->label(),
@@ -2796,7 +2796,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
   connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)),
            mEditorRequester, TQT_SLOT(setEnabled(bool)) );
 
-  label = new TQLabel( i18n("<b>%f</b> will be replaced with the "
+  label = new TQLabel( i18n("<b>%f</b> will be tqreplaced with the "
                            "filename to edit."), group );
   label->setEnabled( false ); // see above
   connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)),
@@ -2910,7 +2910,7 @@ void ComposerPage::GeneralTab::slotConfigureCompletionOrder( )
 }
 
 TQString ComposerPage::PhrasesTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-phrases");
+  return TQString::tqfromLatin1("configure-composer-phrases");
 }
 
 ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name )
@@ -3020,7 +3020,7 @@ void ComposerPage::PhrasesTab::saveActiveLanguageItem() {
 
 void ComposerPage::PhrasesTab::slotNewLanguage()
 {
-  NewLanguageDialog dialog( mLanguageList, parentWidget(), "New", true );
+  NewLanguageDialog dialog( mLanguageList, tqparentWidget(), "New", true );
   if ( dialog.exec() == TQDialog::Accepted ) slotAddNewLanguage( dialog.language() );
 }
 
@@ -3122,7 +3122,7 @@ void ComposerPage::PhrasesTab::save() {
 }
 
 TQString ComposerPage::TemplatesTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-templates");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-composer-custom-templates");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-composer-subject");
+  return TQString::tqfromLatin1("configure-composer-subject");
 }
 
 ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name )
@@ -3185,12 +3185,12 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
   vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
 
   group = new TQVGroupBox( i18n("Repl&y Subject Prefixes"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   // row 0: help text:
   label = new TQLabel( i18n("Recognize any sequence of the following prefixes\n"
                            "(entries are case-insensitive regular expressions):"), group );
-  label->setAlignment( AlignLeft|WordBreak );
+  label->tqsetAlignment( AlignLeft|WordBreak );
 
   // row 1, string list editor:
   SimpleStringListEditor::ButtonCode buttonCode =
@@ -3203,7 +3203,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
   connect( mReplyListEditor, TQT_SIGNAL( changed( void ) ),
            this, TQT_SLOT( slotEmitChanged( void ) ) );
 
-  // row 2: "replace [...]" check box:
+  // row 2: "tqreplace [...]" check box:
   mReplaceReplyPrefixCheck = new TQCheckBox(
      GlobalSettings::self()->replaceReplyPrefixItem()->label(),
      group, "kcfg_ReplaceReplyPrefix" );
@@ -3214,12 +3214,12 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
 
 
   group = new TQVGroupBox( i18n("For&ward Subject Prefixes"), this );
-  group->layout()->setSpacing( KDialog::marginHint() );
+  group->tqlayout()->setSpacing( KDialog::marginHint() );
 
   // row 0: help text:
   label= new TQLabel( i18n("Recognize any sequence of the following prefixes\n"
                           "(entries are case-insensitive regular expressions):"), group );
-  label->setAlignment( AlignLeft|WordBreak );
+  label->tqsetAlignment( AlignLeft|WordBreak );
 
   // row 1: string list editor
   mForwardListEditor =
@@ -3231,7 +3231,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
   connect( mForwardListEditor, TQT_SIGNAL( changed( void ) ),
            this, TQT_SLOT( slotEmitChanged( void ) ) );
 
-  // row 3: "replace [...]" check box:
+  // row 3: "tqreplace [...]" check box:
   mReplaceForwardPrefixCheck = new TQCheckBox(
        GlobalSettings::self()->replaceForwardPrefixItem()->label(),
        group, "kcfg_ReplaceForwardPrefix" );
@@ -3254,7 +3254,7 @@ void ComposerPage::SubjectTab::save() {
 }
 
 TQString ComposerPage::CharsetTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-charset");
+  return TQString::tqfromLatin1("configure-composer-charset");
 }
 
 ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name )
@@ -3268,8 +3268,8 @@ 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->setAlignment( WordBreak);
+                           "tqcontains all required characters."), this );
+  label->tqsetAlignment( 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::fromLatin1("us-ascii") ) {
-    charset = TQString::fromLatin1("us-ascii");
+  if ( charset.lower() == TQString::tqfromLatin1("us-ascii") ) {
+    charset = TQString::tqfromLatin1("us-ascii");
     return;
   }
 
-  if ( charset.lower() == TQString::fromLatin1("locale") ) {
-    charset =  TQString::fromLatin1("%1 (locale)")
+  if ( charset.lower() == TQString::tqfromLatin1("locale") ) {
+    charset =  TQString::tqfromLatin1("%1 (locale)")
       .arg( TQCString( 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::fromLatin1( codec->mimeName() ).lower();
+    charset = TQString::tqfromLatin1( 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::fromLatin1("locale") ) {
+    if ( (*it) == TQString::tqfromLatin1("locale") ) {
       TQCString cset = kmkernel->networkCodec()->mimeName();
       KPIM::kAsciiToLower( cset.data() );
       (*it) = TQString("%1 (locale)").arg( cset );
@@ -3349,7 +3349,7 @@ void ComposerPage::CharsetTab::save() {
 }
 
 TQString ComposerPage::HeadersTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-headers");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-composer-attachments");
+  return TQString::tqfromLatin1("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->setAlignment( AlignLeft|WordBreak );
+  label->tqsetAlignment( 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::fromLatin1("attachment")
-                    << TQString::fromLatin1("attached");
-    if ( TQString::fromLatin1("attachment") != i18n("attachment") )
+    attachWordsList << TQString::tqfromLatin1("attachment")
+                    << TQString::tqfromLatin1("attached");
+    if ( TQString::tqfromLatin1("attachment") != i18n("attachment") )
       attachWordsList << i18n("attachment");
-    if ( TQString::fromLatin1("attached") != i18n("attached") )
+    if ( TQString::tqfromLatin1("attached") != i18n("attached") )
       attachWordsList << i18n("attached");
   }
 
@@ -3669,7 +3669,7 @@ void ComposerPageAttachmentsTab::slotOutlookCompatibleClicked()
 // *                                                           *
 // *************************************************************
 TQString SecurityPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-security");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-security-reading");
+  return TQString::tqfromLatin1("configure-security-reading");
 }
 
 SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name )
@@ -3798,7 +3798,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 
   // "HTML Messages" group box:
   group = new TQVGroupBox( i18n( "HTML Messages" ), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mHtmlMailCheck = new TQCheckBox( i18n("Prefer H&TML to plain text"), group );
   TQWhatsThis::add( mHtmlMailCheck, htmlWhatsThis );
@@ -3822,14 +3822,14 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 
   // encrypted messages group
   group = new TQVGroupBox( i18n("Encrypted Messages"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
   mAlwaysDecrypt = new TQCheckBox( i18n( "Attempt decryption of encrypted messages when viewing" ), group );
   connect( mAlwaysDecrypt, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotEmitChanged()) );
   vlay->addWidget( group );
 
   // "Message Disposition Notification" groupbox:
   group = new TQVGroupBox( i18n("Message Disposition Notifications"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
 
   // "ignore", "ask", "deny", "always send" radiobutton line:
@@ -3897,7 +3897,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 
   // "Attached keys" group box:
   group = new TQVGroupBox( i18n( "Certificate && Key Bundle Attachments" ), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mAutomaticallyImportAttachedKeysCheck = new TQCheckBox( i18n("Automatically import keys and certificates"), group );
   connect( mAutomaticallyImportAttachedKeysCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) );
@@ -3993,7 +3993,7 @@ void SecurityPage::GeneralTab::save() {
 
 
 TQString SecurityPage::ComposerCryptoTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-security-composing");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-security-warnings");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-security-smime-validation");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-security-crypto-backends");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-misc");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-misc-folders");
+  return TQString::tqfromLatin1("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::fromLatin1("configure-misc-groupware");
+  return TQString::tqfromLatin1("configure-misc-groupware");
 }
 
 MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index 5cc86ccc2..e17e800e8 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::fromLatin1("configure-identity-newidentitydialog") );
+  setHelp( TQString::tqfromLatin1("configure-identity-newidentitydialog") );
   TQWidget * page = makeMainWidget();
   TQVBoxLayout * vlay = new TQVBoxLayout( page, 0, spacingHint() );
 
@@ -169,33 +169,33 @@ void ListView::setVisibleItem( int visibleItem, bool updateSize )
   mVisibleItem = QMAX( 1, visibleItem );
   if( updateSize == true )
   {
-    TQSize s = sizeHint();
-    setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() +
+    TQSize s = tqsizeHint();
+    setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() +
 		    lineWidth() * 2, s.height() );
   }
 }
 
 
-TQSize ListView::sizeHint() const
+TQSize ListView::tqsizeHint() const
 {
-  TQSize s = TQListView::sizeHint();
+  TQSize s = TQListView::tqsizeHint();
 
   int h = fontMetrics().height() + 2*itemMargin();
   if( h % 2 > 0 ) { h++; }
 
-  s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height());
+  s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height());
   return s;
 }
 
 
-static TQString flagPng = TQString::fromLatin1("/flag.png");
+static TQString flagPng = TQString::tqfromLatin1("/flag.png");
 
 NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
 				      TQWidget *parent, const char *name,
 				      bool modal )
   : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true )
 {
-  // layout the page (a combobox with label):
+  // tqlayout the page (a combobox with label):
   TQWidget *page = makeMainWidget();
   TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() );
   mComboBox = new TQComboBox( false, page );
@@ -203,7 +203,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
   hlay->addWidget( mComboBox, 1 );
 
   TQStringList pathList = KGlobal::dirs()->findAllResources( "locale",
-                               TQString::fromLatin1("*/entry.desktop") );
+                               TQString::tqfromLatin1("*/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::fromLatin1("%1 (%2)")
+      TQString displayname = TQString::tqfromLatin1("%1 (%2)")
 	.arg( name ).arg( 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::fromLatin1("/entry.desktop");
+  static TQString entryDesktop = TQString::tqfromLatin1("/entry.desktop");
   KSimpleConfig entry( locate("locale", language + entryDesktop) );
   entry.setGroup( "KCM Locale" );
   TQString name = entry.readEntry( "Name" );
-  TQString output = TQString::fromLatin1("%1 (%2)").arg( name ).arg( language );
+  TQString output = TQString::tqfromLatin1("%1 (%2)").arg( name ).arg( language );
   insertItem( TQPixmap( locate("locale", language + flagPng ) ), output );
   return listBox()->index( listBox()->findItem(output) );
 }
@@ -269,7 +269,7 @@ TQString LanguageComboBox::language() const
 
 void LanguageComboBox::setLanguage( const TQString & language )
 {
-  TQString parenthizedLanguage = TQString::fromLatin1("(%1)").arg( language );
+  TQString parenthizedLanguage = TQString::tqfromLatin1("(%1)").arg( 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::fromLatin1("kmail/profile-*-rc");
+  const TQString profileFilenameFilter = TQString::tqfromLatin1("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 096ba45a3..f12c39ba1 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -398,7 +398,7 @@ public:
   TQString helpAnchor() const;
 
 
-  // hrmpf. moc doesn't like nested classes with slots/signals...:
+  // hrmpf. tqmoc doesn't like nested classes with slots/signals...:
   typedef AccountsPageSendingTab SendingTab;
   typedef AccountsPageReceivingTab ReceivingTab;
 
@@ -570,7 +570,7 @@ public:
 
   TQString helpAnchor() const;
 
-  // hrmpf. moc doesn't like nested classes with slots/signals...:
+  // hrmpf. tqmoc doesn't like nested classes with slots/signals...:
   typedef AppearancePageFontsTab FontsTab;
   typedef AppearancePageColorsTab ColorsTab;
   typedef AppearancePageLayoutTab LayoutTab;
@@ -790,7 +790,7 @@ public:
 
   TQString helpAnchor() const;
 
-  // hrmpf. moc doesn't like nested classes with slots/signals...:
+  // hrmpf. tqmoc doesn't like nested classes with slots/signals...:
   typedef ComposerPageGeneralTab GeneralTab;
   typedef ComposerPagePhrasesTab PhrasesTab;
   typedef ComposerPageTemplatesTab TemplatesTab;
@@ -1057,7 +1057,7 @@ public:
   void resizeColums();
 
   void setVisibleItem( int visibleItem, bool updateSize=true );
-  virtual TQSize sizeHint() const;
+  virtual TQSize tqsizeHint() const;
 
 protected:
   virtual void resizeEvent( TQResizeEvent *e );
diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui
index 6a578030e..ab8ecb843 100644
--- a/kmail/customtemplates_base.ui
+++ b/kmail/customtemplates_base.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CustomTemplatesBase</class>
 <widget class="QWidget">
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -15,7 +15,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -26,7 +26,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -47,7 +47,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>100</width>
                                     <height>0</height>
@@ -147,7 +147,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -155,7 +155,7 @@
                         </property>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>layout6</cstring>
+                                <cstring>tqlayout6</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -181,7 +181,7 @@
                         </widget>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>layout7</cstring>
+                                <cstring>tqlayout7</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -222,7 +222,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -260,7 +260,7 @@
                             <property name="text">
                                 <string>Shortc&amp;ut:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -282,7 +282,7 @@
                             <property name="text">
                                 <string>&amp;Template type:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -355,7 +355,7 @@
     <slot>mAdd_clicked()</slot>
     <slot>mRemove_clicked()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 470518662..5f590b3b9 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -131,7 +131,7 @@ void DistributionListDialog::setRecipients( const Recipient::List &recipients )
       if ( !email.isEmpty() ) {
         DistributionListItem *item = new DistributionListItem( mRecipientsList );
         KABC::Addressee::List addressees =
-          KABC::StdAddressBook::self( true )->findByEmail( email );
+          KABC::StdAddressBook::self( true )->tqfindByEmail( email );
         if ( addressees.isEmpty() ) {
           KABC::Addressee a;
           a.setNameFromString( name );
diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index dbf5f3f96..bca75762f 100644
--- a/kmail/editorwatcher.cpp
+++ b/kmail/editorwatcher.cpp
@@ -49,13 +49,13 @@
 using namespace KMail;
 
 EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith,
-                             TQObject * parent, TQWidget *parentWidget) :
+                             TQObject * parent, TQWidget *tqparentWidget) :
     TQObject( parent ),
     mUrl( url ),
     mMimeType( mimeType ),
     mOpenWith( openWith ),
     mEditor( 0 ),
-    mParentWidget( parentWidget ),
+    mParentWidget( tqparentWidget ),
     mHaveInotify( false ),
     mFileOpen( false ),
     mEditorRunning( false ),
@@ -127,11 +127,11 @@ void EditorWatcher::inotifyEvent()
       struct inotify_event *event = (struct inotify_event *) &buffer[offset];
       size -= sizeof( struct inotify_event ) + event->len;
       offset += sizeof( struct inotify_event ) + event->len;
-      if ( event->mask & IN_OPEN )
+      if ( event->tqmask & IN_OPEN )
         mFileOpen = true;
-      if ( event->mask & IN_CLOSE )
+      if ( event->tqmask & IN_CLOSE )
         mFileOpen = false;
-      if ( event->mask & IN_MODIFY )
+      if ( event->tqmask & IN_MODIFY )
         mFileModified = true;
     }
   }
diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h
index 839386f84..35504d85a 100644
--- a/kmail/editorwatcher.h
+++ b/kmail/editorwatcher.h
@@ -43,11 +43,11 @@ class EditorWatcher : public QObject
      * Constructs an EditorWatcher.
      * @param parent the parent object of this EditorWatcher, which will take care of deleting
      *               this EditorWatcher if the parent is deleted.
-     * @param parentWidget the parent widget of this EditorWatcher, which will be used as the parent
+     * @param tqparentWidget the parent widget of this EditorWatcher, which will be used as the parent
      *                     widget for message dialogs.
      */
     EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith,
-                   TQObject *parent, TQWidget *parentWidget );
+                   TQObject *parent, TQWidget *tqparentWidget );
     bool start();
     bool fileChanged() const { return mFileModified; }
   signals:
diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp
index f036a193b..df595b36d 100644
--- a/kmail/encodingdetector.cpp
+++ b/kmail/encodingdetector.cpp
@@ -824,7 +824,7 @@ EncodingDetector::EncodingChoiceSource EncodingDetector::encodingChoiceSource()
 const char* EncodingDetector::encoding() const
 {
     d->m_storeDecoderName = d->m_codec->name();
-    d->m_storeDecoderName = d->m_storeDecoderName.lower().replace( "iso ", "iso-" );
+    d->m_storeDecoderName = d->m_storeDecoderName.lower().tqreplace( "iso ", "iso-" );
     return d->m_storeDecoderName.data();
 }
 
diff --git a/kmail/encodingdetector.h b/kmail/encodingdetector.h
index 378a1e07c..b2dd97660 100644
--- a/kmail/encodingdetector.h
+++ b/kmail/encodingdetector.h
@@ -35,7 +35,7 @@ class EncodingDetectorPrivate;
  * Searches for encoding declaration inside raw data -- meta and xml tags. 
  * In the case it can't find it, uses heuristics for specified language.
  *
- * If it finds unicode BOM marks, it changes encoding regardless of what the user has told
+ * If it finds tqunicode BOM marks, it changes encoding regardless of what the user has told
  *
  * Intended lifetime of the object: one instance per document.
  *
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index a97c08429..010a9d003 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -31,7 +31,7 @@
 #include "globalsettings.h"
 #include "folderstorage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmcommands.h"
 
 #include <kdebug.h>
@@ -190,7 +190,7 @@ void ExpireJob::done()
     }
   }
   if ( !str.isEmpty() )
-    BroadcastStatus::instance()->setStatusMsg( str );
+    BroadcasStatus::instance()->seStatusMsg( str );
 
   KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
   group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used
@@ -244,7 +244,7 @@ void ExpireJob::slotMessagesMoved( KMCommand *command )
     }
   default: ;
   }
-  BroadcastStatus::instance()->setStatusMsg( msg );
+  BroadcasStatus::instance()->seStatusMsg( msg );
 
   deleteLater();
 }
diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp
index c524f8b32..4913d1c6e 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->setAlignment( int( TQLabel::AlignTop ) );
+  labelDays2->tqsetAlignment( 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->setAlignment( int( TQLabel::AlignVCenter ) );
+  expiryActionLabel->tqsetAlignment( 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->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+  note->tqsetAlignment( 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(minimumSizeHint()) );
+  resize( TQSize(295, 204).expandedTo(tqminimumSizeHint()) );
   clearWState( WState_Polished );
 }
 
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index 5d8e3d13a..d70986876 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -58,7 +58,7 @@ FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, cons
   connect( folder, TQT_SIGNAL(nameChanged()), TQT_SLOT(nameChanged()) );
   connect( folder, TQT_SIGNAL(iconsChanged()), TQT_SLOT(slotIconsChanged()) );
 
-  connect( folder, TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)), TQT_SLOT(updateCount()) );
+  connect( folder, TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(updateCount()) );
   connect( folder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), TQT_SLOT(updateCount()) );
   connect( folder, TQT_SIGNAL(msgRemoved(KMFolder*)), TQT_SLOT(updateCount()) );
   connect( folder, TQT_SIGNAL(folderSizeChanged( KMFolder* )), TQT_SLOT(updateCount()) );
@@ -74,7 +74,7 @@ FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, cons
 void FavoriteFolderViewItem::nameChanged()
 {
   TQString txt = text( 0 );
-  txt.replace( mOldName, folder()->label() );
+  txt.tqreplace( mOldName, folder()->label() );
   setText( 0, txt );
   mOldName = folder()->label();
 }
@@ -253,7 +253,7 @@ void FavoriteFolderView::itemClicked(TQListViewItem * item)
   if ( !item ) return;
   if ( !item->isSelected() )
     item->setSelected( true );
-  item->repaint();
+  item->tqrepaint();
   handleGroupwareFolder( static_cast<KMFolderTreeItem*>( item ) );
 }
 
@@ -267,11 +267,11 @@ void FavoriteFolderView::folderTreeSelectionChanged(KMFolder * folder)
       fti->setSelected( true );
       setCurrentItem( fti );
       ensureItemVisible( fti );
-      fti->repaint();
+      fti->tqrepaint();
       found = true;
     } else if ( fti->folder() != folder && fti->isSelected() ) {
       fti->setSelected( false );
-      fti->repaint();
+      fti->tqrepaint();
     }
   }
   blockSignals( false );
@@ -309,7 +309,7 @@ void FavoriteFolderView::dropped(TQDropEvent * e, TQListViewItem * after)
       KMFolderTreeItem *fti = static_cast<KMFolderTreeItem*>( it.current() );
       if ( !fti->folder() )
         continue;
-      if( !mFolderToItem.contains( fti->folder() ) )
+      if( !mFolderToItem.tqcontains( fti->folder() ) )
          afterItem = addFolder( fti->folder(), prettyName( fti ), afterItem );
     }
     e->accept();
@@ -369,7 +369,7 @@ void FavoriteFolderView::initializeFavorites()
   assert( ft );
   for ( TQListViewItemIterator it( ft ); it.current(); ++it ) {
     KMFolderTreeItem *fti = static_cast<KMFolderTreeItem*>( it.current() );
-    if ( fti->type() == KFolderTreeItem::Inbox && fti->folder() && !seenInboxes.contains( fti->folder()->id() ) ) {
+    if ( fti->type() == KFolderTreeItem::Inbox && fti->folder() && !seenInboxes.tqcontains( fti->folder()->id() ) ) {
       seenInboxes.append( fti->folder()->id() );
       if ( fti->folder() == kmkernel->inboxFolder() && hideLocalInbox() )
         continue;
@@ -457,7 +457,7 @@ void FavoriteFolderView::addFolder()
   KMFolder *folder = dlg.folder();
   if ( !folder )
     return;
-  if ( mFolderToItem.contains( folder ) )
+  if ( mFolderToItem.tqcontains( folder ) )
     return;
 
   KMFolderTreeItem *fti = findFolderTreeItem( folder );
@@ -468,7 +468,7 @@ void KMail::FavoriteFolderView::addFolder(KMFolderTreeItem * fti)
 {
   if ( !fti || !fti->folder() )
     return;
-  if ( !mFolderToItem.contains( fti->folder()  ) )
+  if ( !mFolderToItem.tqcontains( fti->folder()  ) )
     addFolder( fti->folder(), prettyName( fti ) );
 }
 
@@ -524,7 +524,7 @@ void FavoriteFolderView::refresh()
     KMFolderTreeItem* fti = static_cast<KMFolderTreeItem*>(it.current());
     if (!fti || !fti->folder())
       continue;
-    fti->repaint();
+    fti->tqrepaint();
   }
   update();
 }
diff --git a/kmail/filterlog.h b/kmail/filterlog.h
index d49efb22c..f336621ad 100644
--- a/kmail/filterlog.h
+++ b/kmail/filterlog.h
@@ -135,7 +135,7 @@ namespace KMail {
       /** Non-public constructor needed by the singleton implementation */
       FilterLog();
       
-      /** The list contains the single log pieces */
+      /** The list tqcontains the single log pieces */
       TQStringList mLogEntries;
       
       /** the log status */
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index bebd9c319..58130a05b 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -259,8 +259,8 @@ void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry )
   // since it uses space as a separator (imap4.cc, look for GETACL)
   // It's ok in distribution list names though, that's why this check is only done here
   // and also why there's no validator on the lineedit.
-  if ( entry.userId.contains( ' ' ) )
-    kdWarning(5006) << "Userid contains a space!!!  '" << entry.userId << "'" << endl;
+  if ( entry.userId.tqcontains( ' ' ) )
+    kdWarning(5006) << "Userid tqcontains a space!!!  '" << entry.userId << "'" << endl;
 
   setUserId( entry.userId );
   mPermissions = entry.permissions;
@@ -328,7 +328,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
   topLayout->addWidget( mStack );
 
   mLabel = new TQLabel( mStack );
-  mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak );
+  mLabel->tqsetAlignment( 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->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
+  spacer->tqsetSizePolicy( 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( topLevelWidget(),
+      if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( tqtopLevelWidget(),
          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::AcceptStatus KMail::FolderDiaACLTab::accept()
+KMail::FolderDiaTab::AccepStatus KMail::FolderDiaACLTab::accept()
 {
   if ( !mChanged || !mImapAccount )
     return Accepted; // (no change made), ok for accepting the dialog immediately
@@ -699,7 +699,7 @@ bool KMail::FolderDiaACLTab::save()
     TQString uid = (*init).userId;
     for( ACLList::ConstIterator it = aclList.begin(); it != aclList.end() && !isInNewList; ++it )
       isInNewList = uid == (*it).userId;
-    if ( !isInNewList && !mRemovedACLs.contains(uid) )
+    if ( !isInNewList && !mRemovedACLs.tqcontains(uid) )
       mRemovedACLs.append( uid );
   }
 
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index 6576d13e6..d9116a6b7 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -92,7 +92,7 @@ public:
 
   virtual void load();
   virtual bool save();
-  virtual AcceptStatus accept();
+  virtual AccepStatus accept();
 
   static bool supports( KMFolder* refFolder );
 
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 01cb8dbb5..99954cc2a 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->setAlignment( AlignHCenter | AlignVCenter | WordBreak );
+  mLabel->tqsetAlignment( AlignHCenter | AlignVCenter | WordBreak );
   mStack->addWidget( mLabel );
 
   mQuotaWidget = new KMail::QuotaWidget( mStack );
@@ -187,7 +187,7 @@ void KMail::FolderDiaQuotaTab::showQuotaWidget()
 }
 
 
-KMail::FolderDiaTab::AcceptStatus 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 e0b570ee0..2fc956e96 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -59,7 +59,7 @@ public:
 
   virtual void load();
   virtual bool save();
-  virtual AcceptStatus accept();
+  virtual AccepStatus accept();
 
   static bool supports( KMFolder* refFolder );
 
diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp
index be623fe30..86d399d8c 100644
--- a/kmail/folderdiaquotatab_p.cpp
+++ b/kmail/folderdiaquotatab_p.cpp
@@ -56,19 +56,19 @@ QuotaWidget::QuotaWidget( TQWidget* parent, const char* name )
 {
       TQVBoxLayout *box = new TQVBoxLayout(this);
       TQWidget *stuff = new TQWidget( this );
-      TQGridLayout* layout =
+      TQGridLayout* tqlayout =
           new TQGridLayout( stuff, 3, 3,
                            KDialog::marginHint(),
                            KDialog::spacingHint() );
       mInfoLabel = new TQLabel("", stuff );
       mRootLabel = new TQLabel("", stuff );
       mProgressBar = new TQProgressBar( stuff );
-      layout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 );
-      layout->addWidget( mRootLabel, 0, 1 );
-      layout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 );
-      //layout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 );
-      layout->addWidget( mInfoLabel, 1, 1 );
-      layout->addWidget( mProgressBar, 2, 1 );
+      tqlayout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 );
+      tqlayout->addWidget( mRootLabel, 0, 1 );
+      tqlayout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 );
+      //tqlayout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 );
+      tqlayout->addWidget( mInfoLabel, 1, 1 );
+      tqlayout->addWidget( mProgressBar, 2, 1 );
       box->addWidget( stuff );
       box->addStretch( 2 );
 }
diff --git a/kmail/folderjob.h b/kmail/folderjob.h
index b1f712512..2988c925c 100644
--- a/kmail/folderjob.h
+++ b/kmail/folderjob.h
@@ -127,7 +127,7 @@ signals:
 
   /**
    * Emitted when a list of messages has been
-   * copied to the specified location. TQPtrList contains
+   * copied to the specified location. TQPtrList tqcontains
    * the list of the copied messages.
    */
   void messageCopied( TQPtrList<KMMessage> );
@@ -153,7 +153,7 @@ signals:
   void result( KMail::FolderJob* job );
 
   /**
-   * This progress signal contains the "done" and the "total" numbers so
+   * This progress signal tqcontains the "done" and the "total" numbers so
    * that the caller can either make a % out of it, or combine it into
    * a higher-level progress info.
    */
diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui
index 417e8df4a..45fa7015b 100644
--- a/kmail/folderpropertiesdialog.ui
+++ b/kmail/folderpropertiesdialog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KMFolderDialogUI</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -73,7 +73,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -140,13 +140,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>28</width>
                             <height>28</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>28</width>
                             <height>28</height>
@@ -166,7 +166,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -188,13 +188,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>28</width>
                             <height>28</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>28</width>
                             <height>28</height>
@@ -228,7 +228,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>101</width>
                             <height>20</height>
@@ -296,7 +296,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -321,7 +321,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -434,7 +434,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -507,7 +507,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>120</width>
                             <height>80</height>
@@ -633,6 +633,6 @@
 <slots>
     <slot access="protected">slotChangeIcon( QString )</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index 553fc5a02..2be44c5aa 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()) );
 
-  setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
         TQSizePolicy::Fixed ) );
   setFocusPolicy( TQWidget::StrongFocus );
 }
diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h
index 30e39c637..9d7493c87 100644
--- a/kmail/folderrequester.h
+++ b/kmail/folderrequester.h
@@ -38,7 +38,7 @@ class KMFolderTree;
 namespace KMail {
 
   /**
-   * A widget that contains a KLineEdit which shows the current folder
+   * A widget that tqcontains a KLineEdit which shows the current folder
    * and a button that fires a KMFolderSelDlg
    * The dialog is set to disable readonly folders by default
    * Search folders are excluded
diff --git a/kmail/foldersetselector.cpp b/kmail/foldersetselector.cpp
index c35fd0c1e..147d98a05 100644
--- a/kmail/foldersetselector.cpp
+++ b/kmail/foldersetselector.cpp
@@ -76,7 +76,7 @@ void FolderSetSelector::setSelectedFolders(const TQValueList< int > & folderIds)
   while ( it.current() ) {
     SimpleFolderTreeItem<TQCheckListItem> *item = dynamic_cast<SimpleFolderTreeItem<TQCheckListItem>*>( it.current() );
     if ( item && item->folder() ) {
-      if ( folderIds.contains( item->folder()->id() ) )
+      if ( folderIds.tqcontains( item->folder()->id() ) )
         item->setOn( true );
       else
         item->setOn( false );
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 78724d502..6744e136e 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->setStatus(KMMsgStatusUnread);
+      msgBase->seStatus(KMMsgStatusUnread);
       msgBase->setDirty(true);
     }
   }
@@ -197,7 +197,7 @@ void FolderStorage::markUnreadAsRead()
   if (serNums.empty())
     return;
 
-  KMCommand *command = new KMSetStatusCommand( KMMsgStatusRead, serNums );
+  KMCommand *command = new KMSeStatusCommand( KMMsgStatusRead, serNums );
   command->start();
 }
 
@@ -283,7 +283,7 @@ void FolderStorage::slotEmitChangedTimer()
 //-----------------------------------------------------------------------------
 void FolderStorage::emitMsgAddedSignals(int idx)
 {
-  Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder() , idx );
+  TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder() , idx );
   if (!mQuiet) {
     emit msgAdded(idx);
   } else {
@@ -388,7 +388,7 @@ void FolderStorage::removeMsg(int idx, bool)
 
   KMMsgBase* mb = getMsgBase(idx);
 
-  Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
+  TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
   if (serNum != 0)
     emit msgRemoved( folder(), serNum );
   mb = takeIndexEntry( idx );
@@ -430,7 +430,7 @@ KMMessage* FolderStorage::take(int idx)
   mb = getMsgBase(idx);
   if (!mb) return 0;
   if (!mb->isMessage()) readMsg(idx);
-  Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
+  TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
   emit msgRemoved( folder(), serNum );
 
   msg = (KMMessage*)takeIndexEntry(idx);
@@ -503,7 +503,7 @@ KMMessage* FolderStorage::getMsg(int idx)
         kdDebug(5006) << "Error: " << location() <<
           " Index file is inconsistent with folder file. This should never happen." << endl;
 
-        // We can't recreate the index at this point, since that would invalidate the current
+        // We can't recreate the index at this point, since that would tqinvalidate the current
         // message list and delete KMMsgBase or KMMessage objects that are in use.
         // Do it later in KMFolderIndex::readIndexHeader() instead.
         mCompactable = false; // Don't compact
@@ -844,7 +844,7 @@ int FolderStorage::countUnread()
   return (unread > 0) ? unread : 0;
 }
 
-Q_INT64 FolderStorage::folderSize() const
+TQ_INT64 FolderStorage::folderSize() const
 {
     if ( mSize != -1 ) {
         return mSize;
@@ -889,7 +889,7 @@ void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus,
       }
       mChanged = true;
     }
-    Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(folder(), idx);
+    TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(folder(), idx);
     emit msgChanged( folder(), serNum, deltaUnread );
   }
 }
@@ -977,21 +977,21 @@ void FolderStorage::readFolderIdsFile()
 {
   if ( !mExportsSernums ) return;
   if ( KMMsgDict::mutableInstance()->readFolderIds( *this ) == -1 ) {
-    invalidateFolder();
+    tqinvalidateFolder();
   }
   if ( !KMMsgDict::mutableInstance()->hasFolderIds( *this ) ) {
-    invalidateFolder();
+    tqinvalidateFolder();
   }
 }
 
-void FolderStorage::invalidateFolder()
+void FolderStorage::tqinvalidateFolder()
 {
   if ( !mExportsSernums ) return;
   unlink(TQFile::encodeName( indexLocation()) + ".sorted");
   unlink(TQFile::encodeName( indexLocation()) + ".ids");
   fillMessageDict();
   KMMsgDict::mutableInstance()->writeFolderIds( *this );
-  emit invalidated( folder() );
+  emit tqinvalidated( folder() );
 }
 
 
@@ -1022,10 +1022,10 @@ int FolderStorage::appendToFolderIdsFile( int idx )
   return ret;
 }
 
-void FolderStorage::replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
+void FolderStorage::tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
 {
   if ( !mExportsSernums ) return;
-  KMMsgDict::mutableInstance()->replace( sernum, msg, idx );
+  KMMsgDict::mutableInstance()->tqreplace( sernum, msg, idx );
 }
 
 void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
@@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::setStatus(int idx, KMMsgStatus status, bool toggle)
+void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle)
 {
   KMMsgBase *msg = getMsgBase(idx);
   if ( msg ) {
     if (toggle)
       msg->toggleStatus(status, idx);
     else
-      msg->setStatus(status, idx);
+      msg->seStatus(status, idx);
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void FolderStorage::setStatus(TQValueList<int>& ids, KMMsgStatus 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::setStatus(*it, status, toggle);
+    FolderStorage::seStatus(*it, status, toggle);
   }
 }
 
@@ -1135,11 +1135,11 @@ void FolderStorage::slotProcessNextSearchBatch()
 {
   if ( !mSearchPattern )
     return;
-  TQValueList<Q_UINT32> matchingSerNums;
+  TQValueList<TQ_UINT32> matchingSerNums;
   const int end = QMIN( mCurrentSearchedMsg + 15, count() );
   for ( int i = mCurrentSearchedMsg; i < end; ++i )
   {
-    Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), i );
+    TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), i );
     if ( mSearchPattern->matches( serNum ) )
       matchingSerNums.append( serNum );
   }
@@ -1151,7 +1151,7 @@ void FolderStorage::slotProcessNextSearchBatch()
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::search( const KMSearchPattern* pattern, Q_UINT32 serNum )
+void FolderStorage::search( const KMSearchPattern* pattern, TQ_UINT32 serNum )
 {
   bool matches = pattern && pattern->matches( serNum );
 
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index 7d7165431..b7effe082 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -63,7 +63,7 @@ namespace KMail {
 }
 using KMail::AttachmentStrategy;
 
-typedef TQValueList<Q_UINT32> SerNumList;
+typedef TQValueList<TQ_UINT32> SerNumList;
 
 /**
  * @short The FolderStorage class is the bass class for the storage related
@@ -238,13 +238,13 @@ public:
   virtual int countUnread();
 
   /** Total size of the contents of this folder. */
-  Q_INT64 folderSize() const;
+  TQ_INT64 folderSize() const;
 
   /** Return whether the folder is close to its quota limit, which can
    * be reflected in the UI.  */
   virtual bool isCloseToQuota() const;
 
-  /** Called by KMMsgBase::setStatus 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 KMMsgStatus oldStatus,
                                  const KMMsgStatus newStatus,
@@ -324,7 +324,7 @@ public:
   /** Change the dirty flag. */
   void setDirty(bool f);
 
-  /** Returns TRUE if the folder contains deleted messages */
+  /** Returns TRUE if the folder tqcontains deleted messages */
   bool needsCompacting() const { return needsCompact; }
   virtual void setNeedsCompacting(bool f) { needsCompact = f; }
 
@@ -363,10 +363,10 @@ public:
   void deregisterFromMessageDict();
 
   /** Set the status of the message at index @p idx to @p status. */
-  virtual void setStatus(int idx, KMMsgStatus 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 setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
+  virtual void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
 
   void removeJobs();
 
@@ -412,7 +412,7 @@ public:
    * Check if the message matches the search criteria
    * The end is signaled with searchDone()
    */
-  virtual void search( const KMSearchPattern*, Q_UINT32 serNum );
+  virtual void search( const KMSearchPattern*, TQ_UINT32 serNum );
 
   /** Returns true if this folder can be moved */
   virtual bool isMoveable() const;
@@ -437,8 +437,8 @@ signals:
   /** Emitted when the folder was closed and ticket owners have to reopen */
   void closed( KMFolder* );
 
-  /** Emitted when the serial numbers of this folder were invalidated. */
-  void invalidated( KMFolder * );
+  /** Emitted when the serial numbers of this folder were tqinvalidated. */
+  void tqinvalidated( KMFolder * );
 
   /** Emitted when the name of the folder changes. */
   void nameChanged();
@@ -459,7 +459,7 @@ signals:
   void noContentChanged();
 
   /** Emitted before a message is removed from the folder. */
-  void msgRemoved(KMFolder*, Q_UINT32 sernum);
+  void msgRemoved(KMFolder*, TQ_UINT32 sernum);
 
   /** Emitted after a message is removed from the folder. */
   void msgRemoved( int idx, TQString msgIdMD5 );
@@ -467,10 +467,10 @@ signals:
 
   /** Emitted when a message is added from the folder. */
   void msgAdded(int idx);
-  void msgAdded(KMFolder*, Q_UINT32 sernum);
+  void msgAdded(KMFolder*, TQ_UINT32 sernum);
 
   /** Emitted, when the status of a message is changed */
-  void msgChanged(KMFolder*, Q_UINT32 sernum, int delta);
+  void msgChanged(KMFolder*, TQ_UINT32 sernum, int delta);
 
   /** Emitted when a field of the header of a specific message changed. */
   void msgHeaderChanged(KMFolder*, int);
@@ -489,14 +489,14 @@ signals:
    * The matching serial numbers are included
    * If @p complete is true the search is done
    */
-  void searchResult( KMFolder*, TQValueList<Q_UINT32>,
+  void searchResult( KMFolder*, TQValueList<TQ_UINT32>,
                      const KMSearchPattern*, bool complete );
 
   /**
    * Emitted when a search for a single message is completed
    * The serial number and a bool matching yes/no is included
    */
-  void searchDone( KMFolder*, Q_UINT32, const KMSearchPattern*, bool );
+  void searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool );
 
   /** Emitted when the folder's size changes. */
   void folderSizeChanged();
@@ -553,7 +553,7 @@ protected:
 friend class KMMsgDict;
   /** Inserts messages into the message dictionary. The messages will get
    * new serial numbers. This is only used on newly appeared folders, where
-   * there is no .ids file yet, or when that has been invalidated. */
+   * there is no .ids file yet, or when that has been tqinvalidated. */
   virtual void fillMessageDict() {}
 
   /** Read the on-disk cache of serial numbers  of messages in this store
@@ -581,12 +581,12 @@ friend class KMMsgDict;
 
   /** Replaces the serial number for the message @p msg at index @p idx with
    * @p sernum */
-  void replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx );
+  void tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx );
 
-   /** Called when serial numbers for a folder are invalidated,
-  invalidates/recreates data structures dependent on the
+   /** Called when serial numbers for a folder are tqinvalidated,
+  tqinvalidates/recreates data structures dependent on the
   serial numbers for this folder */
-  void invalidateFolder();
+  void tqinvalidateFolder();
 
   /** Called by KMFolder::remove() to delete the actual contents.
     At the time of the call the folder has already been closed, and
@@ -605,7 +605,7 @@ friend class KMMsgDict;
   virtual void clearIndex(bool autoDelete=true, bool syncDict = false) = 0;
   virtual void truncateIndex() = 0;
 
-  virtual Q_INT64 doFolderSize() const { return 0; };
+  virtual TQ_INT64 doFolderSize() const { return 0; };
 
   int mOpenCount;
   int mQuiet;
@@ -623,7 +623,7 @@ friend class KMMsgDict;
   /** number of unread messages, -1 if not yet set */
   int mUnreadMsgs, mGuessedUnreadMsgs;
   int mTotalMsgs;
-  Q_INT64 mSize;
+  TQ_INT64 mSize;
   bool mWriteConfigEnabled :1;
   /** sven: true if on destruct folder needs to be compacted. */
   bool needsCompact :1;
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index c35c88074..e126263f5 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -179,10 +179,10 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
   }
 
   // set it
-  bool repaint = false;
+  bool tqrepaint = false;
   if (fti->unreadCount() != count) {
      fti->adjustUnreadCount( count );
-     repaint = true;
+     tqrepaint = true;
   }
   if (isTotalActive() || force)
   {
@@ -196,15 +196,15 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
     // set it
     if ( count != fti->totalCount() ) {
       fti->setTotalCount(count);
-      repaint = true;
+      tqrepaint = true;
     }
   }
   if ( isSizeActive() || force ) {
     if ( !fti->folder()->noContent()) {
-      Q_INT64 size = folder->storage()->folderSize();
+      TQ_INT64 size = folder->storage()->folderSize();
       if ( size != fti->folderSize() ) {
         fti->setFolderSize( size );
-        repaint = true;
+        tqrepaint = true;
       }
     }
   }
@@ -213,8 +213,8 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
   }
 
   if (fti->parent() && !fti->parent()->isOpen())
-    repaint = false; // we're not visible
-  if (repaint) {
+    tqrepaint = false; // we're not visible
+  if (tqrepaint) {
     fti->setNeedsRepaint( true );
     emit triggerRefresh();
   }
@@ -228,7 +228,7 @@ void FolderTreeBase::handleMailListDrop(TQDropEvent * event, KMFolder *destinati
   if ( !MailListDrag::decode( event, list ) ) {
     kdWarning() << k_funcinfo << "Could not decode drag data!" << endl;
   } else {
-    TQValueList<Q_UINT32> serNums = MessageCopyHelper::serNumListFromMailList( list );
+    TQValueList<TQ_UINT32> serNums = MessageCopyHelper::serNumListFromMailList( list );
     int action;
     if ( MessageCopyHelper::inReadOnlyFolder( serNums ) )
       action = DRAG_COPY;
diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h
index bc2ad0ccc..0c8f97207 100644
--- a/kmail/foldertreebase.h
+++ b/kmail/foldertreebase.h
@@ -38,7 +38,7 @@ class FolderTreeBase : public KFolderTree
     /** Find index of given folder. Returns 0 if not found */
     virtual TQListViewItem* indexOfFolder( const KMFolder* folder ) const
     {
-       if ( mFolderToItem.contains( folder ) )
+       if ( mFolderToItem.tqcontains( folder ) )
          return mFolderToItem[ folder ];
        else
          return 0;
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index 24f9fbbec..ee813bf47 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -20,8 +20,8 @@ class FolderViewToolTip : public QToolTip
       KMFolderTreeItem *item = dynamic_cast<KMFolderTreeItem*>( mListView->itemAt( point ) );
       if  ( !item )
         return;
-      const TQRect itemRect = mListView->itemRect( item );
-      if ( !itemRect.isValid() )
+      const TQRect tqitemRect = mListView->tqitemRect( item );
+      if ( !tqitemRect.isValid() )
         return;
       const TQRect headerRect = mListView->header()->sectionRect( 0 );
       if ( !headerRect.isValid() )
@@ -32,7 +32,7 @@ class FolderViewToolTip : public QToolTip
       
       item->updateCount();
       TQString tipText = i18n("<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4" )
-          .arg( item->folder()->prettyURL().replace( " ", "&nbsp;" ) )
+          .arg( item->folder()->prettyURL().tqreplace( " ", "&nbsp;" ) )
           .arg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) )
           .arg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) )
           .arg( KIO::convertSize( item->folderSize() ) );
@@ -43,7 +43,7 @@ class FolderViewToolTip : public QToolTip
               tipText += i18n("<br>Quota: %1").arg( info.toString() );
       }
       
-      tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ), tipText );
+      tip( TQRect( headerRect.left(), tqitemRect.top(), headerRect.width(), tqitemRect.height() ), tipText );
     }
 
   private:
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 188e05324..684dd590d 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -138,7 +138,7 @@ TQString HeaderItem::from() const
 }
 
 // Return the serial number
-Q_UINT32 HeaderItem::msgSerNum() const
+TQ_UINT32 HeaderItem::msgSerNum() const
 {
   return mSerNum;
 }
@@ -232,17 +232,17 @@ TQPixmap HeaderItem::pixmapMerge( PixmapList pixmaps ) const
   }
 
   TQPixmap res( width, height );
-  TQBitmap mask( width, height, true );
+  TQBitmap tqmask( width, height, true );
 
   int x = 0;
   for ( PixmapList::ConstIterator it = pixmaps.begin();
       it != pixmaps.end(); ++it ) {
     bitBlt( &res, x, (height - (*it).height()) / 2, &(*it) );
-    bitBlt( &mask, x, (height - (*it).height()) / 2, (*it).mask() );
+    bitBlt( &tqmask, x, (height - (*it).height()) / 2, (*it).tqmask() );
     x += (*it).width();
   }
 
-  res.setMask( mask );
+  res.setMask( tqmask );
   return res;
 }
 
diff --git a/kmail/headeritem.h b/kmail/headeritem.h
index ac46cb959..4ada5112a 100644
--- a/kmail/headeritem.h
+++ b/kmail/headeritem.h
@@ -183,7 +183,7 @@ public:
   TQString from() const;
 
   // Return the serial number of the message associated with this item;
-  Q_UINT32 msgSerNum() const;
+  TQ_UINT32 msgSerNum() const;
 
   /** Expands all children of the list view item. */
   void setOpenRecursive( bool open );
@@ -232,7 +232,7 @@ public:
 
 private:
   int mMsgId;
-  Q_UINT32 mSerNum;
+  TQ_UINT32 mSerNum;
   TQString mKey;
   bool mAboutToBeDeleted;
   SortCacheItem *mSortCacheItem;
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index 69ac5b1f7..a2262744f 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -72,20 +72,20 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
   mStatusCombo->setSizeLimit( 12 );
   mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") );
 
-  insertStatus( StatusUnread );
-  insertStatus( StatusNew );
-  insertStatus( StatusImportant );
-  insertStatus( StatusReplied );
-  insertStatus( StatusForwarded );
-  insertStatus( StatusToDo );
-  insertStatus( StatusHasAttachment );
-  insertStatus( StatusInvitation );
-  insertStatus( StatusWatched );
-  insertStatus( 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 ) ),
-           this, TQT_SLOT( slotStatusChanged( int ) ) );
+           this, TQT_SLOT( sloStatusChanged( int ) ) );
 
   label->setBuddy( mStatusCombo );
 
@@ -116,7 +116,7 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event )
     KMMainWidget *mainWidget = 0;
 
     // Travel up the parents list until we find the main widget
-    for ( TQWidget *curWidget = parentWidget(); curWidget; curWidget = curWidget->parentWidget() ) {
+    for ( TQWidget *curWidget = tqparentWidget(); curWidget; curWidget = curWidget->tqparentWidget() ) {
       mainWidget = ::qt_cast<KMMainWidget *>( curWidget );
       if ( mainWidget )
         break;
@@ -155,10 +155,10 @@ bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQStri
   // The full email address is not visible, but we still want it to be searchable.
   // KListViewSearchLine::itemMatches() only searches in visible columns.
   const HeaderItem *headerItem = static_cast<const HeaderItem*>( item );
-  if ( headerItem->from().lower().contains( s.lower() ) ) {
+  if ( headerItem->from().lower().tqcontains( s.lower() ) ) {
     return true;
   }
-  if ( headerItem->to().lower().contains( s.lower() ) ) {
+  if ( headerItem->to().lower().tqcontains( s.lower() ) ) {
     return true;
   }
 
@@ -170,10 +170,10 @@ void HeaderListQuickSearch::reset()
 {
   clear();
   mStatusCombo->setCurrentItem( 0 );
-  slotStatusChanged( 0 );
+  sloStatusChanged( 0 );
 }
 
-void HeaderListQuickSearch::slotStatusChanged( int index )
+void HeaderListQuickSearch::sloStatusChanged( int index )
 {
   if ( index == 0 )
     mStatus = 0;
@@ -182,7 +182,7 @@ void HeaderListQuickSearch::slotStatusChanged( int index )
   updateSearch();
 }
 
-void HeaderListQuickSearch::insertStatus(KMail::StatusValueTypes which)
+void HeaderListQuickSearch::inserStatus(KMail::StatusValueTypes which)
 {
   mStatusCombo->insertItem( SmallIcon( KMail::StatusValues[which].icon ),
     i18n( KMail::StatusValues[ which ].text ) );
@@ -196,7 +196,7 @@ TQString HeaderListQuickSearch::currentSearchTerm() const
 }
 
 
-int HeaderListQuickSearch::currentStatus() const
+int HeaderListQuickSearch::currenStatus() const
 {
     return mStatus;
 }
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index 09898f95b..ddef0b40b 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -66,7 +66,7 @@ public:
     /**
      * Returns the currently selected status filter.
      */
-    int currentStatus() const;
+    int currenStatus() const;
 
 public slots:
    void reset();
@@ -76,7 +76,7 @@ signals:
 
 protected:
     /**
-     * checks whether @param item contains the search string and has the status
+     * checks whether @param item tqcontains the search string and has the status
      * currently in mStatus
      */
     virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const;
@@ -86,11 +86,11 @@ private slots:
    * cache the status in mStatus so as to avoid having to do the comparatively
    * expensive string comparison for each item in itemMatches
    */
-  void slotStatusChanged( int index );
+  void sloStatusChanged( int index );
 
 private:
     /** Helper method for the filling of the status combo. */
-    void insertStatus(KMail::StatusValueTypes which);
+    void inserStatus(KMail::StatusValueTypes which);
     TQComboBox *mStatusCombo;
     KMMsgStatus mStatus;
     TQValueVector<TQString> statusList;
diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp
index bfe9845be..3fed82ab2 100644
--- a/kmail/headerstrategy.cpp
+++ b/kmail/headerstrategy.cpp
@@ -243,8 +243,8 @@ namespace KMail {
   }
 
   bool HeaderStrategy::showHeader( const TQString & header ) const {
-    if ( headersToDisplay().contains( header.lower() ) ) return true;
-    if ( headersToHide().contains( header.lower() ) ) return false;
+    if ( headersToDisplay().tqcontains( header.lower() ) ) return true;
+    if ( headersToHide().tqcontains( header.lower() ) ) return false;
     return defaultPolicy() == Display;
   }
 
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index f099d9822..3f3073ef7 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -124,7 +124,7 @@ namespace KMail {
       strategy = HeaderStrategy::brief();
 
     // The direction of the header is determined according to the direction
-    // of the application layout.
+    // of the application tqlayout.
 
     TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ;
 
@@ -223,7 +223,7 @@ namespace KMail {
       strategy = HeaderStrategy::rich();
 
     // The direction of the header is determined according to the direction
-    // of the application layout.
+    // of the application tqlayout.
 
     TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
 
@@ -394,15 +394,15 @@ namespace KMail {
       { 255,  25,   0 },
       { 255,   0,   0 }
     };
-    meterBar.setColor( 21, qRgb( 255, 255, 255 ) );
-    meterBar.setColor( 22, qRgb( 170, 170, 170 ) );
+    meterBar.setColor( 21, tqRgb( 255, 255, 255 ) );
+    meterBar.setColor( 22, tqRgb( 170, 170, 170 ) );
     if ( percent < 0 ) // grey is for errors
       meterBar.fill( 22 );
     else {
       meterBar.fill( 21 );
       int max = QMIN( 20, static_cast<int>( percent ) / 5 );
       for ( int i = 0; i < max; ++i ) {
-        meterBar.setColor( i+1, qRgb( gradient[i][0], gradient[i][1],
+        meterBar.setColor( i+1, tqRgb( gradient[i][0], gradient[i][1],
                                       gradient[i][2] ) );
         meterBar.setPixel( i, 0, i+1 );
       }
@@ -427,7 +427,7 @@ namespace KMail {
 
     // ### from kmreaderwin begin
     // The direction of the header is determined according to the direction
-    // of the application layout.
+    // of the application tqlayout.
 
     TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
     TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").arg(dir);
@@ -478,7 +478,7 @@ namespace KMail {
     ::KIMProxy *imProxy = KMKernel::self()->imProxy();
     TQString kabcUid;
     KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-    KABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
+    KABC::AddresseeList addresses = addressBook->tqfindByEmail( KPIM::getFirstEmailAddress( message->from() ) );
 
     TQString photoURL;
     int photoWidth = 60;
@@ -493,7 +493,7 @@ namespace KMail {
           presence = imProxy->presenceString( kabcUid );
           if ( !presence.isEmpty() )
           {
-            TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" )
+            TQString presenceIcon = TQString::tqfromLatin1( " <img src=\"%1\"/>" )
                 .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
             presence += presenceIcon;
           }
@@ -853,7 +853,7 @@ namespace KMail {
     TQBuffer buffer( ba );
     buffer.open( IO_WriteOnly );
     image.save( &buffer, fmt );
-    return TQString::fromLatin1("data:image/%1;base64,%2")
+    return TQString::tqfromLatin1("data:image/%1;base64,%2")
            .arg( fmt, KCodecs::base64Encode( ba ) );
   }
 
@@ -882,7 +882,7 @@ namespace KMail {
 	    strategy = HeaderStrategy::brief();
 
 	// The direction of the header is determined according to the direction
-	// of the application layout.
+	// of the application tqlayout.
 
 	TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ;
 
@@ -901,7 +901,7 @@ namespace KMail {
 	// colors depend on if its encapsulated or not
         TQColor fontColor(Qt::white);
 	TQString linkColor = "class =\"white\"";
-	const TQColor activeColor = qApp->palette().active().highlight();
+	const TQColor activeColor = tqApp->palette().active().highlight();
 	TQColor activeColorDark = activeColor.dark(130);
         // reverse colors for encapsulated
         if( !topLevel ){
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index 2c6e6faff..111ce6cd6 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 )
 {
-  setAlignment( AlignHCenter|AlignTop );
+  tqsetAlignment( AlignHCenter|AlignTop );
   // Don't force a minimum height to the reader widget
-  setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
   upd();
 }
 
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 22b5a4c81..5c3f7df69 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -165,7 +165,7 @@ namespace KMail {
     label = new TQLabel( mAliasEdit, i18n("Email a&liases:"), tab );
     glay->addWidget( label, row, 0, TQt::AlignTop );
     msg = i18n("<qt><h3>Email aliases</h3>"
-               "<p>This field contains alias addresses that should also "
+               "<p>This field tqcontains alias addresses that should also "
                "be considered as belonging to this identity (as opposed "
                "to representing a different identity).</p>"
                "<p>Example:</p>"
@@ -427,16 +427,16 @@ namespace KMail {
     // Tab Widget: Signature
     //
     mSignatureConfigurator = new SignatureConfigurator( tabWidget );
-    mSignatureConfigurator->layout()->setMargin( KDialog::marginHint() );
+    mSignatureConfigurator->tqlayout()->setMargin( KDialog::marginHint() );
     tabWidget->addTab( mSignatureConfigurator, i18n("&Signature") );
 
     mXFaceConfigurator = new XFaceConfigurator( tabWidget );
-    mXFaceConfigurator->layout()->setMargin( KDialog::marginHint() );
+    mXFaceConfigurator->tqlayout()->setMargin( KDialog::marginHint() );
     tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") );
 
-    KConfigGroup geometry( KMKernel::config(), "Geometry" );
-    if ( geometry.hasKey( "Identity Dialog size" ) )
-      resize( geometry.readSizeEntry( "Identity Dialog size" ) );
+    KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+    if ( tqgeometry.hasKey( "Identity Dialog size" ) )
+      resize( tqgeometry.readSizeEntry( "Identity Dialog size" ) );
     mNameEdit->setFocus();
 
     connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)),
@@ -444,8 +444,8 @@ namespace KMail {
   }
 
   IdentityDialog::~IdentityDialog() {
-    KConfigGroup geometry( KMKernel::config(), "Geometry" );
-    geometry.writeEntry( "Identity Dialog size", size() );
+    KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+    tqgeometry.writeEntry( "Identity Dialog size", size() );
   }
 
   void IdentityDialog::slotAboutToShow( TQWidget * w ) {
diff --git a/kmail/identitydrag.cpp b/kmail/identitydrag.cpp
index e8ba4a07e..855206372 100644
--- a/kmail/identitydrag.cpp
+++ b/kmail/identitydrag.cpp
@@ -54,7 +54,7 @@ namespace KMail {
       return 0;
   }
 
-  TQByteArray IdentityDrag::encodedData( const char * mimetype ) const {
+  TQByteArray IdentityDrag::tqencodedData( 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->encodedData( kmailIdentityMimeType ), IO_ReadOnly );
+      TQDataStream s( e->tqencodedData( kmailIdentityMimeType ), IO_ReadOnly );
       s >> i;
       return true;
     }
diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h
index 82d6d0262..f48e1a3c7 100644
--- a/kmail/identitydrag.h
+++ b/kmail/identitydrag.h
@@ -51,7 +51,7 @@ namespace KMail {
     virtual ~IdentityDrag() {}
 
     const char * format( int i ) const; // reimp. QMimeSource
-    TQByteArray encodedData( const char * mimetype ) const; // dto.
+    TQByteArray tqencodedData( 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 b0f78c5aa..01e1324c8 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -32,7 +32,7 @@ using KMail::SieveConfig;
 using KMail::AccountManager;
 #include "kmfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmmainwin.h"
 #include "kmfolderimap.h"
 #include "kmmainwidget.h"
@@ -354,7 +354,7 @@ namespace KMail {
       checkDone( false, CheckOK );
     }
     if ( showStatusMsg )
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
           name(), newMails);
   }
 
@@ -669,7 +669,7 @@ namespace KMail {
       // split, allow empty parts as we can get empty namespaces
       TQStringList parts = TQStringList::split( "=", *it, true );
       imapNamespace section = imapNamespace( parts[0].toInt() );
-      if ( map.contains( section ) ) {
+      if ( map.tqcontains( section ) ) {
         nsDelim = map[section];
       } else {
         nsDelim.clear();
@@ -736,31 +736,31 @@ namespace KMail {
         TQString msg = i18n("KMail has detected a prefix entry in the "
             "configuration of the account \"%1\" which is obsolete with the "
             "support of IMAP namespaces.").arg( name() );
-        if ( list.contains( "" ) ) {
-          // replace empty entry with the old prefix
+        if ( list.tqcontains( "" ) ) {
+          // tqreplace empty entry with the old prefix
           list.remove( "" );
           list += mOldPrefix;
           mNamespaces[PersonalNS] = list;
-          if ( mNamespaceToDelimiter.contains( "" ) ) {
+          if ( mNamespaceToDelimiter.tqcontains( "" ) ) {
             TQString delim = mNamespaceToDelimiter[""];
             mNamespaceToDelimiter.remove( "" );
             mNamespaceToDelimiter[mOldPrefix] = delim;
           }
-          kdDebug(5006) << "migratePrefix - replaced empty with " << mOldPrefix << endl;
+          kdDebug(5006) << "migratePrefix - tqreplaced empty with " << mOldPrefix << endl;
           msg += i18n("The configuration was automatically migrated but you should check "
               "your account configuration.");
         } else if ( list.count() == 1 ) {
-          // only one entry in the personal namespace so replace it
+          // only one entry in the personal namespace so tqreplace it
           TQString old = list.first();
           list.clear();
           list += mOldPrefix;
           mNamespaces[PersonalNS] = list;
-          if ( mNamespaceToDelimiter.contains( old ) ) {
+          if ( mNamespaceToDelimiter.tqcontains( old ) ) {
             TQString delim = mNamespaceToDelimiter[old];
             mNamespaceToDelimiter.remove( old );
             mNamespaceToDelimiter[mOldPrefix] = delim;
           }
-          kdDebug(5006) << "migratePrefix - replaced single with " << mOldPrefix << endl;
+          kdDebug(5006) << "migratePrefix - tqreplaced single with " << mOldPrefix << endl;
           msg += i18n("The configuration was automatically migrated but you should check "
               "your account configuration.");
         } else {
@@ -812,7 +812,7 @@ namespace KMail {
   {
     //kdDebug(5006) << "delimiterForNamespace " << prefix << endl;
     // try to match exactly
-    if ( mNamespaceToDelimiter.contains(prefix) ) {
+    if ( mNamespaceToDelimiter.tqcontains(prefix) ) {
       return mNamespaceToDelimiter[prefix];
     }
 
@@ -820,17 +820,17 @@ namespace KMail {
     // exclude empty namespace
     for ( namespaceDelim::ConstIterator it = mNamespaceToDelimiter.begin();
           it != mNamespaceToDelimiter.end(); ++it ) {
-      // the namespace definition sometimes contains the delimiter
+      // the namespace definition sometimes tqcontains the delimiter
       // make sure we also match this version
       TQString stripped = it.key().left( it.key().length() - 1 );
       if ( !it.key().isEmpty() &&
-          ( prefix.contains( it.key() ) || prefix.contains( stripped ) ) ) {
+          ( prefix.tqcontains( it.key() ) || prefix.tqcontains( stripped ) ) ) {
         return it.data();
       }
     }
     // see if we have an empty namespace
     // this should always be the case
-    if ( mNamespaceToDelimiter.contains( "" ) ) {
+    if ( mNamespaceToDelimiter.tqcontains( "" ) ) {
       return mNamespaceToDelimiter[""];
     }
     // well, we tried
@@ -961,10 +961,10 @@ namespace KMail {
           KMessageBox::information( kapp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" );
           // Show it in the status bar, in case the user has ticked "don't show again"
           if ( errorCode == KIO::ERR_CONNECTION_BROKEN )
-            KPIM::BroadcastStatus::instance()->setStatusMsg(
+            KPIM::BroadcasStatus::instance()->seStatusMsg(
                 i18n(  "The connection to account %1 was broken." ).arg( name() ) );
           else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
-            KPIM::BroadcastStatus::instance()->setStatusMsg(
+            KPIM::BroadcasStatus::instance()->seStatusMsg(
                 i18n(  "The connection to account %1 timed out." ).arg( name() ) );
         } else {
           if ( !errors.isEmpty() )
@@ -1025,7 +1025,7 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   void ImapAccountBase::processNewMailInFolder( KMFolder* folder, FolderListType type /*= Single*/ )
   {
-    if ( mFoldersQueuedForChecking.contains( folder ) )
+    if ( mFoldersQueuedForChecking.tqcontains( folder ) )
       return;
     mFoldersQueuedForChecking.append( folder );
     mCheckingSingleFolder = ( type == Single );
@@ -1057,7 +1057,7 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   bool ImapAccountBase::checkingMail( KMFolder *folder )
   {
-    if (checkingMail() && mFoldersQueuedForChecking.contains(folder))
+    if (checkingMail() && mFoldersQueuedForChecking.tqcontains(folder))
       return true;
     return false;
   }
@@ -1215,7 +1215,7 @@ namespace KMail {
      jd.path = path;
      insertJob(job, jd);
      connect(job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotSetStatusResult(KIO::Job *)));
+           TQT_SLOT(slotSeStatusResult(KIO::Job *)));
   }
 
   void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen)
@@ -1237,11 +1237,11 @@ namespace KMail {
      jd.path = path;
      insertJob(job, jd);
      connect(job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotSetStatusResult(KIO::Job *)));
+           TQT_SLOT(slotSeStatusResult(KIO::Job *)));
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSetStatusResult(KIO::Job * job)
+  void ImapAccountBase::slotSeStatusResult(KIO::Job * job)
   {
      ImapAccountBase::JobIterator it = findJob(job);
      if ( it == jobsEnd() ) return;
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 39fb33b69..0795eb2ab 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -266,9 +266,9 @@ namespace KMail {
 
     /**
      * Called when we're completely done checking mail for this account
-     * When @p setStatusMsg is true a status msg is shown
+     * When @p seStatusMsg is true a status msg is shown
      */
-    void postProcessNewMail( bool setStatusMsg = true );
+    void postProcessNewMail( bool seStatusMsg = true );
 
     /**
      * Check whether we're checking for new mail
@@ -397,7 +397,7 @@ namespace KMail {
       * Returns true if the account has the given capability
       */
      bool hasCapability( const TQString& capa ) {
-      return mCapabilities.contains( capa ); }
+      return mCapabilities.tqcontains( capa ); }
 
      /**
       * Create an IMAP path for a parent folder and a foldername
@@ -437,7 +437,7 @@ namespace KMail {
     /**
      * Only delete information about the job and ignore write errors
      */
-    void slotSetStatusResult(KIO::Job * job);
+    void slotSeStatusResult(KIO::Job * job);
 
     /// Result of getUserRights() job
     void slotGetUserRightsResult( KIO::Job* _job );
@@ -590,7 +590,7 @@ namespace KMail {
 
     /**
      * Emitted when changeSubscription() failed.
-     * @param errorMessage the error message that contains the reason for the failure
+     * @param errorMessage the error message that tqcontains the reason for the failure
      */
     void subscriptionChangeFailed( const TQString &errorMessage );
 
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index 560343689..b76c6d2cc 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -133,7 +133,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
       int a = cstr.find("\nX-UID: ");
       int b = cstr.find('\n', a);
       if (a != -1 && b != -1 && cstr.find("\n\n") > a) cstr.remove(a, b-a);
-      jd.data.resize( cstr.length() + cstr.contains( "\n" ) - cstr.contains( "\r\n" ) );
+      jd.data.resize( cstr.length() + cstr.tqcontains( "\n" ) - cstr.tqcontains( "\r\n" ) );
       unsigned int i = 0;
       char prevChar = '\0';
       // according to RFC 2060 we need CRLF
@@ -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->setStatus( 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->setStatus( 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->setStatus( 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->setStatus( errStr );
+      (*it).progressItem->seStatus( errStr );
     if ( account->handleJobError( job, errStr  ) )
       deleteLater();
     return;
diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp
index bdae8054d..b446ba0b1 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, minimumSize().height() );
+  resize( 500, tqminimumSize().height() );
 }
 
 void ImportArchiveDialog::setFolder( KMFolder *defaultFolder )
diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index 3a7de1981..cddf6a65e 100644
--- a/kmail/importjob.cpp
+++ b/kmail/importjob.cpp
@@ -39,11 +39,11 @@
 
 using namespace KMail;
 
-KMail::ImportJob::ImportJob( TQWidget *parentWidget )
-  : TQObject( parentWidget ),
+KMail::ImportJob::ImportJob( TQWidget *tqparentWidget )
+  : TQObject( tqparentWidget ),
     mArchive( 0 ),
     mRootFolder( 0 ),
-    mParentWidget( parentWidget ),
+    mParentWidget( tqparentWidget ),
     mNumberOfImportedMessages( 0 ),
     mCurrentFolder( 0 ),
     mCurrentMessage( 0 ),
@@ -211,7 +211,7 @@ void KMail::ImportJob::importNextMessage()
       return;
     }
     kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl;
-    mProgressItem->setStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) );
+    mProgressItem->seStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) );
   }
 
   mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) );
@@ -221,7 +221,7 @@ void KMail::ImportJob::importNextMessage()
   messages.files.removeFirst();
 
   mCurrentMessage = new KMMessage();
-  mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* setStatus */ );
+  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/importjob.h b/kmail/importjob.h
index ee7a0ac8b..170441415 100644
--- a/kmail/importjob.h
+++ b/kmail/importjob.h
@@ -55,7 +55,7 @@ class ImportJob : public TQObject
 
   public:
 
-    explicit ImportJob( TQWidget *parentWidget = 0 );
+    explicit ImportJob( TQWidget *tqparentWidget = 0 );
     ~ImportJob();
     void start();
     void setFile( const KURL &archiveFile );
diff --git a/kmail/index.cpp b/kmail/index.cpp
index ef1ba7de3..632315a52 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -60,15 +60,15 @@ const char* const folderIndexDisabledKey = "fulltextIndexDisabled";
 
 #ifdef HAVE_INDEXLIB
 static
-TQValueList<int> vectorToQValueList( const std::vector<Q_UINT32>& input ) {
+TQValueList<int> vectorToQValueList( const std::vector<TQ_UINT32>& input ) {
 	TQValueList<int> res;
 	std::copy( input.begin(), input.end(), std::back_inserter( res ) );
 	return res;
 }
 
 static
-std::vector<Q_UINT32> QValueListToVector( const TQValueList<int>& input ) {
-	std::vector<Q_UINT32> res;
+std::vector<TQ_UINT32> QValueListToVector( const TQValueList<int>& input ) {
+	std::vector<TQ_UINT32> res;
 	// res.assign( input.begin(), input.end() ) doesn't work for some reason
 	for ( TQValueList<int>::const_iterator first = input.begin(), past = input.end(); first != past; ++first ) {
 		res.push_back( *first );
@@ -91,10 +91,10 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
 	mSlowDown( false ) {
 	kdDebug( 5006 ) << "KMMsgIndex::KMMsgIndex()" << endl;
 
-	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotRemoveMessage( Q_UINT32 ) ) );
-	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotAddMessage( Q_UINT32 ) ) );
-	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotRemoveMessage( Q_UINT32 ) ) );
-	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotAddMessage( Q_UINT32 ) ) );
+	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( TQ_UINT32 ) ) );
+	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( TQ_UINT32 ) ) );
+	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( TQ_UINT32 ) ) );
+	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( TQ_UINT32 ) ) );
 
 	connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) );
 	//connect( mSyncTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( syncIndex() ) );
@@ -272,7 +272,7 @@ void KMMsgIndex::maintenance() {
 #endif
 }
 
-int KMMsgIndex::addMessage( Q_UINT32 serNum ) {
+int KMMsgIndex::addMessage( TQ_UINT32 serNum ) {
 	kdDebug( 5006 ) << "KMMsgIndex::addMessage( " << serNum << " )" << endl;
 	if ( mState == s_error ) return 0;
 #ifdef HAVE_INDEXLIB
@@ -407,7 +407,7 @@ bool KMMsgIndex::startQuery( KMSearch* s ) {
 	connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SIGNAL( finished( bool ) ) );
 	connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SLOT( indexFinished() ) );
 	connect( search, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( removeSearch( TQObject* ) ) );
-	connect( search, TQT_SIGNAL( found( Q_UINT32 ) ), s, TQT_SIGNAL( found( Q_UINT32 ) ) );
+	connect( search, TQT_SIGNAL( found( TQ_UINT32 ) ), s, TQT_SIGNAL( found( TQ_UINT32 ) ) );
 	mSearches.push_back( search );
 	return true;
 }
@@ -449,13 +449,13 @@ bool KMMsgIndex::stopQuery( KMSearch* s ) {
 	return false;
 }
 
-std::vector<Q_UINT32> KMMsgIndex::simpleSearch( TQString s, bool* ok ) const {
+std::vector<TQ_UINT32> KMMsgIndex::simpleSearch( TQString s, bool* ok ) const {
 	kdDebug( 5006 ) << "KMMsgIndex::simpleSearch( -" << s.latin1() << "- )" << endl;
 	if ( mState == s_error || mState == s_disabled ) {
 		if ( ok ) *ok = false;
-		return std::vector<Q_UINT32>();
+		return std::vector<TQ_UINT32>();
 	}
-	std::vector<Q_UINT32> res;
+	std::vector<TQ_UINT32> res;
 #ifdef HAVE_INDEXLIB
 	assert( mIndex );
 	std::vector<unsigned> residx = mIndex->search( s.latin1() )->list();
@@ -482,7 +482,7 @@ bool KMMsgIndex::canHandleQuery( const KMSearchPattern* pat ) const {
 	return false;
 }
 
-void KMMsgIndex::slotAddMessage( Q_UINT32 serNum ) {
+void KMMsgIndex::slotAddMessage( TQ_UINT32 serNum ) {
 	kdDebug( 5006 ) << "KMMsgIndex::slotAddMessage( . , " << serNum << " )" << endl;
 	if ( mState == s_error || mState == s_disabled ) return;
 
@@ -493,7 +493,7 @@ void KMMsgIndex::slotAddMessage( Q_UINT32 serNum ) {
 	scheduleAction();
 }
 
-void KMMsgIndex::slotRemoveMessage( Q_UINT32 serNum ) {
+void KMMsgIndex::slotRemoveMessage( TQ_UINT32 serNum ) {
 	kdDebug( 5006 ) << "KMMsgIndex::slotRemoveMessage( . , " << serNum << " )" << endl;
 	if ( mState == s_error || mState == s_disabled ) return;
 
@@ -509,7 +509,7 @@ void KMMsgIndex::scheduleAction() {
 #endif
 }
 
-void KMMsgIndex::removeMessage( Q_UINT32 serNum ) {
+void KMMsgIndex::removeMessage( TQ_UINT32 serNum ) {
 	kdDebug( 5006 ) << "KMMsgIndex::removeMessage( " << serNum << " )" << endl;
 	if ( mState == s_error || mState == s_disabled ) return;
 
@@ -550,7 +550,7 @@ void KMMsgIndex::Search::act() {
 			TQString terms;
 			for ( KMSearchRule* rule = pat->first(); rule; rule = pat->next() ) {
 				Q_ASSERT( rule->function() == KMSearchRule::FuncContains );
-				terms += TQString::fromLatin1( " %1 " ).arg( rule->contents() );
+				terms += TQString::tqfromLatin1( " %1 " ).arg( rule->contents() );
 			}
 
 			mValues = kmkernel->msgIndex()->simpleSearch( terms, 0  );
diff --git a/kmail/index.h b/kmail/index.h
index 91c69f2d7..5e7f16dce 100644
--- a/kmail/index.h
+++ b/kmail/index.h
@@ -74,7 +74,7 @@ class KMMsgIndex : public TQObject {
 		/**
 		 * Just return all the uids where the pattern exists
 		 */
-		std::vector<Q_UINT32> simpleSearch( TQString, bool* ) const;
+		std::vector<TQ_UINT32> simpleSearch( TQString, bool* ) const;
 
 		/**
 		 * Returns whether the folder is indexable. Only local and dimap
@@ -133,14 +133,14 @@ class KMMsgIndex : public TQObject {
 
 		void continueCreation();
 
-		void slotAddMessage( Q_UINT32 message );
-		void slotRemoveMessage( Q_UINT32 message );
+		void slotAddMessage( TQ_UINT32 message );
+		void slotRemoveMessage( TQ_UINT32 message );
 	private:
 		static TQString defaultPath();
 
 		bool canHandleQuery( const KMSearchPattern* ) const;
-		int addMessage( Q_UINT32 );
-		void removeMessage( Q_UINT32 );
+		int addMessage( TQ_UINT32 );
+		void removeMessage( TQ_UINT32 );
 
 		void scheduleAction();
 		bool creating() const;
@@ -151,16 +151,16 @@ class KMMsgIndex : public TQObject {
 		 * DO NOT USE THIS CLASS
 		 *
 		 * It is conceptually a private class.
-		 * Just needs to be public because of moc limitations
+		 * Just needs to be public because of tqmoc limitations
 		 */
 		class Search;
 	private:
 
-		std::vector<Q_UINT32> mPendingMsgs;
+		std::vector<TQ_UINT32> mPendingMsgs;
 		std::vector<KMFolder*> mPendingFolders;
-		std::vector<Q_UINT32> mAddedMsgs;
-		std::vector<Q_UINT32> mRemovedMsgs;
-		std::vector<Q_UINT32> mExisting;
+		std::vector<TQ_UINT32> mAddedMsgs;
+		std::vector<TQ_UINT32> mRemovedMsgs;
+		std::vector<TQ_UINT32> mExisting;
 
 		enum e_state {
 			s_idle, // doing nothing, index waiting
@@ -199,7 +199,7 @@ class KMMsgIndex::Search : public TQObject {
 		~Search();
 		KMSearch* search() const { return mSearch; }
 	signals:
-		void found( Q_UINT32 );
+		void found( TQ_UINT32 );
 		void finished( bool );
 	private slots:
 		void act();
@@ -211,7 +211,7 @@ class KMMsgIndex::Search : public TQObject {
 		 * handled by the index
 		 */
 		KMSearchPattern* mResidual;
-		std::vector<Q_UINT32> mValues;
+		std::vector<TQ_UINT32> mValues;
 		enum { s_none = 0, s_starting, s_emitting, s_emitstopped, s_done } mState;
 };
 
diff --git a/kmail/isubject.cpp b/kmail/isubject.cpp
index d231d365c..caf3ef5f1 100644
--- a/kmail/isubject.cpp
+++ b/kmail/isubject.cpp
@@ -18,12 +18,12 @@ namespace KMail {
 
   void ISubject::attach( Interface::Observer * pObserver )
   {
-    if ( qFind( mObserverList.begin(), mObserverList.end(), pObserver ) == mObserverList.end() )
+    if ( tqFind( mObserverList.begin(), mObserverList.end(), pObserver ) == mObserverList.end() )
       mObserverList.push_back( pObserver );
   }
 
   void ISubject::detach( Interface::Observer * pObserver ) {
-    TQValueVector<Interface::Observer*>::iterator it = qFind( mObserverList.begin(), mObserverList.end(), pObserver );
+    TQValueVector<Interface::Observer*>::iterator it = tqFind( mObserverList.begin(), mObserverList.end(), pObserver );
     if ( it != mObserverList.end() )
       mObserverList.erase( it );
   }
diff --git a/kmail/kcursorsaver.h b/kmail/kcursorsaver.h
index c18b42971..a93e92afb 100644
--- a/kmail/kcursorsaver.h
+++ b/kmail/kcursorsaver.h
@@ -13,9 +13,9 @@
 class KCursorSaver : public Qt
 {
 public:
-    /// constructor taking TQCursor shapes
-    KCursorSaver(Qt::CursorShape shape) {
-        TQApplication::setOverrideCursor( TQCursor(shape) );
+    /// constructor taking TQCursor tqshapes
+    KCursorSaver(Qt::tqCursorShape tqshape) {
+        TQApplication::setOverrideCursor( TQCursor(tqshape) );
         inited = true;
     }
 
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index 3c1a952ca..94edd591c 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -1379,7 +1379,7 @@ void Kleo::KeyResolver::collapseAllSplitInfos() {
     SplitInfo & si = v.front();
     for ( std::vector<SplitInfo>::const_iterator it = v.begin() + 1; it != v.end() ; ++it ) {
       si.keys.insert( si.keys.end(), it->keys.begin(), it->keys.end() );
-      qCopy( it->recipients.begin(), it->recipients.end(), std::back_inserter( si.recipients ) );
+      tqCopy( it->recipients.begin(), it->recipients.end(), std::back_inserter( si.recipients ) );
     }
     v.resize( 1 );
   }
@@ -1579,8 +1579,8 @@ std::vector<GpgME::Key> Kleo::KeyResolver::signingKeys( CryptoMessageFormat f )
 
 
 std::vector<GpgME::Key> Kleo::KeyResolver::selectKeys( const TQString & person, const TQString & msg, const std::vector<GpgME::Key> & selectedKeys ) const {
-  const bool opgp = containsOpenPGP( mCryptoMessageFormats );
-  const bool x509 = containsSMIME( mCryptoMessageFormats );
+  const bool opgp = tqcontainsOpenPGP( mCryptoMessageFormats );
+  const bool x509 = tqcontainsSMIME( mCryptoMessageFormats );
 
   Kleo::KeySelectionDialog dlg( i18n("Encryption Key Selection"),
 				msg, KPIM::getEmailAddress(person), selectedKeys,
@@ -1770,7 +1770,7 @@ Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreference
     return it->second;
 
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
-  const KABC::Addressee::List res = ab->findByEmail( address );
+  const KABC::Addressee::List res = ab->tqfindByEmail( address );
   ContactPreferences pref;
   if ( !res.isEmpty() ) {
     KABC::Addressee addr = res.first();
@@ -1792,7 +1792,7 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont
 {
   d->mContactPreferencesMap.insert( std::make_pair( email, pref ) );
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
-  KABC::Addressee::List res = ab->findByEmail( email );
+  KABC::Addressee::List res = ab->tqfindByEmail( email );
 
   KABC::Addressee addr;
   if ( res.isEmpty() ) {
diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp
index 2d29d3c9e..900264cd6 100644
--- a/kmail/khtmlparthtmlwriter.cpp
+++ b/kmail/khtmlparthtmlwriter.cpp
@@ -86,7 +86,7 @@ namespace KMail {
 
     mHtmlPart->view()->viewport()->setUpdatesEnabled( true );
     mHtmlPart->view()->setUpdatesEnabled( true );
-    mHtmlPart->view()->viewport()->repaint( false );
+    mHtmlPart->view()->viewport()->tqrepaint( false );
     mState = Ended;
   }
 
diff --git a/kmail/kleo_util.h b/kmail/kleo_util.h
index dc0eb6d2c..6baa874be 100644
--- a/kmail/kleo_util.h
+++ b/kmail/kleo_util.h
@@ -77,11 +77,11 @@ static inline bool isOpenPGP( Kleo::CryptoMessageFormat f ) {
   return f == Kleo::InlineOpenPGPFormat || f == Kleo::OpenPGPMIMEFormat ;
 }
 
-static inline bool containsSMIME( unsigned int f ) {
+static inline bool tqcontainsSMIME( unsigned int f ) {
   return f & (Kleo::SMIMEFormat|Kleo::SMIMEOpaqueFormat) ;
 }
 
-static inline bool containsOpenPGP( unsigned int f ) {
+static inline bool tqcontainsOpenPGP( unsigned int f ) {
   return f & (Kleo::OpenPGPMIMEFormat|Kleo::InlineOpenPGPFormat) ;
 }
 
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index ad0f55b30..8ddf6899a 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -12,7 +12,7 @@ using KMail::AccountManager;
 #include "messagesender.h"
 #include "kmmessage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmfoldercachedimap.h"
 
 #include "progressmanager.h"
@@ -45,7 +45,7 @@ using KMail::FolderJob;
 KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent)
   : TQObject(parent), mPrecommand(precommand)
 {
-  BroadcastStatus::instance()->setStatusMsg(
+  BroadcasStatus::instance()->seStatusMsg(
       i18n("Executing precommand %1").arg(precommand ));
 
   mPrecommandProcess.setUseShell(true);
@@ -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->setStatus(KMMsgStatusUnread);  // -sanders
-    //    aMsg->setStatus(KMMsgStatusRead);
+      aMsg->seStatus(KMMsgStatusUnread);  // -sanders
+    //    aMsg->seStatus(KMMsgStatusRead);
     else
-      aMsg->setStatus(KMMsgStatusNew);
+      aMsg->seStatus(KMMsgStatusNew);
   }
 /*
 TQFile fileD0( "testdat_xx-kmaccount-0" );
@@ -377,7 +377,7 @@ bool KMAccount::runPrecommand(const TQString &precommand)
 
   KMPrecommand precommandProcess(precommand, this);
 
-  BroadcastStatus::instance()->setStatusMsg(
+  BroadcasStatus::instance()->seStatusMsg(
       i18n("Executing precommand %1").arg(precommand ));
 
   connect(&precommandProcess, TQT_SIGNAL(finished(bool)),
@@ -426,9 +426,9 @@ TQString KMAccount::encryptStr(const TQString &aStr)
   TQString result;
   for (uint i = 0; i < aStr.length(); i++)
     /* yes, no typo. can't encode ' ' or '!' because
-       they're the unicode BOM. stupid scrambling. stupid. */
-    result += (aStr[i].unicode() <= 0x21 ) ? aStr[i] :
-      TQChar(0x1001F - aStr[i].unicode());
+       they're the tqunicode BOM. stupid scrambling. stupid. */
+    result += (aStr[i].tqunicode() <= 0x21 ) ? aStr[i] :
+      TQChar(0x1001F - aStr[i].tqunicode());
   return result;
 }
 
@@ -451,7 +451,7 @@ TQString KMAccount::importPassword(const TQString &aStr)
   return encryptStr(result);
 }
 
-void KMAccount::invalidateIMAPFolders()
+void KMAccount::tqinvalidateIMAPFolders()
 {
   // Default: Don't do anything. The IMAP account will handle it
 }
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 44cd67b0d..2872b1110 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -206,9 +206,9 @@ public:
   virtual void setHasInbox( bool has ) { mHasInbox = has; }
 
   /**
-   * If this account is a disconnected IMAP account, invalidate it.
+   * If this account is a disconnected IMAP account, tqinvalidate it.
    */
-  virtual void invalidateIMAPFolders();
+  virtual void tqinvalidateIMAPFolders();
 
   /**
    * Determines whether the account can be checked, currently.
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index b673b5e14..4fc57d2c1 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -336,12 +336,12 @@ void KMAcctCachedImap::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
   config.writeEntry( "groupwareType", mGroupwareType );
 }
 
-void KMAcctCachedImap::invalidateIMAPFolders()
+void KMAcctCachedImap::tqinvalidateIMAPFolders()
 {
-  invalidateIMAPFolders( mFolder );
+  tqinvalidateIMAPFolders( mFolder );
 }
 
-void KMAcctCachedImap::invalidateIMAPFolders( KMFolderCachedImap* folder )
+void KMAcctCachedImap::tqinvalidateIMAPFolders( KMFolderCachedImap* folder )
 {
   if( !folder || !folder->folder() )
     return;
@@ -361,7 +361,7 @@ void KMAcctCachedImap::invalidateIMAPFolders( KMFolderCachedImap* folder )
     KMFolder *f = *it;
     if( f && f->folderType() == KMFolderTypeCachedImap ) {
       KMFolderCachedImap *cfolder = static_cast<KMFolderCachedImap*>(f->storage());
-      // This invalidates the folder completely
+      // This tqinvalidates the folder completely
       cfolder->setUidValidity("INVALID");
       cfolder->writeUidCache();
     }
diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h
index 72ed5c7db..5c3aa6c3b 100644
--- a/kmail/kmacctcachedimap.h
+++ b/kmail/kmacctcachedimap.h
@@ -97,8 +97,8 @@ public:
   /**
    * Invalidate the local cache.
    */
-  virtual void invalidateIMAPFolders();
-  virtual void invalidateIMAPFolders( KMFolderCachedImap* );
+  virtual void tqinvalidateIMAPFolders();
+  virtual void tqinvalidateIMAPFolders( KMFolderCachedImap* );
 
   /**
    * Remember that a folder got explicitely deleted - including all child folders
diff --git a/kmail/kmacctfolder.h b/kmail/kmacctfolder.h
index 97dca0d75..6545d4e62 100644
--- a/kmail/kmacctfolder.h
+++ b/kmail/kmacctfolder.h
@@ -24,7 +24,7 @@
 
 class KMAccount;
 
-/** Simple wrapper class that contains the kmail account handling
+/** Simple wrapper class that tqcontains the kmail account handling
  * stuff that is usually not required outside kmail.
  *
  * WARNING: do not add virtual methods in this class. This class is
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index 4ead745c7..12d17af89 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -28,7 +28,7 @@ using KMail::SieveConfig;
 
 #include "kmmessage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmfoldertree.h"
 #include "kmfoldermgr.h"
 #include "kmfolderimap.h"
@@ -395,7 +395,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
   if ( mMailCheckProgressItem ) {
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->setStatus( folder->prettyURL() + i18n(" completed") );
+    mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") );
   }
   mCountRemainChecks--;
 
@@ -410,8 +410,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
   }
 
   // Filter messages
-  TQValueListIterator<Q_UINT32> filterIt = mFilterSerNums.begin();
-  TQValueList<Q_UINT32> inTransit;
+  TQValueListIterator<TQ_UINT32> filterIt = mFilterSerNums.begin();
+  TQValueList<TQ_UINT32> inTransit;
 
   if (ActionScheduler::isEnabled() ||
       kmkernel->filterMgr()->atLeastOneOnlineImapFolderTarget()) {
@@ -420,7 +420,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
     if (!mScheduler) {
 	mScheduler = new KMail::ActionScheduler( set, filters );
 	mScheduler->setAccountId( id() );
-	connect( mScheduler, TQT_SIGNAL(filtered(Q_UINT32)), this, TQT_SLOT(slotFiltered(Q_UINT32)) );
+	connect( mScheduler, TQT_SIGNAL(filtered(TQ_UINT32)), this, TQT_SLOT(slotFiltered(TQ_UINT32)) );
     } else {
 	mScheduler->setFilterList( filters );
     }
@@ -496,7 +496,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
 }
 
 //-----------------------------------------------------------------------------
-void KMAcctImap::slotFiltered(Q_UINT32 serNum)
+void KMAcctImap::slotFiltered(TQ_UINT32 serNum)
 {
     mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) );
 }
@@ -577,10 +577,10 @@ void KMAcctImap::slotFolderSelected( KMFolderImap* folder, bool )
   folder->close( "acctimap" );
 }
 
-void KMAcctImap::execFilters(Q_UINT32 serNum)
+void KMAcctImap::execFilters(TQ_UINT32 serNum)
 {
   if ( !kmkernel->filterMgr()->atLeastOneFilterAppliesTo( id() ) ) return;
-  TQValueListIterator<Q_UINT32> findIt = mFilterSerNums.find( serNum );
+  TQValueListIterator<TQ_UINT32> findIt = mFilterSerNums.find( serNum );
   if ( findIt != mFilterSerNums.end() )
       return;
   mFilterSerNums.append( serNum );
@@ -594,7 +594,7 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg )
     return -1;
   }
   msg->setTransferInProgress(false);
-  Q_UINT32 serNum = msg->getMsgSerNum();
+  TQ_UINT32 serNum = msg->getMsgSerNum();
   if ( serNum )
     mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) );
 
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index fac17eebe..f3fcc693f 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -92,13 +92,13 @@ public:
   /**
    * Queues a message for automatic filtering
    */
-  void execFilters(Q_UINT32 serNum);
+  void execFilters(TQ_UINT32 serNum);
     
 public slots:
   /**
    * updates the new-mail-check folderlist
    */
-  void slotFiltered(Q_UINT32 serNum);
+  void slotFiltered(TQ_UINT32 serNum);
   void slotUpdateFolderList();
 
 protected:
@@ -144,7 +144,7 @@ private:
   int mCountRemainChecks;
   /** used to reset connection errors */
   TQTimer mErrorTimer;
-  TQValueList<Q_UINT32> mFilterSerNums;
+  TQValueList<TQ_UINT32> mFilterSerNums;
   TQDict<int> mFilterSerNumsToSave;
   KMail::ActionScheduler *mScheduler;
 };
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index d1e15f83a..47e04f33b 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -8,7 +8,7 @@
 #include "kmfoldermbox.h"
 #include "kmacctfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
@@ -103,7 +103,7 @@ bool KMAcctLocal::preProcess()
   if ( precommand().isEmpty() ) {
     TQFileInfo fi( location() );
     if ( fi.size() == 0 ) {
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
       checkDone( mHasNewMail, CheckOK );
       return false;
     }
@@ -119,12 +119,12 @@ bool KMAcctLocal::preProcess()
 
   if (!mFolder) {
     checkDone( mHasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return false;
   }
 
-  //BroadcastStatus::instance()->reset();
-  BroadcastStatus::instance()->setStatusMsg(
+  //BroadcasStatus::instance()->reset();
+  BroadcasStatus::instance()->seStatusMsg(
         i18n("Preparing transmission from \"%1\"...").arg(mName));
 
 
@@ -142,7 +142,7 @@ bool KMAcctLocal::preProcess()
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( mHasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Running precommand failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Running precommand failed." ));
     return false;
   }
 
@@ -155,7 +155,7 @@ bool KMAcctLocal::preProcess()
     kdDebug(5006) << "cannot open file " << mMailFolder->path() << "/"
       << mMailFolder->name() << endl;
     checkDone( mHasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return false;
   }
 
@@ -165,7 +165,7 @@ bool KMAcctLocal::preProcess()
     checkDone( mHasNewMail, CheckError );
     TQString errMsg = i18n( "Transmission failed: Could not lock %1." )
       .arg( mMailFolder->location() );
-    BroadcastStatus::instance()->setStatusMsg( errMsg );
+    BroadcasStatus::instance()->seStatusMsg( errMsg );
     return false;
   }
 
@@ -179,7 +179,7 @@ bool KMAcctLocal::preProcess()
   mStatusMsgStub = i18n("Moving message %3 of %2 from %1.")
     .arg(mMailFolder->location()).arg( mNumMsgs );
 
-  //BroadcastStatus::instance()->setStatusProgressEnable( "L" + mName, true );
+  //BroadcasStatus::instance()->seStatusProgressEnable( "L" + mName, true );
   return true;
 }
 
@@ -193,10 +193,10 @@ bool KMAcctLocal::fetchMsg()
   if (kmkernel->mailCheckAborted()) break; */
 
   const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched );
-  //BroadcastStatus::instance()->setStatusMsg( statusMsg );
+  //BroadcasStatus::instance()->seStatusMsg( statusMsg );
   mMailCheckProgressItem->incCompletedItems();
   mMailCheckProgressItem->updateProgress();
-  mMailCheckProgressItem->setStatus( 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->setStatus(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));
@@ -249,8 +249,8 @@ void KMAcctLocal::postProcess()
     }
 
     if( mMailCheckProgressItem ) { // do this only once...
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, mNumMsgs );
-      mMailCheckProgressItem->setStatus(
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
+      mMailCheckProgressItem->seStatus(
         i18n( "Fetched 1 message from mailbox %1.",
               "Fetched %n messages from mailbox %1.",
               mNumMsgs ).arg( mMailFolder->location() ) );
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index b3c5d31c7..ca3789207 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -9,7 +9,7 @@
 #include "kmfoldermaildir.h"
 #include "kmacctfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
@@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool)
     TQFileInfo fi( location() );
     if ( !fi.exists() ) {
       checkDone( hasNewMail, CheckOK );
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
       return;
     }
   }
@@ -102,11 +102,11 @@ void KMAcctMaildir::processNewMail(bool)
 
   if (!mFolder) {
     checkDone( hasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
-  BroadcastStatus::instance()->setStatusMsg(
+  BroadcasStatus::instance()->seStatusMsg(
 	i18n("Preparing transmission from \"%1\"...").arg(mName));
 
   Q_ASSERT( !mMailCheckProgressItem );
@@ -123,7 +123,7 @@ void KMAcctMaildir::processNewMail(bool)
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( hasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
@@ -134,7 +134,7 @@ void KMAcctMaildir::processNewMail(bool)
     KMessageBox::sorry(0, aStr);
     kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl;
     checkDone( hasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
@@ -156,7 +156,7 @@ void KMAcctMaildir::processNewMail(bool)
   {
 
     if( kmkernel->mailCheckAborted() ) {
-      BroadcastStatus::instance()->setStatusMsg( i18n("Transmission aborted.") );
+      BroadcasStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
       num = i;
       addedOk = false;
     }
@@ -165,12 +165,12 @@ void KMAcctMaildir::processNewMail(bool)
     TQString statusMsg = statusMsgStub.arg(i);
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->setStatus( statusMsg );
+    mMailCheckProgressItem->seStatus( statusMsg );
 
     msg = mailFolder.take(0);
     if (msg)
     {
-      msg->setStatus(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));
@@ -188,8 +188,8 @@ void KMAcctMaildir::processNewMail(bool)
   }
 
   if( mMailCheckProgressItem ) { // do this only once...
-    BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( num );
-    mMailCheckProgressItem->setStatus(
+    BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( num );
+    mMailCheckProgressItem->seStatus(
       i18n( "Fetched 1 message from maildir folder %1.",
             "Fetched %n messages from maildir folder %1.",
             num ).arg(mailFolder.location() ) );
@@ -199,7 +199,7 @@ void KMAcctMaildir::processNewMail(bool)
   }
   if (addedOk)
   {
-    BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, num );
+    BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
   }
   // else warning is written already
 
diff --git a/kmail/kmailIface.h b/kmail/kmailIface.h
index 2338a4c40..eb4677f71 100644
--- a/kmail/kmailIface.h
+++ b/kmail/kmailIface.h
@@ -176,7 +176,7 @@ k_dcop_hidden:
       @param messageId this parameter is ignored.
   */
   /*  @TODO Get rid of the messageId parameter.  */
-  virtual bool showMail( Q_UINT32 serialNumber, TQString messageId ) = 0;
+  virtual bool showMail( TQ_UINT32 serialNumber, TQString messageId ) = 0;
 
   /**
    * DCOP-enabled for KMailUniqueAppHandler in the kontact plugin
@@ -193,9 +193,9 @@ k_dcop_hidden:
    *
    * DCOP-enabled for use in kaddressbook drop
    */
-  virtual TQString getFrom( Q_UINT32 serialNumber ) = 0;
+  virtual TQString getFrom( TQ_UINT32 serialNumber ) = 0;
   virtual TQString debugScheduler() = 0;
-  virtual TQString debugSernum( Q_UINT32 serialNumber ) = 0;
+  virtual TQString debugSernum( TQ_UINT32 serialNumber ) = 0;
 
   /** Does essentially the same as dcopAddMessage except that it doesn't reject
       duplicate messages.
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 22d48f1ee..cb40bc30a 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -60,10 +60,10 @@ using KRecentAddress::RecentAddresses;
 typedef KParts::GenericFactory< KMailPart > KMailFactory;
 K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory )
 
-KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
+KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName,
 		     TQObject *parent, const char *name, const TQStringList &) :
   DCOPObject("KMailIface"), KParts::ReadOnlyPart(parent, name),
-  mParentWidget( parentWidget )
+  mParentWidget( tqparentWidget )
 {
   kdDebug(5006) << "KMailPart()" << endl;
   kdDebug(5006) << "  InstanceName: " << kapp->instanceName() << endl;
@@ -99,7 +99,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
   kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
 
   // create a canvas to insert our widget
-  TQWidget *canvas = new TQWidget(parentWidget, widgetName);
+  TQWidget *canvas = new TQWidget(tqparentWidget, widgetName);
   canvas->setFocusPolicy(TQWidget::ClickFocus);
   setWidget(canvas);
   KGlobal::iconLoader()->addAppDir("kmail");
@@ -223,7 +223,7 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
   mainWidget->initializeFilterActions();
   mainWidget->initializeFolderShortcutActions();
   mainWidget->setupForwardingActionsList();
-  mainWidget->updateVactionScriptStatus();
+  mainWidget->updateVactionScripStatus();
 }
 
 void KMailPart::exit()
@@ -231,7 +231,7 @@ void KMailPart::exit()
   delete this;
 }
 
-TQWidget* KMailPart::parentWidget() const
+TQWidget* KMailPart::tqparentWidget() const
 {
   return mParentWidget;
 }
@@ -244,7 +244,7 @@ KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *parent )
 
 KMainWindow * KMailStatusBarExtension::mainWindow() const
 {
-  return static_cast<KMainWindow*>( mParent->parentWidget() );
+  return static_cast<KMainWindow*>( mParent->tqparentWidget() );
 }
 
 #include "kmail_part.moc"
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 97a667518..69203db9b 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -53,11 +53,11 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
 {
     Q_OBJECT
   public:
-    KMailPart(TQWidget *parentWidget, const char *widgetName,
+    KMailPart(TQWidget *tqparentWidget, const char *widgetName,
               TQObject *parent, const char *name, const TQStringList &);
     virtual ~KMailPart();
 
-    TQWidget* parentWidget() const;
+    TQWidget* tqparentWidget() const;
 
     static KAboutData *createAboutData();
 
diff --git a/kmail/kmailicalIface.h b/kmail/kmailicalIface.h
index fc1b7a815..91f15df53 100644
--- a/kmail/kmailicalIface.h
+++ b/kmail/kmailicalIface.h
@@ -75,18 +75,18 @@ k_dcop:
   virtual KMailICalIface::StorageFormat storageFormat( const TQString& resource ) = 0;
 
   virtual KURL getAttachment( const TQString& resource,
-                              Q_UINT32 sernum,
+                              TQ_UINT32 sernum,
                               const TQString& filename ) = 0;
   virtual TQString attachmentMimetype( const TQString &resource,
-                                      Q_UINT32 sernum,
+                                      TQ_UINT32 sernum,
                                       const TQString &filename ) = 0;
 
-  virtual TQStringList listAttachments( const TQString &resource, Q_UINT32 sernum ) = 0;
+  virtual TQStringList listAttachments( const TQString &resource, TQ_UINT32 sernum ) = 0;
 
   /// Update a kolab storage entry. Returns the new mail serial number,
   /// or 0 if something went wrong. Can be used for adding as well.
-  virtual Q_UINT32 update( const TQString& resource,
-                           Q_UINT32 sernum,
+  virtual TQ_UINT32 update( const TQString& resource,
+                           TQ_UINT32 sernum,
                            const TQString& subject,
                            const TQString& plainTextBody,
                            const TQMap<TQCString, TQString>& customHeaders,
@@ -96,14 +96,14 @@ k_dcop:
                            const TQStringList& deletedAttachments ) = 0;
 
   virtual bool deleteIncidenceKolab( const TQString& resource,
-                                     Q_UINT32 sernum ) = 0;
+                                     TQ_UINT32 sernum ) = 0;
 
   /// Return the number of mails that need to be looked at by incidencesKolab.
   /// This allows to call incidencesKolab in chunks.
   virtual int incidencesKolabCount( const TQString& mimetype /*ignored*/,
                                     const TQString& resource ) = 0;
 
-  virtual TQMap<Q_UINT32, TQString> incidencesKolab( const TQString& mimetype,
+  virtual TQMap<TQ_UINT32, TQString> incidencesKolab( const TQString& mimetype,
                                                    const TQString& resource,
                                                    int startIndex,
                                                    int nbMessages ) = 0;
@@ -140,8 +140,8 @@ k_dcop:
 
 k_dcop_signals:
   void incidenceAdded( const TQString& type, const TQString& folder,
-                       Q_UINT32 sernum, int format, const TQString& entry );
-  void asyncLoadResult( const TQMap<Q_UINT32, TQString>, const TQString& type,
+                       TQ_UINT32 sernum, int format, const TQString& entry );
+  void asyncLoadResult( const TQMap<TQ_UINT32, TQString>, const TQString& type,
                         const TQString& folder );
   void incidenceDeleted( const TQString& type, const TQString& folder,
                          const TQString& uid );
@@ -164,14 +164,14 @@ inline TQDataStream& operator>>( TQDataStream& str, KMailICalIface::SubResource&
 
 inline TQDataStream& operator<<( TQDataStream& str, const KMailICalIface::StorageFormat& format  )
 {
-  Q_UINT32 foo = format;
+  TQ_UINT32 foo = format;
   str << foo;
   return str;
 }
 
 inline TQDataStream& operator>>( TQDataStream& str, KMailICalIface::StorageFormat& format  )
 {
-  Q_UINT32 foo;
+  TQ_UINT32 foo;
   str >> foo;
   format = ( KMailICalIface::StorageFormat )foo;
   return str;
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 05524e027..41e9f96d7 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -236,7 +236,7 @@ inline static void debugBodyParts( const char*, const KMMessage& ) {}
 
 // Add (or overwrite, resp.) an attachment in an existing mail,
 // attachments must be local files, they are identified by their names.
-// If lookupByName if false the attachment to replace is looked up by mimetype.
+// If lookupByName if false the attachment to tqreplace is looked up by mimetype.
 // return value: wrong if attachment could not be added/updated
 bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg,
                                            const TQString& attachmentURL,
@@ -325,7 +325,7 @@ bool KMailICalIfaceImpl::kolabXMLFoundAndDecoded( const KMMessage& msg, const TQ
 // Delete an attachment in an existing mail.
 // return value: wrong if attachment could not be deleted
 //
-// This code could be optimized: for now we just replace
+// This code could be optimized: for now we just tqreplace
 // the attachment by an empty dummy attachment since Mimelib
 // does not provide an option for deleting attachments yet.
 bool KMailICalIfaceImpl::deleteAttachment( KMMessage& msg,
@@ -402,7 +402,7 @@ static void setXMLContentTypeHeader( KMMessage *msg, const TQString plainTextBod
 }
 
 // Store a new entry that was received from the resource
-Q_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
+TQ_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
                                                 const TQString& subject,
                                                 const TQString& plainTextBody,
                                                 const TQMap<TQCString, TQString>& customHeaders,
@@ -412,7 +412,7 @@ Q_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
 {
   kdDebug(5006) << "KMailICalIfaceImpl::addIncidenceKolab( " << attachmentNames << " )" << endl;
 
-  Q_UINT32 sernum = 0;
+  TQ_UINT32 sernum = 0;
   bool bAttachOK = true;
 
   // Make a new message for the incidence
@@ -477,7 +477,7 @@ Q_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
 }
 
 bool KMailICalIfaceImpl::deleteIncidenceKolab( const TQString& resource,
-                                               Q_UINT32 sernum )
+                                               TQ_UINT32 sernum )
 {
   // Find the message from the serial number and delete it.
   if( !mUseResourceIMAP )
@@ -530,7 +530,7 @@ int KMailICalIfaceImpl::incidencesKolabCount( const TQString& mimetype,
   return n;
 }
 
-TQMap<Q_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString& mimetype,
+TQMap<TQ_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString& mimetype,
                                                              const TQString& resource,
                                                              int startIndex,
                                                              int nbMessages )
@@ -539,7 +539,7 @@ TQMap<Q_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString& m
   /// TQMap with serialNumber/attachment pairs.
   /// (serial numbers of the mail are provided for easier later update)
 
-  TQMap<Q_UINT32, TQString> aMap;
+  TQMap<TQ_UINT32, TQString> aMap;
   if( !mUseResourceIMAP )
     return aMap;
 
@@ -613,7 +613,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
 
   KMFolder *parent = msg->parent();
   Q_ASSERT( parent );
-  Q_UINT32 sernum = msg->getMsgSerNum();
+  TQ_UINT32 sernum = msg->getMsgSerNum();
 
   // do we have an accumulator for this folder?
   Accumulator *ac = mAccumulators.find( parent->location() );
@@ -622,7 +622,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
     if ( !vPartFoundAndDecoded( msg, s ) ) return;
     TQString uid( "UID" );
     vPartMicroParser( s, uid );
-    const Q_UINT32 sernum = msg->getMsgSerNum();
+    const TQ_UINT32 sernum = msg->getMsgSerNum();
     mUIDToSerNum.insert( uid, sernum );
     ac->add( s );
     if( ac->isFull() ) {
@@ -637,7 +637,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
      slotIncidenceAdded( msg->parent(), msg->getMsgSerNum() );
   }
 
-  if ( mTheUnGetMes.contains( sernum ) ) {
+  if ( mTheUnGetMes.tqcontains( sernum ) ) {
     mTheUnGetMes.remove( sernum );
     int i = 0;
     KMFolder* folder = 0;
@@ -666,24 +666,24 @@ int KMailICalIfaceImpl::dimapAccounts()
 
 static TQString subresourceLabelForPresentation( const KMFolder * folder )
 {
-    if( KMailICalIfaceImpl::getResourceMap()->contains( folder->location() ) ) {
+    if( KMailICalIfaceImpl::getResourceMap()->tqcontains( folder->location() ) ) {
         return folder->label();
     }
 
     TQString label = folder->prettyURL();
-    TQStringList parts = TQStringList::split( TQString::fromLatin1("/"), label );
+    TQStringList parts = TQStringList::split( TQString::tqfromLatin1("/"), 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::fromLatin1("user") ) {
+    if ( parts[1] == TQString::tqfromLatin1("user") ) {
         TQStringList remainder(parts);
         remainder.pop_front();
         remainder.pop_front();
         remainder.pop_front();
         label = i18n("%1's %2")
             .arg( parts[2] )
-            .arg( remainder.join( TQString::fromLatin1("/") ) );
+            .arg( remainder.join( TQString::tqfromLatin1("/") ) );
     }
     // 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)")
-              .arg( remainder.join( TQString::fromLatin1("/") ),
+              .arg( remainder.join( TQString::tqfromLatin1("/") ),
                     static_cast<const KMFolderCachedImap*>( folder->storage() )->account()->name() );
           } else {
             label = i18n("My %1")
-              .arg( remainder.join( TQString::fromLatin1("/") ) );
+              .arg( remainder.join( TQString::tqfromLatin1("/") ) );
           }
         } else {
           label = i18n("My %1")
-              .arg( remainder.join( TQString::fromLatin1("/") ) );
+              .arg( remainder.join( TQString::tqfromLatin1("/") ) );
         }
         break;
       }
@@ -812,8 +812,8 @@ KMailICalIfaceImpl::StorageFormat KMailICalIfaceImpl::storageFormat( const TQStr
   // number, and the mail is just added instead. In this case
   // the deletedAttachments can be forgotten.
 */
-Q_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
-                                     Q_UINT32 sernum,
+TQ_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
+                                     TQ_UINT32 sernum,
                                      const TQString& subject,
                                      const TQString& plainTextBody,
                                      const TQMap<TQCString, TQString>& customHeaders,
@@ -822,7 +822,7 @@ Q_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
                                      const TQStringList& attachmentNames,
                                      const TQStringList& deletedAttachments )
 {
-  Q_UINT32 rc = 0;
+  TQ_UINT32 rc = 0;
 
    if( !mUseResourceIMAP )
     return rc;
@@ -931,7 +931,7 @@ Q_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
 }
 
 KURL KMailICalIfaceImpl::getAttachment( const TQString& resource,
-                                        Q_UINT32 sernum,
+                                        TQ_UINT32 sernum,
                                         const TQString& filename )
 {
   // This finds the attachment with the filename, saves it to a
@@ -991,7 +991,7 @@ KURL KMailICalIfaceImpl::getAttachment( const TQString& resource,
 }
 
 TQString KMailICalIfaceImpl::attachmentMimetype( const TQString & resource,
-                                                Q_UINT32 sernum,
+                                                TQ_UINT32 sernum,
                                                 const TQString & filename )
 {
   if( !mUseResourceIMAP )
@@ -1020,7 +1020,7 @@ TQString KMailICalIfaceImpl::attachmentMimetype( const TQString & resource,
   return TQString();
 }
 
-TQStringList KMailICalIfaceImpl::listAttachments(const TQString & resource, Q_UINT32 sernum)
+TQStringList KMailICalIfaceImpl::listAttachments(const TQString & resource, TQ_UINT32 sernum)
 {
   TQStringList rv;
   if( !mUseResourceIMAP )
@@ -1044,7 +1044,7 @@ TQStringList KMailICalIfaceImpl::listAttachments(const TQString & resource, Q_UI
         TQString name;
         DwMediaType& contentType = part->Headers().ContentType();
         if ( TQString( contentType.SubtypeStr().c_str() ).startsWith( "x-vnd.kolab." )
-           || TQString( contentType.SubtypeStr().c_str() ).contains( "tnef" ) )
+           || TQString( contentType.SubtypeStr().c_str() ).tqcontains( "tnef" ) )
           continue;
         if ( !part->Headers().ContentDisposition().Filename().empty() )
           name = part->Headers().ContentDisposition().Filename().c_str();
@@ -1080,7 +1080,7 @@ void KMailICalIfaceImpl::slotFolderRemoved( KMFolder* folder )
 
 // KMail added a file to one of the groupware folders
 void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
-                                             Q_UINT32 sernum )
+                                             TQ_UINT32 sernum )
 {
   if( mResourceQuiet || !mUseResourceIMAP )
     return;
@@ -1127,11 +1127,11 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
         folder->unGetMsg( i );
       return;
     }
-    const Q_UINT32 sernum = msg->getMsgSerNum();
+    const TQ_UINT32 sernum = msg->getMsgSerNum();
     mUIDToSerNum.insert( uid, sernum );
 
     // tell the resource if we didn't trigger this ourselves
-    if ( mInTransit.contains( uid ) ) {
+    if ( mInTransit.tqcontains( uid ) ) {
       mInTransit.remove( uid );
     }
     incidenceAdded( type, folder->location(), sernum, format, s );
@@ -1150,7 +1150,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
 
 // KMail deleted a file
 void KMailICalIfaceImpl::slotIncidenceDeleted( KMFolder* folder,
-                                               Q_UINT32 sernum )
+                                               TQ_UINT32 sernum )
 {
   if( mResourceQuiet || !mUseResourceIMAP )
     return;
@@ -1311,33 +1311,33 @@ TQString KMailICalIfaceImpl::folderName( KFolderTreeItem::Type type, int languag
        GroupwarePage in configuredialog.cpp */
 
     // English
-    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");
+    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");
 
     // German
-    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");
+    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");
 
     // French
-    folderNames[2][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendrier");
+    folderNames[2][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendrier");
     // Tasks = Tâches (â == 0xE2 in latin1)
-    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");
+    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");
 
     // Dutch
-    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");
+    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");
   }
 
   if( language < 0 || language > 3 ) {
@@ -1352,7 +1352,7 @@ TQString KMailICalIfaceImpl::folderName( KFolderTreeItem::Type type, int languag
 // Find message matching a given UID
 KMMessage *KMailICalIfaceImpl::findMessageByUID( const TQString& uid, KMFolder* folder )
 {
-  if( !folder || !mUIDToSerNum.contains( uid ) ) return 0;
+  if( !folder || !mUIDToSerNum.tqcontains( uid ) ) return 0;
   int i;
   KMFolder *aFolder;
   KMMsgDict::instance()->getLocation( mUIDToSerNum[uid], &aFolder, &i );
@@ -1361,7 +1361,7 @@ KMMessage *KMailICalIfaceImpl::findMessageByUID( const TQString& uid, KMFolder*
 }
 
 // Find message matching a given serial number
-KMMessage *KMailICalIfaceImpl::findMessageBySerNum( Q_UINT32 serNum, KMFolder* folder )
+KMMessage *KMailICalIfaceImpl::findMessageBySerNum( TQ_UINT32 serNum, KMFolder* folder )
 {
   if( !folder ) return 0;
 
@@ -1560,7 +1560,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
 {
   /* Steffen said: you must issue an authenticated HTTP GET request to
      https://kolabserver/freebusy/trigger/user@domain/Folder/NestedFolder.pfb
-     (replace .pfb with .xpfb for extended fb lists). */
+     (tqreplace .pfb with .xpfb for extended fb lists). */
   KURL httpURL( folderURL );
   // Keep username ("user@domain"), pass, and host from the imap url
   httpURL.setProtocol( "https" );
@@ -1575,7 +1575,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
     return;
   }
   if ( path.startsWith( "/INBOX/", false ) ) {
-    // If INBOX, replace it with the username (which is user@domain)
+    // If INBOX, tqreplace it with the username (which is user@domain)
     path = path.mid( secondSlash );
     path.prepend( folderURL.user() );
   } else {
@@ -1922,8 +1922,8 @@ void KMailICalIfaceImpl::readConfig()
         KMFolderCachedImap *imapFolder = static_cast<KMFolderCachedImap*>( storage );
 
         const TQString attributes = imapFolder->folderAttributes();
-        if ( attributes.contains( "X-FolderClass" ) ) {
-          if ( !attributes.contains( "X-SpecialFolder" ) || (*it)->location().contains( "@" ) ) {
+        if ( attributes.tqcontains( "X-FolderClass" ) ) {
+          if ( !attributes.tqcontains( "X-SpecialFolder" ) || (*it)->location().tqcontains( "@" ) ) {
             const Scalix::FolderAttributeParser parser( attributes );
             if ( !parser.folderClass().isEmpty() ) {
               FolderContentsType type = Scalix::Utils::scalixIdToContentsType( parser.folderClass() );
@@ -2051,7 +2051,7 @@ KMFolder* KMailICalIfaceImpl::initScalixFolder( KMail::FolderContentsType conten
       KMFolderCachedImap *imapFolder = static_cast<KMFolderCachedImap*>( storage );
 
       const TQString attributes = imapFolder->folderAttributes();
-      if ( attributes.contains( "X-SpecialFolder" ) ) {
+      if ( attributes.tqcontains( "X-SpecialFolder" ) ) {
         const Scalix::FolderAttributeParser parser( attributes );
         if ( contentsType == Scalix::Utils::scalixIdToContentsType( parser.folderClass() ) ) {
           folder = *it;
@@ -2084,10 +2084,10 @@ KMFolder* KMailICalIfaceImpl::initScalixFolder( KMail::FolderContentsType conten
 void KMailICalIfaceImpl::connectFolder( KMFolder* folder )
 {
   // avoid multiple connections
-  disconnect( folder, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-              this, TQT_SLOT( slotIncidenceAdded( KMFolder*, Q_UINT32 ) ) );
-  disconnect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-              this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, Q_UINT32 ) ) );
+  disconnect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+              this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) );
+  disconnect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+              this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) );
   disconnect( folder, TQT_SIGNAL( expunged( KMFolder* ) ),
               this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) );
   disconnect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ),
@@ -2098,10 +2098,10 @@ void KMailICalIfaceImpl::connectFolder( KMFolder* folder )
               this, TQT_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) );
 
   // Setup the signals to listen for changes
-  connect( folder, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-           this, TQT_SLOT( slotIncidenceAdded( KMFolder*, Q_UINT32 ) ) );
-  connect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-           this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, Q_UINT32 ) ) );
+  connect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+           this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) );
+  connect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+           this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) );
   connect( folder, TQT_SIGNAL( expunged( KMFolder* ) ),
            this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) );
   connect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ),
@@ -2139,15 +2139,15 @@ TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const
     return TQString::null;
 
   if( type == KFolderTreeItem::Contacts )
-    return TQString::fromLatin1( "kmgroupware_folder_contacts" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_contacts" );
   else if( type == KFolderTreeItem::Calendar )
-    return TQString::fromLatin1( "kmgroupware_folder_calendar" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_calendar" );
   else if( type == KFolderTreeItem::Notes )
-    return TQString::fromLatin1( "kmgroupware_folder_notes" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_notes" );
   else if( type == KFolderTreeItem::Tasks )
-    return TQString::fromLatin1( "kmgroupware_folder_tasks" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_tasks" );
   else if( type == KFolderTreeItem::Journals )
-    return TQString::fromLatin1( "kmgroupware_folder_journals" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_journals" );
 
   return TQString::null;
 }
diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h
index c0308f928..ae2d1d6ec 100644
--- a/kmail/kmailicalifaceimpl.h
+++ b/kmail/kmailicalifaceimpl.h
@@ -31,7 +31,7 @@
     your version.
 */
 
-/** @file This file contains the class KMailICalIfaceImpl which actually
+/** @file This file tqcontains the class KMailICalIfaceImpl which actually
 * implements the ICal (DCOP) interface for KMail.
 */
 
@@ -95,8 +95,8 @@ public:
   /// given the subject as Subject: header.
   /// Returns the new mail serial number,
   /// or 0 if something went wrong,
-  Q_UINT32 update( const TQString& resource,
-                   Q_UINT32 sernum,
+  TQ_UINT32 update( const TQString& resource,
+                   TQ_UINT32 sernum,
                    const TQString& subject,
                    const TQString& plainTextBody,
                    const TQMap<TQCString, TQString>& customHeaders,
@@ -106,10 +106,10 @@ public:
                    const TQStringList& deletedAttachments );
 
   bool deleteIncidenceKolab( const TQString& resource,
-                             Q_UINT32 sernum );
+                             TQ_UINT32 sernum );
   int incidencesKolabCount( const TQString& mimetype,
                             const TQString& resource );
-  TQMap<Q_UINT32, TQString> incidencesKolab( const TQString& mimetype,
+  TQMap<TQ_UINT32, TQString> incidencesKolab( const TQString& mimetype,
                                            const TQString& resource,
                                            int startIndex,
                                            int nbMessages );
@@ -122,14 +122,14 @@ public:
   // "Get" an attachment. This actually saves the attachment in a file
   // and returns a URL to it
   KURL getAttachment( const TQString& resource,
-                      Q_UINT32 sernum,
+                      TQ_UINT32 sernum,
                       const TQString& filename );
 
   TQString attachmentMimetype( const TQString &resource,
-                              Q_UINT32 sernum,
+                              TQ_UINT32 sernum,
                               const TQString &filename );
 
-  TQStringList listAttachments( const TQString &resource, Q_UINT32 sernum );
+  TQStringList listAttachments( const TQString &resource, TQ_UINT32 sernum );
 
 
   bool removeSubresource( const TQString& );
@@ -195,7 +195,7 @@ public:
   /** Find message matching a given UID. */
   KMMessage* findMessageByUID( const TQString& uid, KMFolder* folder );
   /** Find message matching a given serial number. */
-  static KMMessage* findMessageBySerNum( Q_UINT32 serNum, KMFolder* folder );
+  static KMMessage* findMessageBySerNum( TQ_UINT32 serNum, KMFolder* folder );
 
   /** Convenience function to delete a message. */
   void deleteMsg( KMMessage* msg );
@@ -231,8 +231,8 @@ public slots:
   void readConfig();
   void slotFolderRemoved( KMFolder* folder );
 
-  void slotIncidenceAdded( KMFolder* folder, Q_UINT32 sernum );
-  void slotIncidenceDeleted( KMFolder* folder, Q_UINT32 sernum );
+  void slotIncidenceAdded( KMFolder* folder, TQ_UINT32 sernum );
+  void slotIncidenceDeleted( KMFolder* folder, TQ_UINT32 sernum );
   void slotRefresh( const TQString& type);
 
   // Called when a folder is made readonly or readwrite, or renamed,
@@ -281,7 +281,7 @@ private:
                          bool lookupByName );
   bool deleteAttachment( KMMessage& msg,
                          const TQString& attachmentURL );
-  Q_UINT32 addIncidenceKolab( KMFolder& folder,
+  TQ_UINT32 addIncidenceKolab( KMFolder& folder,
                               const TQString& subject,
                               const TQString& plainTextBody,
                               const TQMap<TQCString, TQString>& customHeaders,
@@ -344,8 +344,8 @@ private:
    * Since these are transient attributes of only a small but changing number
    * of incidences they are not encapsulated in a struct or somesuch.
    */
-  TQMap<TQString, Q_UINT32> mUIDToSerNum;
-  TQMap<Q_UINT32, bool> mTheUnGetMes;
+  TQMap<TQString, TQ_UINT32> mUIDToSerNum;
+  TQMap<TQ_UINT32, bool> mTheUnGetMes;
   TQMap<TQString, TQString> mPendingUpdates;
   TQMap<TQString, bool> mInTransit;
   static TQMap<TQString, TQString> *mSubResourceUINamesMap;
diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp
index a30fe30c8..849676466 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()->colorGroup().highlight();
+    bg = listView()->tqcolorGroup().highlight();
   } else {
-    bg = listView()->colorGroup().base();
+    bg = listView()->tqcolorGroup().base();
   }
   cb->setPaletteBackgroundColor( bg );
 }
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 7bf978b07..907d21100 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -216,7 +216,7 @@ KMMessage *KMCommand::retrievedMessage() const
   return mRetrievedMsgs.getFirst();
 }
 
-TQWidget *KMCommand::parentWidget() const
+TQWidget *KMCommand::tqparentWidget() const
 {
   return mParent;
 }
@@ -296,7 +296,7 @@ void KMCommand::transferSelectedMsgs()
   mCountMsgs = mMsgList.count();
   uint totalSize = 0;
   // the KProgressDialog for the user-feedback. Only enable it if it's needed.
-  // For some commands like KMSetStatusCommand it's not needed. Note, that
+  // For some commands like KMSeStatusCommand it's not needed. Note, that
   // for some reason the KProgressDialog eats the MouseReleaseEvent (if a
   // command is executed after the MousePressEvent), cf. bug #71761.
   if ( mCountMsgs > 0 ) {
@@ -537,7 +537,7 @@ KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent
 
 KMCommand::Result KMAddBookmarksCommand::execute()
 {
-  TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") );
+  TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") );
   KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename,
                                                                     false );
   KBookmarkGroup group = bookManager->root();
@@ -558,7 +558,7 @@ KMMailtoAddAddrBookCommand::KMMailtoAddAddrBookCommand( const KURL &url,
 KMCommand::Result KMMailtoAddAddrBookCommand::execute()
 {
   KAddrBookExternal::addEmail( KMMessage::decodeMailtoUrl( mUrl.path() ),
-                               parentWidget() );
+                               tqparentWidget() );
 
   return OK;
 }
@@ -573,7 +573,7 @@ KMMailtoOpenAddrBookCommand::KMMailtoOpenAddrBookCommand( const KURL &url,
 KMCommand::Result KMMailtoOpenAddrBookCommand::execute()
 {
   KAddrBookExternal::openEmail( KMMessage::decodeMailtoUrl( mUrl.path() ),
-                                parentWidget() );
+                                tqparentWidget() );
 
   return OK;
 }
@@ -595,14 +595,14 @@ KMCommand::Result KMUrlCopyCommand::execute()
     clip->setText( address );
     clip->setSelectionMode( false );
     clip->setText( address );
-    KPIM::BroadcastStatus::instance()->setStatusMsg( i18n( "Address copied to clipboard." ));
+    KPIM::BroadcasStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." ));
   } else {
     // put the url into the mouse selection and the clipboard
     clip->setSelectionMode( true );
     clip->setText( mUrl.url() );
     clip->setSelectionMode( false );
     clip->setText( mUrl.url() );
-    KPIM::BroadcastStatus::instance()->setStatusMsg( i18n( "URL copied to clipboard." ));
+    KPIM::BroadcasStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." ));
   }
 
   return OK;
@@ -633,13 +633,13 @@ KMCommand::Result KMUrlSaveCommand::execute()
   if ( mUrl.isEmpty() )
     return OK;
   KURL saveUrl = KFileDialog::getSaveURL(mUrl.fileName(), TQString::null,
-                                         parentWidget() );
+                                         tqparentWidget() );
   if ( saveUrl.isEmpty() )
     return Canceled;
-  if ( KIO::NetAccess::exists( saveUrl, false, parentWidget() ) )
+  if ( KIO::NetAccess::exists( saveUrl, false, tqparentWidget() ) )
   {
     if (KMessageBox::warningContinueCancel(0,
-        i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>")
+        i18n("<qt>File <b>%1</b> exists.<br>Do you want to tqreplace it?</qt>")
         .arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         != KMessageBox::Continue)
       return Canceled;
@@ -753,8 +753,8 @@ KMCommand::Result KMShowMsgSrcCommand::execute()
     viewer->resize(TQApplication::desktop()->screenGeometry(scnum).width()/2,
                   2*TQApplication::desktop()->screenGeometry(scnum).height()/3);
   } else {
-    viewer->resize(TQApplication::desktop()->geometry().width()/2,
-                  2*TQApplication::desktop()->geometry().height()/3);
+    viewer->resize(TQApplication::desktop()->tqgeometry().width()/2,
+                  2*TQApplication::desktop()->tqgeometry().height()/3);
   }
   viewer->show();
 
@@ -763,7 +763,7 @@ KMCommand::Result KMShowMsgSrcCommand::execute()
 
 static KURL subjectToUrl( const TQString & subject )
 {
-  // We need to replace colons with underscores since those cause problems with KFileDialog (bug
+  // We need to tqreplace colons with underscores since those cause problems with KFileDialog (bug
   // in KFileDialog though) and also on Windows filesystems.
   // We also look at the special case of ": ", since converting that to "_ " would look strange,
   // simply "_" looks better.
@@ -774,11 +774,11 @@ static KURL subjectToUrl( const TQString & subject )
   // https://issues.kolab.org/issue3805
   const TQString filter = i18n( "*.mbox|email messages (*.mbox)\n*|all files (*)" );
   TQString cleanSubject = subject.stripWhiteSpace()
-                                  .replace( TQDir::separator(), '_' )
-                                  .replace( ": ", "_" )
-                                  .replace( ':', '_' )
-                                  .replace( '.', '_' )
-                                  .replace( '~', '_' );
+                                  .tqreplace( TQDir::separator(), '_' )
+                                  .tqreplace( ": ", "_" )
+                                  .tqreplace( ':', '_' )
+                                  .tqreplace( '.', '_' )
+                                  .tqreplace( '~', '_' );
   return KFileDialog::getSaveURL( cleanSubject, filter );
 }
 
@@ -945,7 +945,7 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
   ++mMsgListIndex;
   // Get rid of the message.
   if ( msg && msg->parent() && msg->getMsgSerNum() &&
-       mUngetMsgs.contains( msg ) ) {
+       mUngetMsgs.tqcontains( msg ) ) {
     int idx = -1;
     KMFolder * p = 0;
     KMMsgDict::instance()->getLocation( msg, &p, &idx );
@@ -962,7 +962,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
     if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
     {
       if (KMessageBox::warningContinueCancel(0,
-        i18n("File %1 exists.\nDo you want to replace it?")
+        i18n("File %1 exists.\nDo you want to tqreplace it?")
         .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue) {
         mOffset = 0;
@@ -1006,7 +1006,7 @@ KMCommand::Result KMOpenMsgCommand::execute()
 {
   if ( mUrl.isEmpty() ) {
     mUrl = KFileDialog::getOpenURL( ":OpenMessage", "message/rfc822 application/mbox",
-                                    parentWidget(), i18n("Open Message") );
+                                    tqparentWidget(), i18n("Open Message") );
   }
   if ( mUrl.isEmpty() ) {
     setDeletesItself( false );
@@ -1043,7 +1043,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
     if ( mMsgString.compare( 0, 5, "From ", 5 ) == 0 ) {
       startOfMessage = mMsgString.find( '\n' );
       if ( startOfMessage == -1 ) {
-        KMessageBox::sorry( parentWidget(),
+        KMessageBox::sorry( tqparentWidget(),
                             i18n( "The file does not contain a message." ) );
         setResult( Failed );
         emit completed( this );
@@ -1071,7 +1071,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
     dwMsg->Parse();
     // check whether we have a message ( no headers => this isn't a message )
     if ( dwMsg->Headers().NumFields() == 0 ) {
-      KMessageBox::sorry( parentWidget(),
+      KMessageBox::sorry( tqparentWidget(),
                           i18n( "The file does not contain a message." ) );
       delete dwMsg; dwMsg = 0;
       setResult( Failed );
@@ -1090,7 +1090,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
     win->show();
     if ( multipleMessages )
       KMessageBox::information( win,
-                                i18n( "The file contains multiple messages. "
+                                i18n( "The file tqcontains multiple messages. "
                                       "Only the first message is shown." ) );
     setResult( OK );
     emit completed( this );
@@ -1395,7 +1395,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
       id = msg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt();
     // set the part header
     msgPartText += "--";
-    msgPartText += TQString::fromLatin1( boundary );
+    msgPartText += TQString::tqfromLatin1( boundary );
     msgPartText += "\nContent-Type: MESSAGE/RFC822";
     msgPartText += TQString( "; CHARSET=%1" ).arg( msg->charset() );
     msgPartText += '\n';
@@ -1403,7 +1403,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
     dwh.MessageId().CreateDefault();
     msgPartText += TQString( "Content-ID: %1\n" ).arg( dwh.MessageId().AsString().c_str() );
     msgPartText += TQString( "Content-Description: %1" ).arg( msg->subject() );
-    if ( !msg->subject().contains( "(fwd)" ) )
+    if ( !msg->subject().tqcontains( "(fwd)" ) )
       msgPartText += " (fwd)";
     msgPartText += "\n\n";
     // remove headers that shouldn't be forwarded
@@ -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::fromLatin1( boundary );
+  msgPartText += TQString::tqfromLatin1( boundary );
   msgPartText += "--\n";
   TQCString tmp;
   msgPart->setTypeStr( "MULTIPART" );
@@ -1452,7 +1452,7 @@ KMCommand::Result KMRedirectCommand::execute()
   if ( !msg || !msg->codec() )
     return Failed;
 
-  RedirectDialog dlg( parentWidget(), "redirect", true,
+  RedirectDialog dlg( tqparentWidget(), "redirect", true,
                       kmkernel->msgSender()->sendImmediate() );
   if (dlg.exec()==TQDialog::Rejected) return Failed;
 
@@ -1639,18 +1639,18 @@ KMCommand::Result KMPrintCommand::execute()
 }
 
 
-KMSetStatusCommand::KMSetStatusCommand( KMMsgStatus status,
-  const TQValueList<Q_UINT32> &serNums, bool toggle )
+KMSeStatusCommand::KMSeStatusCommand( KMMsgStatus status,
+  const TQValueList<TQ_UINT32> &serNums, bool toggle )
   : mStatus( status ), mSerNums( serNums ), mToggle( toggle )
 {
 }
 
-KMCommand::Result KMSetStatusCommand::execute()
+KMCommand::Result KMSeStatusCommand::execute()
 {
-  TQValueListIterator<Q_UINT32> it;
+  TQValueListIterator<TQ_UINT32> it;
   int idx = -1;
   KMFolder *folder = 0;
-  bool parentStatus = false;
+  bool parenStatus = false;
 
   // Toggle actions on threads toggle the whole thread
   // depending on the state of the parent.
@@ -1660,9 +1660,9 @@ KMCommand::Result KMSetStatusCommand::execute()
     if (folder) {
       msg = folder->getMsgBase(idx);
       if (msg && (msg->status()&mStatus))
-        parentStatus = true;
+        parenStatus = true;
       else
-        parentStatus = false;
+        parenStatus = false;
     }
   }
   TQMap< KMFolder*, TQValueList<int> > folderMap;
@@ -1678,7 +1678,7 @@ KMCommand::Result KMSetStatusCommand::execute()
             myStatus = true;
           else
             myStatus = false;
-          if (myStatus != parentStatus)
+          if (myStatus != parenStatus)
             continue;
         }
       }
@@ -1690,7 +1690,7 @@ KMCommand::Result KMSetStatusCommand::execute()
   TQMapIterator< KMFolder*, TQValueList<int> > it2 = folderMap.begin();
   while ( it2 != folderMap.end() ) {
      KMFolder *f = it2.key();
-     f->setStatus( (*it2), mStatus, mToggle );
+     f->seStatus( (*it2), mStatus, mToggle );
      ++it2;
   }
   //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() );
@@ -1734,15 +1734,15 @@ KMCommand::Result KMFilterActionCommand::execute()
     ProgressManager::createProgressItem ( "filter"+ProgressManager::getUniqueID(),
                                           i18n( "Filtering messages" ) );
   progressItem->setTotalItems( msgCountToFilter );
-  TQValueList<Q_UINT32>::const_iterator it;
+  TQValueList<TQ_UINT32>::const_iterator it;
   for ( it = serNumList.begin(); it != serNumList.end(); it++ ) {
-    Q_UINT32 serNum = *it;
+    TQ_UINT32 serNum = *it;
     int diff = msgCountToFilter - ++msgCount;
     if ( diff < 10 || !( msgCount % 20 ) || msgCount <= 10 ) {
       progressItem->updateProgress();
       TQString statusMsg = i18n("Filtering message %1 of %2");
       statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
-      KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
+      KPIM::BroadcasStatus::instance()->seStatusMsg( statusMsg );
       KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
     }
 
@@ -1932,7 +1932,7 @@ void KMMenuCommand::makeFolderMenu(KMFolderNode* node, bool move,
       continue;
     KMFolder *child = static_cast<KMFolder*>(it);
     TQString label = child->label();
-    label.replace("&","&&");
+    label.tqreplace("&","&&");
     if (child->child() && child->child()->first()) {
       // descend
       TQPopupMenu *subMenu = new TQPopupMenu(menu, "subMenu");
@@ -1994,7 +1994,7 @@ KMCommand::Result KMCopyCommand::execute()
       msg = srcFolder->getMsg(idx);
       // corrupt IMAP cache, see FolderStorage::getMsg()
       if ( msg == 0 ) {
-        KMessageBox::error( parentWidget(), i18n("Corrupt IMAP cache detected in folder %1. "
+        KMessageBox::error( tqparentWidget(), i18n("Corrupt IMAP cache detected in folder %1. "
             "Copying of messages aborted.").arg( srcFolder->prettyURL() ) );
         deleteLater();
         return Failed;
@@ -2015,7 +2015,7 @@ KMCommand::Result KMCopyCommand::execute()
       // make sure the attachment state is only calculated when it's complete
       if (!newMsg->isComplete())
         newMsg->setReadyToShow(false);
-      newMsg->setStatus(msg->status());
+      newMsg->seStatus(msg->status());
 
       if (srcFolder && !newMsg->isComplete())
       {
@@ -2145,7 +2145,7 @@ KMMoveCommand::KMMoveCommand( KMFolder* destFolder,
   mSerNumList.append( msgBase->getMsgSerNum() );
 }
 
-KMMoveCommand::KMMoveCommand( Q_UINT32 )
+KMMoveCommand::KMMoveCommand( TQ_UINT32 )
   : mProgressItem( 0 )
 {
 }
@@ -2180,13 +2180,13 @@ KMCommand::Result KMMoveCommand::execute()
   mCompleteWithAddedMsg = false;
 
   if (mDestFolder) {
-    connect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-             this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, Q_UINT32)));
+    connect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+             this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32)));
     mLostBoys = mSerNumList;
   }
   mProgressItem->setTotalItems( mSerNumList.count() );
 
-  for ( TQValueList<Q_UINT32>::ConstIterator it = mSerNumList.constBegin(); it != mSerNumList.constEnd(); ++it ) {
+  for ( TQValueList<TQ_UINT32>::ConstIterator it = mSerNumList.constBegin(); it != mSerNumList.constEnd(); ++it ) {
     if ( *it == 0 ) {
       kdDebug(5006) << k_funcinfo << "serial number == 0!" << endl;
       continue; // invalid message
@@ -2305,7 +2305,7 @@ void KMMoveCommand::slotImapFolderCompleted(KMFolderImap* imapFolder, bool succe
   }
 }
 
-void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, Q_UINT32 serNum)
+void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum)
 {
   if ( folder != mDestFolder || mLostBoys.find( serNum ) == mLostBoys.end() ) {
     //kdDebug(5006) << "KMMoveCommand::msgAddedToDestFolder different "
@@ -2315,8 +2315,8 @@ void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, Q_UINT32 serNum)
   mLostBoys.remove(serNum);
   if ( mLostBoys.isEmpty() ) {
     // we are done. All messages transferred to the host succesfully
-    disconnect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-             this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, Q_UINT32)));
+    disconnect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+             this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32)));
     if (mDestFolder && mDestFolder->folderType() != KMFolderTypeImap) {
       mDestFolder->sync();
     }
@@ -2370,7 +2370,7 @@ KMDeleteMsgCommand::KMDeleteMsgCommand( KMFolder* srcFolder, KMMessage * msg )
   mOpenedFolders.push_back( srcFolder );
 }
 
-KMDeleteMsgCommand::KMDeleteMsgCommand( Q_UINT32 sernum )
+KMDeleteMsgCommand::KMDeleteMsgCommand( TQ_UINT32 sernum )
 :KMMoveCommand( sernum )
 {
   if ( !sernum ) {
@@ -2453,7 +2453,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
            (mUrl.protocol() == "smb")  || (mUrl.protocol() == "fish")  ||
            (mUrl.protocol() == "news"))
   {
-    KPIM::BroadcastStatus::instance()->setStatusMsg( i18n("Opening URL..."));
+    KPIM::BroadcasStatus::instance()->seStatusMsg( i18n("Opening URL..."));
     KMimeType::Ptr mime = KMimeType::findByURL( mUrl );
     if (mime->name() == "application/x-desktop" ||
         mime->name() == "application/x-executable" ||
@@ -2555,7 +2555,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
   if ( mAttachmentMap.count() > 1 ) {
     // get the dir
     dirUrl = KDirSelectDialog::selectDirectory( TQString::null, false,
-                                                parentWidget(),
+                                                tqparentWidget(),
                                                 i18n("Save Attachments To") );
     if ( !dirUrl.isValid() ) {
       setResult( Canceled );
@@ -2570,14 +2570,14 @@ void KMSaveAttachmentsCommand::slotSaveAll()
   else {
     // only one item, get the desired filename
     partNode *node = mAttachmentMap.begin().key();
-    // replace all ':' with '_' because ':' isn't allowed on FAT volumes
+    // tqreplace all ':' with '_' because ':' isn't allowed on FAT volumes
     TQString s =
-      node->msgPart().fileName().stripWhiteSpace().replace( ':', '_' );
+      node->msgPart().fileName().stripWhiteSpace().tqreplace( ':', '_' );
     if ( s.isEmpty() )
-      s = node->msgPart().name().stripWhiteSpace().replace( ':', '_' );
+      s = node->msgPart().name().stripWhiteSpace().tqreplace( ':', '_' );
     if ( s.isEmpty() )
       s = i18n("filename for an unnamed attachment", "attachment.1");
-    url = KFileDialog::getSaveURL( s, TQString::null, parentWidget(),
+    url = KFileDialog::getSaveURL( s, TQString::null, tqparentWidget(),
                                    TQString::null );
     if ( url.isEmpty() ) {
       setResult( Canceled );
@@ -2598,9 +2598,9 @@ void KMSaveAttachmentsCommand::slotSaveAll()
     if ( !dirUrl.isEmpty() ) {
       curUrl = dirUrl;
       TQString s =
-        it.key()->msgPart().fileName().stripWhiteSpace().replace( ':', '_' );
+        it.key()->msgPart().fileName().stripWhiteSpace().tqreplace( ':', '_' );
       if ( s.isEmpty() )
-        s = it.key()->msgPart().name().stripWhiteSpace().replace( ':', '_' );
+        s = it.key()->msgPart().name().stripWhiteSpace().tqreplace( ':', '_' );
       if ( s.isEmpty() ) {
         ++unnamedAtmCount;
         s = i18n("filename for the %1-th unnamed attachment",
@@ -2619,7 +2619,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
      TQString origFile = curUrl.fileName();
      TQString file = origFile;
 
-     while ( renameNumbering.contains(file) ) {
+     while ( renameNumbering.tqcontains(file) ) {
        file = origFile;
        int num = renameNumbering[file] + 1;
        int dotIdx = file.findRev('.');
@@ -2628,21 +2628,21 @@ void KMSaveAttachmentsCommand::slotSaveAll()
      curUrl.setFileName(file);
 
      // Increment the counter for both the old and the new filename
-     if ( !renameNumbering.contains(origFile))
+     if ( !renameNumbering.tqcontains(origFile))
          renameNumbering[origFile] = 1;
      else
          renameNumbering[origFile]++;
 
      if ( file != origFile ) {
-        if ( !renameNumbering.contains(file))
+        if ( !renameNumbering.tqcontains(file))
             renameNumbering[file] = 1;
         else
             renameNumbering[file]++;
      }
 
 
-      if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) {
-        if ( KMessageBox::warningContinueCancel( parentWidget(),
+      if ( KIO::NetAccess::exists( curUrl, false, tqparentWidget() ) ) {
+        if ( KMessageBox::warningContinueCancel( tqparentWidget(),
               i18n( "A file named %1 already exists. Do you want to overwrite it?" )
               .arg( curUrl.fileName() ),
               i18n( "File Already Exists" ), i18n("&Overwrite") ) == KMessageBox::Cancel) {
@@ -2666,7 +2666,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
   bool bSaveEncrypted = false;
   bool bEncryptedParts = node->encryptionState() != KMMsgNotEncrypted;
   if( bEncryptedParts )
-    if( KMessageBox::questionYesNo( parentWidget(),
+    if( KMessageBox::questionYesNo( tqparentWidget(),
           i18n( "The part %1 of the message is encrypted. Do you want to keep the encryption when saving?" ).
           arg( url.fileName() ),
           i18n( "KMail Question" ), i18n("Keep Encryption"), i18n("Do Not Keep") ) ==
@@ -2675,7 +2675,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
 
   bool bSaveWithSig = true;
   if( node->signatureState() != KMMsgNotSigned )
-    if( KMessageBox::questionYesNo( parentWidget(),
+    if( KMessageBox::questionYesNo( tqparentWidget(),
           i18n( "The part %1 of the message is signed. Do you want to keep the signature when saving?" ).
           arg( url.fileName() ),
           i18n( "KMail Question" ), i18n("Keep Signature"), i18n("Do Not Keep") ) !=
@@ -2749,7 +2749,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
     file.setName( url.path() );
     if ( !file.open( IO_WriteOnly ) )
     {
-      KMessageBox::error( parentWidget(),
+      KMessageBox::error( tqparentWidget(),
           i18n( "%2 is detailed error description",
             "Could not write the file %1:\n%2" )
           .arg( file.name() )
@@ -2773,9 +2773,9 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
   if ( !url.isLocalFile() )
   {
     tf.close();
-    if ( !KIO::NetAccess::upload( tf.name(), url, parentWidget() ) )
+    if ( !KIO::NetAccess::upload( tf.name(), url, tqparentWidget() ) )
     {
-      KMessageBox::error( parentWidget(),
+      KMessageBox::error( tqparentWidget(),
           i18n( "Could not write the file %1." )
           .arg( url.path() ),
           i18n( "KMail Error" ) );
@@ -2987,7 +2987,7 @@ KMCommand::Result KMIMChatCommand::execute()
   TQString addr = KMMessage::decodeMailtoUrl( mUrl.path() );
   // find UID for mail address
   KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-  KABC::AddresseeList addressees = addressBook->findByEmail( KPIM::getEmailAddress( addr ) ) ;
+  KABC::AddresseeList addressees = addressBook->tqfindByEmail( KPIM::getEmailAddress( addr ) ) ;
 
   // start chat
   if( addressees.count() == 1 ) {
@@ -3011,11 +3011,11 @@ KMCommand::Result KMIMChatCommand::execute()
       {
           nameList.append( (*it).realName() );
       }
-      TQString names = nameList.join( TQString::fromLatin1( ",\n" ) );
+      TQString names = nameList.join( TQString::tqfromLatin1( ",\n" ) );
       apology = apology.arg( names );
     }
 
-    KMessageBox::sorry( parentWidget(), apology );
+    KMessageBox::sorry( tqparentWidget(), apology );
     return Failed;
   }
 }
@@ -3128,13 +3128,13 @@ KService::Ptr KMHandleAttachmentCommand::getServiceOffer()
   mimetype = KMimeType::mimeType( contentTypeStr );
   if ( mimetype->name() == "application/octet-stream" ) {
     // consider the filename if Content-Type is application/octet-stream
-    mimetype = KMimeType::findByPath( mAtmName, 0, true /* no disk access */ );
+    mimetype = KMimeType::tqfindByPath( mAtmName, 0, true /* no disk access */ );
   }
   if ( ( mimetype->name() == "application/octet-stream" )
        && msgPart.isComplete() ) {
     // consider the attachment's contents if neither the Content-Type header
     // nor the filename give us a clue
-    mimetype = KMimeType::findByFileContent( mAtmName );
+    mimetype = KMimeType::tqfindByFileContent( mAtmName );
   }
   return KServiceTypeProfile::preferredService( mimetype->name(), "Application" );
 }
@@ -3196,13 +3196,13 @@ void KMHandleAttachmentCommand::atmSave()
   parts.append( mNode );
   // save, do not leave encoded
   KMSaveAttachmentsCommand *command =
-    new KMSaveAttachmentsCommand( parentWidget(), parts, mMsg, false );
+    new KMSaveAttachmentsCommand( tqparentWidget(), parts, mMsg, false );
   command->start();
 }
 
 void KMHandleAttachmentCommand::atmProperties()
 {
-  KMMsgPartDialogCompat dlg( parentWidget() , 0, true );
+  KMMsgPartDialogCompat dlg( tqparentWidget() , 0, true );
   KMMessagePart& msgPart = mNode->msgPart();
   dlg.setMsgPart( &msgPart );
   dlg.exec();
@@ -3229,12 +3229,12 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
   if ( !listjob.get() ) {
     const TQString msg = i18n( "Chiasmus backend does not offer the "
                               "\"x-obtain-keys\" function. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
   if ( listjob->exec() ) {
-    listjob->showErrorDialog( parentWidget(), i18n( "Chiasmus Backend Error" ) );
+    listjob->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
@@ -3243,7 +3243,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
     const TQString msg = i18n( "Unexpected return value from Chiasmus backend: "
                               "The \"x-obtain-keys\" function did not return a "
                               "string list. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
@@ -3252,11 +3252,11 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
     const TQString msg = i18n( "No keys have been found. Please check that a "
                               "valid key path has been set in the Chiasmus "
                               "configuration." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
-  ChiasmusKeySelector selectorDlg( parentWidget(), i18n( "Chiasmus Decryption Key Selection" ),
+  ChiasmusKeySelector selectorDlg( tqparentWidget(), i18n( "Chiasmus Decryption Key Selection" ),
                                    keys, GlobalSettings::chiasmusDecryptionKey(),
                                    GlobalSettings::chiasmusDecryptionOptions() );
   if ( selectorDlg.exec() != TQDialog::Accepted )
@@ -3270,7 +3270,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
   if ( !job ) {
     const TQString msg = i18n( "Chiasmus backend does not offer the "
                               "\"x-decrypt\" function. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
@@ -3281,13 +3281,13 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
        !job->setProperty( "input", input ) ) {
     const TQString msg = i18n( "The \"x-decrypt\" function does not accept "
                               "the expected parameters. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
   setDeletesItself( true ); // the job below is async, we have to cleanup ourselves
   if ( job->start() ) {
-    job->showErrorDialog( parentWidget(), i18n( "Chiasmus Decryption Error" ) );
+    job->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Decryption Error" ) );
     return;
   }
 
@@ -3313,7 +3313,7 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E
   if ( err.isCanceled() )
     return;
   if ( err ) {
-    job->showErrorDialog( parentWidget(), i18n( "Chiasmus Decryption Error" ) );
+    job->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Decryption Error" ) );
     return;
   }
 
@@ -3321,21 +3321,21 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E
     const TQString msg = i18n( "Unexpected return value from Chiasmus backend: "
                               "The \"x-decrypt\" function did not return a "
                               "byte array. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
-  const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString::null, parentWidget() );
+  const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString::null, tqparentWidget() );
   if ( url.isEmpty() )
     return;
 
-  bool overwrite = KMail::Util::checkOverwrite( url, parentWidget() );
+  bool overwrite = KMail::Util::checkOverwrite( url, tqparentWidget() );
   if ( !overwrite )
     return;
 
   d.setDisabled( true ); // we got this far, don't delete yet
   KIO::Job * uploadJob = KIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ );
-  uploadJob->setWindow( parentWidget() );
+  uploadJob->setWindow( tqparentWidget() );
   connect( uploadJob, TQT_SIGNAL(result(KIO::Job*)),
            this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(KIO::Job*)) );
 }
@@ -3452,7 +3452,7 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify()
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->setStatus( msg->status() );
+  newMsg->seStatus( msg->status() );
 
   storeChangedMessage( newMsg );
   return OK;
@@ -3500,7 +3500,7 @@ KMCommand::Result KMEditAttachmentCommand::doAttachmentModify()
   KMail::EditorWatcher *watcher =
           new KMail::EditorWatcher( KURL( mTempFile.file()->name() ),
                                     part.typeStr() + "/" + part.subtypeStr(),
-                                    false, this, parentWidget() );
+                                    false, this, tqparentWidget() );
   connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(editDone(KMail::EditorWatcher*)) );
   if ( !watcher->start() )
     return Failed;
@@ -3543,7 +3543,7 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher)
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->setStatus( msg->status() );
+  newMsg->seStatus( msg->status() );
 
   storeChangedMessage( newMsg );
 }
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 781a80873..5fbebb65c 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -98,7 +98,7 @@ protected:
   // Returns the single message retrieved
   KMMessage *retrievedMessage() const;
   // Returns the parent widget
-  TQWidget *parentWidget() const;
+  TQWidget *tqparentWidget() const;
 
   bool deletesItself() { return mDeletesItself; }
   /** Specify whether the subclass takes care of the deletion of the object.
@@ -627,20 +627,20 @@ private:
   TQString mEncoding;
 };
 
-class KDE_EXPORT KMSetStatusCommand : public KMCommand
+class KDE_EXPORT KMSeStatusCommand : public KMCommand
 {
   Q_OBJECT
 
 public:
   // Serial numbers
-  KMSetStatusCommand( KMMsgStatus status, const TQValueList<Q_UINT32> &,
+  KMSeStatusCommand( KMMsgStatus status, const TQValueList<TQ_UINT32> &,
                       bool toggle=false );
 
 private:
   virtual Result execute();
 
   KMMsgStatus mStatus;
-  TQValueList<Q_UINT32> mSerNums;
+  TQValueList<TQ_UINT32> mSerNums;
   TQValueList<int> mIds;
   bool mToggle;
 };
@@ -671,7 +671,7 @@ public:
 
 private:
   virtual Result execute();
-  TQValueList<Q_UINT32> serNumList;
+  TQValueList<TQ_UINT32> serNumList;
   KMFilter *mFilter;
 };
 
@@ -783,12 +783,12 @@ public:
 
 public slots:
   void slotImapFolderCompleted(KMFolderImap *folder, bool success);
-  void slotMsgAddedToDestFolder(KMFolder *folder, Q_UINT32 serNum);
+  void slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum);
   void slotMoveCanceled();
 
 protected:
   // Needed for KMDeleteCommand for "move to trash"
-  KMMoveCommand( Q_UINT32 sernum );
+  KMMoveCommand( TQ_UINT32 sernum );
   void setDestFolder( KMFolder* folder ) { mDestFolder = folder; }
   void addMsg( KMMsgBase *msg ) { mSerNumList.append( msg->getMsgSerNum() ); }
   TQValueVector<KMFolder*> mOpenedFolders;
@@ -798,10 +798,10 @@ private:
   void completeMove( Result result );
 
   KMFolder *mDestFolder;
-  TQValueList<Q_UINT32> mSerNumList;
+  TQValueList<TQ_UINT32> mSerNumList;
   // List of serial numbers that have to be transferred to a host.
   // Ticked off as they come in via msgAdded signals.
-  TQValueList<Q_UINT32> mLostBoys;
+  TQValueList<TQ_UINT32> mLostBoys;
   KPIM::ProgressItem *mProgressItem;
   bool mCompleteWithAddedMsg;
 };
@@ -813,7 +813,7 @@ class KDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand
 public:
   KMDeleteMsgCommand( KMFolder* srcFolder, const TQPtrList<KMMsgBase> &msgList );
   KMDeleteMsgCommand( KMFolder* srcFolder, KMMessage * msg );
-  KMDeleteMsgCommand( Q_UINT32 sernum );
+  KMDeleteMsgCommand( TQ_UINT32 sernum );
 
 private:
   static KMFolder * findTrashFolder( KMFolder * srcFolder );
@@ -1054,7 +1054,7 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand
 
   protected:
     int mPartIndex;
-    Q_UINT32 mSernum;
+    TQ_UINT32 mSernum;
 
   private:
     Result execute();
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index a1ab32d8a..e6ec6f967 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->setSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum );
+  mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum );
   TQVBoxLayout *v = new TQVBoxLayout( mMainWidget );
   v->addWidget( mHeadersToEditorSplitter );
   mIdentity = new KPIM::IdentityCombo(kmkernel->identityManager(), mHeadersArea);
@@ -286,7 +286,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
     connect( mRecipientsEditor,
              TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion ) ),
              TQT_SLOT( slotCompletionModeChanged( KGlobalSettings::Completion ) ) );
-    connect( mRecipientsEditor, TQT_SIGNAL(sizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) );
+    connect( mRecipientsEditor, TQT_SIGNAL(tqsizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) );
 
     mRecipientsEditor->setFocus();
   }
@@ -341,7 +341,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   TQHBoxLayout *hbox = new TQHBoxLayout( vbox );
   {
       mSignatureStateIndicator = new TQLabel( editorAndCryptoStateIndicators );
-      mSignatureStateIndicator->setAlignment( Qt::AlignHCenter );
+      mSignatureStateIndicator->tqsetAlignment( Qt::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->setAlignment( Qt::AlignHCenter );
+      mEncryptionStateIndicator->tqsetAlignment( Qt::AlignHCenter );
       hbox->addWidget( mEncryptionStateIndicator );
       p.setColor( TQColorGroup::Background, reader.readColorEntry( "PGPMessageEncr" , &defaultEncryptedColor ) );
       mEncryptionStateIndicator->setPalette( p );
@@ -965,13 +965,13 @@ 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 QMAX( width, w->sizeHint().width() );
+  return QMAX( width, w->tqsizeHint().width() );
 }
 
 void KMComposeWin::rethinkFields(bool fromSlot)
 {
   //This sucks even more but again no ids. sorry (sven)
-  int mask, row, numRows;
+  int tqmask, row, numRows;
   long showHeaders;
 
   if (mShowHeaders < 0)
@@ -979,8 +979,8 @@ void KMComposeWin::rethinkFields(bool fromSlot)
   else
     showHeaders = mShowHeaders;
 
-  for (mask=1,mNumHeaders=0; mask<=showHeaders; mask<<=1)
-    if ((showHeaders&mask) != 0) mNumHeaders++;
+  for (tqmask=1,mNumHeaders=0; tqmask<=showHeaders; tqmask<<=1)
+    if ((showHeaders&tqmask) != 0) mNumHeaders++;
 
   numRows = mNumHeaders + 1;
 
@@ -1109,9 +1109,9 @@ void KMComposeWin::rethinkFields(bool fromSlot)
   else
     mAtmListView->hide();
   resize(this->size());
-  repaint();
+  tqrepaint();
 
-  mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() );
+  mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().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->sizeHint().width(),aLbl->sizeHint().height() + 6);
+    aLbl->resize((int)aLbl->tqsizeHint().width(),aLbl->tqsizeHint().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->sizeHint().width(), aLbl->height());
+      aChk->setFixedSize(aChk->tqsizeHint().width(), aLbl->height());
       aChk->show();
     }
     aRow++;
@@ -1219,8 +1219,8 @@ void KMComposeWin::getTransportMenu()
   int id = 0;
   for(it = availTransports.begin(); it != availTransports.end() ; ++it, id++)
   {
-    mActNowMenu->insertItem((*it).replace("&", "&&"), id);
-    mActLaterMenu->insertItem((*it).replace("&", "&&"), id);
+    mActNowMenu->insertItem((*it).tqreplace("&", "&&"), id);
+    mActLaterMenu->insertItem((*it).tqreplace("&", "&&"), id);
   }
 }
 
@@ -1337,9 +1337,9 @@ void KMComposeWin::setupActions(void)
   KStdAction::selectAll (this, TQT_SLOT(slotMarkAll()), actionCollection());
 
   KStdAction::find (this, TQT_SLOT(slotFind()), actionCollection());
-  KStdAction::findNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
+  KStdAction::tqfindNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
 
-  KStdAction::replace (this, TQT_SLOT(slotReplace()), actionCollection());
+  KStdAction::tqreplace (this, TQT_SLOT(slotReplace()), actionCollection());
   KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck");
 
   mPasteQuotation = new KAction (i18n("Pa&ste as Quotation"),0,this,TQT_SLOT( slotPasteClipboardAsQuotation()),
@@ -1685,7 +1685,7 @@ void KMComposeWin::setupEditor(void)
   connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ),
           this, TQT_SLOT( fontChanged( const TQFont & ) ) );
   connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ),
-          this, TQT_SLOT( alignmentChanged( int ) ) );
+          this, TQT_SLOT( tqalignmentChanged( int ) ) );
 
 }
 
@@ -1695,8 +1695,8 @@ static TQString cleanedUpHeaderString( const TQString & s )
 {
   // remove invalid characters from the header strings
   TQString res( s );
-  res.replace( '\r', "" );
-  res.replace( '\n', " " );
+  res.tqreplace( '\r', "" );
+  res.tqreplace( '\n', " " );
   return res.stripWhiteSpace();
 }
 
@@ -2277,29 +2277,29 @@ bool KMComposeWin::userForgotAttachment()
 
   if ( attachWordsList.isEmpty() ) {
     // default value (FIXME: this is duplicated in configuredialog.cpp)
-    attachWordsList << TQString::fromLatin1("attachment")
-                    << TQString::fromLatin1("attached");
-    if ( TQString::fromLatin1("attachment") != i18n("attachment") )
+    attachWordsList << TQString::tqfromLatin1("attachment")
+                    << TQString::tqfromLatin1("attached");
+    if ( TQString::tqfromLatin1("attachment") != i18n("attachment") )
       attachWordsList << i18n("attachment");
-    if ( TQString::fromLatin1("attached") != i18n("attached") )
+    if ( TQString::tqfromLatin1("attached") != i18n("attached") )
       attachWordsList << i18n("attached");
   }
 
-  TQRegExp rx ( TQString::fromLatin1("\\b") +
+  TQRegExp rx ( TQString::tqfromLatin1("\\b") +
                attachWordsList.join("\\b|\\b") +
-               TQString::fromLatin1("\\b") );
+               TQString::tqfromLatin1("\\b") );
   rx.setCaseSensitive( false );
 
   bool gotMatch = false;
 
-  // check whether the subject contains one of the attachment key words
+  // check whether the subject tqcontains one of the attachment key words
   // unless the message is a reply or a forwarded message
   TQString subj = subject();
   gotMatch =    ( KMMessage::stripOffPrefixes( subj ) == subj )
              && ( rx.search( subj ) >= 0 );
 
   if ( !gotMatch ) {
-    // check whether the non-quoted text contains one of the attachment key
+    // check whether the non-quoted text tqcontains one of the attachment key
     // words
     TQRegExp quotationRx ("^([ \\t]*([|>:}#]|[A-Za-z]+>))+");
     for ( int i = 0; i < mEditor->numLines(); ++i ) {
@@ -3633,7 +3633,7 @@ void KMComposeWin::slotSearchAgain()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotReplace()
 {
-  mEditor->replace();
+  mEditor->tqreplace();
 }
 
 //-----------------------------------------------------------------------------
@@ -3681,7 +3681,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment()
 
   TQMimeSource *mimeSource = TQApplication::clipboard()->data();
   if ( TQImageDrag::canDecode(mimeSource) ) {
-    slotAttachPNGImageData(mimeSource->encodedData("image/png"));
+    slotAttachPNGImageData(mimeSource->tqencodedData("image/png"));
   }
   else {
     bool ok;
@@ -3725,7 +3725,7 @@ TQString KMComposeWin::addQuotesToText(const TQString &inputText)
 {
     TQString answer = TQString( inputText );
     TQString indentStr = quotePrefixName();
-    answer.replace( '\n', '\n' + indentStr);
+    answer.tqreplace( '\n', '\n' + indentStr);
     answer.prepend( indentStr );
     answer += '\n';
     return KMMessage::smartQuote( answer, GlobalSettings::self()->lineWrapWidth() );
@@ -3743,7 +3743,7 @@ TQString KMComposeWin::removeQuotesFromText(const TQString &inputText)
     // now remove all remaining leading quotes
     quotePrefix = '\n' + quotePrefixName();
     rx = quotePrefix;
-    s.replace(rx, "\n");
+    s.tqreplace(rx, "\n");
 
     return s;
 }
@@ -3773,7 +3773,7 @@ void KMComposeWin::slotRemoveQuotes()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotUndo()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if ( ::qt_cast<KEdit*>(fw) )
@@ -3784,7 +3784,7 @@ void KMComposeWin::slotUndo()
 
 void KMComposeWin::slotRedo()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (::qt_cast<KEdit*>(fw))
@@ -3796,7 +3796,7 @@ void KMComposeWin::slotRedo()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotCut()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (::qt_cast<KEdit*>(fw))
@@ -3809,7 +3809,7 @@ void KMComposeWin::slotCut()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotCopy()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
 #ifdef KeyPress
@@ -3829,12 +3829,12 @@ void KMComposeWin::slotPasteClipboard()
 
 void KMComposeWin::paste( QClipboard::Mode mode )
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   TQMimeSource *mimeSource = TQApplication::clipboard()->data( mode );
   if ( mimeSource->provides("image/png") )  {
-    slotAttachPNGImageData(mimeSource->encodedData("image/png"));
+    slotAttachPNGImageData(mimeSource->tqencodedData("image/png"));
   } else if ( KURLDrag::canDecode( mimeSource ) ) {
         KURL::List urlList;
         if( KURLDrag::decode( mimeSource, urlList ) ) {
@@ -3872,7 +3872,7 @@ void KMComposeWin::paste( QClipboard::Mode mode )
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotMarkAll()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (::qt_cast<TQLineEdit*>(fw))
@@ -3918,7 +3918,7 @@ void KMComposeWin::slotUpdWinTitle(const TQString& text)
   // newlines tend to become boxes.
   if (text.isEmpty())
     setCaption("("+i18n("unnamed")+")");
-  else setCaption( s.replace( TQChar('\n'), ' ' ) );
+  else setCaption( s.tqreplace( TQChar('\n'), ' ' ) );
 }
 
 
@@ -4605,15 +4605,15 @@ void KMComposeWin::slotCleanSpace()
 
   // Squeeze tabs and spaces
   TQRegExp squeeze( "[\t ]+" );
-  s.replace( squeeze, TQChar( ' ' ) );
+  s.tqreplace( squeeze, TQChar( ' ' ) );
 
   // Remove trailing whitespace
   TQRegExp trailing( "\\s+$" );
-  s.replace( trailing, TQChar( '\n' ) );
+  s.tqreplace( trailing, TQChar( '\n' ) );
 
   // Single space lines
   TQRegExp singleSpace( "[\n]{2,}" );
-  s.replace( singleSpace, TQChar( '\n' ) );
+  s.tqreplace( singleSpace, TQChar( '\n' ) );
 
   // Restore the signature
   if ( restore )
@@ -4820,7 +4820,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
   // don't overwrite the BCC field under certain circomstances
   // NOT edited and preset BCC from the identity
   if( mEdtBcc && !mEdtBcc->edited() && !ident.bcc().isEmpty() ) {
-    // BCC NOT empty AND contains a diff adress then the preset BCC
+    // BCC NOT empty AND tqcontains a diff adress then the preset BCC
     // of the new identity
     if( !mEdtBcc->text().isEmpty() && mEdtBcc->text() != ident.bcc() && !mEdtBcc->edited() ) {
       mEdtBcc->setText( ident.bcc() );
@@ -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::fromLatin1(",") + ident.bcc() );
+        TQString temp_string( mEdtBcc->text() + TQString::tqfromLatin1(",") + 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::fromLatin1(",") + ident.bcc() );
+      TQString temp_string ( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() );
       mEdtBcc->setText( temp_string );
     } else {
       mEdtBcc->setText( ident.bcc() );
@@ -4935,7 +4935,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
     if ( pos >= 0 && !mOldSigText.isEmpty() ) {
       const int oldLength = mOldSigText.length();
       mOldSigText = "\n\n"+ ident.signature().rawText() + "\n"; // see insertSignature()
-      edtText = edtText.replace( pos, oldLength, mOldSigText );
+      edtText = edtText.tqreplace( pos, oldLength, mOldSigText );
       mEditor->setText( edtText );
     } else {
       insertSignature( Append );
@@ -4982,7 +4982,7 @@ void KMComposeWin::slotSpellcheckConfig()
   KWin kwin;
   TQTabDialog qtd (this, "tabdialog", true);
   KSpellConfig mKSpellConfig (&qtd);
-  mKSpellConfig.layout()->setMargin( KDialog::marginHint() );
+  mKSpellConfig.tqlayout()->setMargin( KDialog::marginHint() );
 
   qtd.addTab (&mKSpellConfig, i18n("Spellchecker"));
   qtd.setCancelButton ();
@@ -4996,7 +4996,7 @@ void KMComposeWin::slotSpellcheckConfig()
 }
 
 //-----------------------------------------------------------------------------
-void KMComposeWin::slotStatusMessage(const TQString &message)
+void KMComposeWin::sloStatusMessage(const TQString &message)
 {
     statusBar()->changeItem( message, 0 );
 }
@@ -5177,19 +5177,19 @@ void KMComposeWin::slotSizeAction( int size )
 void KMComposeWin::slotAlignLeft()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::setAlignment( AlignLeft );
+    mEditor->TQTextEdit::tqsetAlignment( AlignLeft );
 }
 
 void KMComposeWin::slotAlignCenter()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::setAlignment( AlignHCenter );
+    mEditor->TQTextEdit::tqsetAlignment( AlignHCenter );
 }
 
 void KMComposeWin::slotAlignRight()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::setAlignment( AlignRight );
+    mEditor->TQTextEdit::tqsetAlignment( AlignRight );
 }
 
 void KMComposeWin::slotTextBold()
@@ -5252,7 +5252,7 @@ void KMComposeWin::fontChanged( const TQFont &f )
   fontSizeAction->setFontSize( f.pointSize() );
 }
 
-void KMComposeWin::alignmentChanged( int a )
+void KMComposeWin::tqalignmentChanged( int a )
 {
     //toggleMarkup();
     alignLeftAction->setChecked( ( a == AlignAuto ) || ( a & AlignLeft ) );
@@ -5404,6 +5404,6 @@ void KMComposeWin::recipientEditorSizeHintChanged()
 
 void KMComposeWin::setMaximumHeaderSize()
 {
-  mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() );
+  mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() );
 }
 
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index f38a8f682..30362e851 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -368,7 +368,7 @@ private slots:
   /**
    * XML-GUI stuff
    */
-  void slotStatusMessage(const TQString &message);
+  void sloStatusMessage(const TQString &message);
   void slotEditToolbars();
   void slotUpdateToolbars();
   void slotEditKeys();
@@ -502,7 +502,7 @@ private slots:
   void slotFormatReset();
   void slotTextColor();
   void fontChanged( const TQFont & );
-  void alignmentChanged( int );
+  void tqalignmentChanged( int );
 
 public: // kmkernel, attachmentlistview
   bool addAttach(const KURL url);
@@ -555,7 +555,7 @@ private:
                           const TQString &toolTip = TQString::null,
                           const TQString &whatsThis = TQString::null );
 
-  void rethinkHeaderLine( int value, int mask, int& row,
+  void rethinkHeaderLine( int value, int tqmask, int& row,
                           TQLabel* lbl, TQComboBox* cbx, TQCheckBox *chk );
 
   /**
@@ -671,7 +671,7 @@ private:
   /**
    * Decrypt an OpenPGP block or strip off the OpenPGP envelope of a text
    * block with a clear text signature. This is only done if the given
-   * string contains exactly one OpenPGP block.
+   * string tqcontains exactly one OpenPGP block.
    * This function is for example used to restore the unencrypted/unsigned
    * message text for editting.
    */
diff --git a/kmail/kmdict.cpp b/kmail/kmdict.cpp
index 0ad9367be..de4ed86f4 100644
--- a/kmail/kmdict.cpp
+++ b/kmail/kmdict.cpp
@@ -54,7 +54,7 @@ void KMDict::clear()
 
 //-----------------------------------------------------------------------------
 
-void KMDict::replace( long key, KMDictItem *item )
+void KMDict::tqreplace( long key, KMDictItem *item )
 {
   insert( key, item );
   removeFollowing( item, key );           // remove other items with same key
diff --git a/kmail/kmdict.h b/kmail/kmdict.h
index 520315ad2..374577c28 100644
--- a/kmail/kmdict.h
+++ b/kmail/kmdict.h
@@ -40,7 +40,7 @@ public:
   int size() { return mSize; }
   
   /** Inserts an item, replacing old ones with the same key. */
-  void replace(long key, KMDictItem *item);
+  void tqreplace(long key, KMDictItem *item);
  
   /** Inserts an item without replacing ones with the same key. */
   void insert(long key, KMDictItem *item);
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 6fdc3352c..46fd2a83b 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -112,7 +112,7 @@ void KMEdit::keyPressEvent( TQKeyEvent* e )
                 && ( col >= int( bot ) ) ) {
 
 		// The cursor position might have changed unpredictably if there was selected
-		// text which got replaced by a new line, so we query it again:
+		// text which got tqreplaced by a new line, so we query it again:
 		getCursorPosition( &line, &col );
                 TQString newLine = text( line );
                 // remove leading white space from the new line and instead
@@ -122,7 +122,7 @@ void KMEdit::keyPressEvent( TQKeyEvent* e )
                        && newLine[leadingWhiteSpaceCount].isSpace() ) {
                     ++leadingWhiteSpaceCount;
                 }
-                newLine = newLine.replace( 0, leadingWhiteSpaceCount,
+                newLine = newLine.tqreplace( 0, leadingWhiteSpaceCount,
                                            lineText.left( bot ) );
                 removeParagraph( line );
                 insertParagraph( newLine, line );
@@ -148,7 +148,7 @@ void KMEdit::contentsDropEvent(TQDropEvent *e)
         TQBuffer serNumBuffer(serNums);
         serNumBuffer.open(IO_ReadOnly);
         TQDataStream serNumStream(&serNumBuffer);
-        Q_UINT32 serNum;
+        TQ_UINT32 serNum;
         KMFolder *folder = 0;
         int idx;
         TQPtrList<KMMsgBase> messageList;
@@ -169,7 +169,7 @@ void KMEdit::contentsDropEvent(TQDropEvent *e)
         command->start();
     }
     else if( e->provides("image/png") ) {
-        emit attachPNGImageData(e->encodedData("image/png"));
+        emit attachPNGImageData(e->tqencodedData("image/png"));
     }
     else if( KURLDrag::canDecode( e ) ) {
         KURL::List urlList;
@@ -383,7 +383,7 @@ KMSyntaxHighter::KMSyntaxHighter( TQTextEdit *textEdit,
 
 bool KMSyntaxHighter::isMisspelled( const TQString &word )
 {
-  if ( mIgnoredWords.contains( word ) ) {
+  if ( mIgnoredWords.tqcontains( word ) ) {
     return false;
   }
   else {
@@ -440,8 +440,8 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
       (*mExtEditorTempFile->textStream()) << text();
 
       mExtEditorTempFile->close();
-      // replace %f in the system line
-      sysLine.replace( "%f", mExtEditorTempFile->name() );
+      // tqreplace %f in the system line
+      sysLine.tqreplace( "%f", mExtEditorTempFile->name() );
       mExtEditorProcess = new KProcess();
       mExtEditorProcess->setUseShell( true );
       sysLine += " ";
@@ -454,7 +454,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
               TQT_SLOT(slotExternalEditorDone(KProcess*)));
       if (!mExtEditorProcess->start())
       {
-        KMessageBox::error( topLevelWidget(),
+        KMessageBox::error( tqtopLevelWidget(),
                             i18n("Unable to start external editor.") );
         killExternalEditor();
       } else {
@@ -503,7 +503,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
         lastSpace = paraText.length();
       TQString word = paraText.mid( firstSpace, lastSpace - firstSpace );
       //Continue if this word was misspelled
-      if( !word.isEmpty() && mReplacements.contains( word ) )
+      if( !word.isEmpty() && mReplacements.tqcontains( word ) )
       {
         KPopupMenu p;
 
@@ -607,7 +607,7 @@ void KMEdit::slotExternalEditorTempFileChanged( const TQString & fileName ) {
 
   insertLine(TQString::fromLocal8Bit(KPIM::kFileToString( fileName, true, false )), -1);
   setAutoUpdate(true);
-  repaint();
+  tqrepaint();
 }
 
 void KMEdit::slotExternalEditorDone( KProcess * proc ) {
@@ -627,7 +627,7 @@ void KMEdit::killExternalEditor() {
 bool KMEdit::checkExternalEditorFinished() {
   if ( !mExtEditorProcess )
     return true;
-  switch ( KMessageBox::warningYesNoCancel( topLevelWidget(),
+  switch ( KMessageBox::warningYesNoCancel( tqtopLevelWidget(),
            i18n("The external editor is still running.\n"
                 "Abort the external editor or leave it open?"),
            i18n("External Editor"),
@@ -870,7 +870,7 @@ void KMEdit::slotSpellResult(const TQString &s)
 void KMEdit::slotSpellDone()
 {
   kdDebug(5006)<<" void KMEdit::slotSpellDone()\n";
-  KSpell::spellStatus status = mKSpellForDialog->status();
+  KSpell::spelltqStatus status = mKSpellForDialog->status();
   delete mKSpellForDialog;
   mKSpellForDialog = 0;
 
@@ -880,7 +880,7 @@ void KMEdit::slotSpellDone()
   mComposer->sujectLineWidget()->deselect();
   if (status == KSpell::Error)
   {
-     KMessageBox::sorry( topLevelWidget(),
+     KMessageBox::sorry( tqtopLevelWidget(),
                          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( topLevelWidget(),
+     KMessageBox::sorry( tqtopLevelWidget(),
                          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( topLevelWidget(),
+          KMessageBox::information( tqtopLevelWidget(),
                                     i18n("No misspellings encountered.") );
   }
 }
diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp
index 370d796cb..2316321f5 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::null ,this );
   mBtn->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) );
-  mBtn->setFixedHeight( mLineEdit->sizeHint().height() );
+  mBtn->setFixedHeight( mLineEdit->tqsizeHint().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::fromLatin1("file:");
+    TQString file = TQString::tqfromLatin1("file:");
     if (parameter.startsWith(file))
         play = parameter.mid(file.length());
     KAudioPlayer::play(TQFile::encodeName(play));
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index 28a64633d..1d36677d6 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -186,9 +186,9 @@ bool KMFilter::folderRemoved( KMFolder* aFolder, KMFolder* aNewFolder )
 
 void KMFilter::setApplyOnAccount( uint id, bool aApply )
 {
-  if (aApply && !mAccounts.contains( id )) {
+  if (aApply && !mAccounts.tqcontains( id )) {
     mAccounts.append( id );
-  } else if (!aApply && mAccounts.contains( id )) {
+  } else if (!aApply && mAccounts.tqcontains( id )) {
     mAccounts.remove( id );
   }
 }
@@ -203,7 +203,7 @@ bool KMFilter::applyOnAccount( uint id ) const
     return result;
   }
   if ( applicability() == Checked )
-    return mAccounts.contains( id );
+    return mAccounts.tqcontains( id );
 
   return false;
 }
@@ -236,9 +236,9 @@ void KMFilter::readConfig(KConfig* config)
       bApplyOnExplicit = true;
       mApplicability = ButImap;
     } else {
-      bApplyOnInbound = bool(sets.contains("check-mail"));
-      bApplyOnOutbound = bool(sets.contains("send-mail"));
-      bApplyOnExplicit = bool(sets.contains("manual-filtering"));
+      bApplyOnInbound = bool(sets.tqcontains("check-mail"));
+      bApplyOnOutbound = bool(sets.tqcontains("send-mail"));
+      bApplyOnExplicit = bool(sets.tqcontains("manual-filtering"));
       mApplicability = (AccountType)config->readNumEntry( "Applicability", ButImap );
     }
 
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp
index 9b277d8e7..180c2746f 100644
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@@ -486,18 +486,18 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs
     // TQString( "%0 and %1 and %1" ).arg( 0 ).arg( 1 )
     // returns "0 and 1 and %1", so we must call .arg as
     // many times as there are %n's, regardless of their multiplicity.
-    if ((*it) == -1) result.replace( "%-1", tempFileName );
+    if ((*it) == -1) result.tqreplace( "%-1", tempFileName );
     else result = result.arg( tempFileName );
   }
 
-  // And finally, replace the %{foo} with the content of the foo
+  // And finally, tqreplace the %{foo} with the content of the foo
   // header field:
   TQRegExp header_rx( "%\\{([a-z0-9-]+)\\}", false );
   int idx = 0;
   while ( ( idx = header_rx.search( result, idx ) ) != -1 ) {
-    TQString replacement = KProcess::quote( aMsg->headerField( header_rx.cap(1).latin1() ) );
-    result.replace( idx, header_rx.matchedLength(), replacement );
-    idx += replacement.length();
+    TQString tqreplacement = KProcess::quote( aMsg->headerField( header_rx.cap(1).latin1() ) );
+    result.tqreplace( idx, header_rx.matchedLength(), tqreplacement );
+    idx += tqreplacement.length();
   }
 
   return result;
@@ -742,13 +742,13 @@ void KMFilterActionIdentity::setParamWidgetValue( TQWidget * paramWidget ) const
 }
 
 //=============================================================================
-// KMFilterActionSetStatus - set status to
+// KMFilterActionSeStatus - set status to
 // Set the status of messages
 //=============================================================================
-class KMFilterActionSetStatus: public KMFilterActionWithStringList
+class KMFilterActionSeStatus: public KMFilterActionWithStringList
 {
 public:
-  KMFilterActionSetStatus();
+  KMFilterActionSeStatus();
   virtual ReturnCode process(KMMessage* msg) const;
   virtual bool requiresBody(KMMsgBase*) const;
 
@@ -778,16 +778,16 @@ static const KMMsgStatus stati[] =
 };
 static const int StatiCount = sizeof( stati ) / sizeof( KMMsgStatus );
 
-KMFilterAction* KMFilterActionSetStatus::newAction()
+KMFilterAction* KMFilterActionSeStatus::newAction()
 {
-  return (new KMFilterActionSetStatus);
+  return (new KMFilterActionSeStatus);
 }
 
-KMFilterActionSetStatus::KMFilterActionSetStatus()
+KMFilterActionSeStatus::KMFilterActionSeStatus()
   : KMFilterActionWithStringList( "set status", i18n("Mark As") )
 {
   // if you change this list, also update
-  // KMFilterActionSetStatus::stati above
+  // KMFilterActionSeStatus::stati above
   mParameterList.append( "" );
   mParameterList.append( i18n("msg status","Important") );
   mParameterList.append( i18n("msg status","Read") );
@@ -804,22 +804,22 @@ KMFilterActionSetStatus::KMFilterActionSetStatus()
   mParameter = *mParameterList.at(0);
 }
 
-KMFilterAction::ReturnCode KMFilterActionSetStatus::process(KMMessage* msg) const
+KMFilterAction::ReturnCode KMFilterActionSeStatus::process(KMMessage* msg) const
 {
   int idx = mParameterList.findIndex( mParameter );
   if ( idx < 1 ) return ErrorButGoOn;
 
   KMMsgStatus status = stati[idx-1] ;
-  msg->setStatus( status );
+  msg->seStatus( status );
   return GoOn;
 }
 
-bool KMFilterActionSetStatus::requiresBody(KMMsgBase*) const
+bool KMFilterActionSeStatus::requiresBody(KMMsgBase*) const
 {
   return false;
 }
 
-void KMFilterActionSetStatus::argsFromString( const TQString argsStr )
+void KMFilterActionSeStatus::argsFromString( const TQString argsStr )
 {
   if ( argsStr.length() == 1 ) {
     for ( int i = 0 ; i < StatiCount ; i++ )
@@ -831,7 +831,7 @@ void KMFilterActionSetStatus::argsFromString( const TQString argsStr )
   mParameter = *mParameterList.at(0);
 }
 
-const TQString KMFilterActionSetStatus::argsAsString() const
+const TQString KMFilterActionSeStatus::argsAsString() const
 {
   int idx = mParameterList.findIndex( mParameter );
   if ( idx < 1 ) return TQString::null;
@@ -840,7 +840,7 @@ const TQString KMFilterActionSetStatus::argsAsString() const
   return KMMsgBase::statusToStr(status);
 }
 
-const TQString KMFilterActionSetStatus::displayString() const
+const TQString KMFilterActionSeStatus::displayString() const
 {
   // FIXME after string freeze:
   // return i18n("").arg( );
@@ -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->sizeHint().width() );
+  l->setFixedWidth( l->tqsizeHint().width() );
   hbl->addWidget( l, 0 );
   TQLineEdit *le = new KLineEdit( w, "ledit" );
   hbl->addWidget( le, 1 );
@@ -1194,9 +1194,9 @@ KMFilterAction::ReturnCode KMFilterActionRewriteHeader::process(KMMessage* msg)
   if ( mParameter.isEmpty() || !mRegExp.isValid() )
     return ErrorButGoOn;
 
-  KRegExp3 rx = mRegExp; // KRegExp3::replace is not const.
+  KRegExp3 rx = mRegExp; // KRegExp3::tqreplace is not const.
 
-  TQString newValue = rx.replace( msg->headerField( mParameter.latin1() ),
+  TQString newValue = rx.tqreplace( msg->headerField( mParameter.latin1() ),
                                      mReplacementString );
 
   msg->setHeaderField( mParameter.latin1(), newValue );
@@ -1214,17 +1214,17 @@ TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* parent ) con
   hbl->addWidget( cb, 0 /* stretch */ );
 
   TQLabel *l = new TQLabel( i18n("Replace:"), w );
-  l->setFixedWidth( l->sizeHint().width() );
+  l->setFixedWidth( l->tqsizeHint().width() );
   hbl->addWidget( l, 0 );
 
   RegExpLineEdit *rele = new RegExpLineEdit( w, "search" );
   hbl->addWidget( rele, 1 );
 
   l = new TQLabel( i18n("With:"), w );
-  l->setFixedWidth( l->sizeHint().width() );
+  l->setFixedWidth( l->tqsizeHint().width() );
   hbl->addWidget( l, 0 );
 
-  TQLineEdit *le = new KLineEdit( w, "replace" );
+  TQLineEdit *le = new KLineEdit( w, "tqreplace" );
   hbl->addWidget( le, 1 );
 
   setParamWidgetValue( w );
@@ -1250,7 +1250,7 @@ void KMFilterActionRewriteHeader::setParamWidgetValue( TQWidget* paramWidget ) c
   Q_ASSERT( rele );
   rele->setText( mRegExp.pattern() );
 
-  TQLineEdit *le = (TQLineEdit*)paramWidget->child("replace");
+  TQLineEdit *le = (TQLineEdit*)paramWidget->child("tqreplace");
   Q_ASSERT( le );
   le->setText( mReplacementString );
 }
@@ -1265,7 +1265,7 @@ void KMFilterActionRewriteHeader::applyParamWidgetValue( TQWidget* paramWidget )
   Q_ASSERT( rele );
   mRegExp.setPattern( rele->text() );
 
-  TQLineEdit *le = (TQLineEdit*)paramWidget->child("replace");
+  TQLineEdit *le = (TQLineEdit*)paramWidget->child("tqreplace");
   Q_ASSERT( le );
   mReplacementString = le->text();
 }
@@ -1280,7 +1280,7 @@ void KMFilterActionRewriteHeader::clearParamWidget( TQWidget* paramWidget ) cons
   Q_ASSERT( rele );
   rele->clear();
 
-  TQLineEdit *le = (TQLineEdit*)paramWidget->child("replace");
+  TQLineEdit *le = (TQLineEdit*)paramWidget->child("tqreplace");
   Q_ASSERT( le );
   le->clear();
 }
@@ -1898,7 +1898,7 @@ KMFilterAction::ReturnCode KMFilterActionExecSound::process(KMMessage*) const
   if ( mParameter.isEmpty() )
     return ErrorButGoOn;
   TQString play = mParameter;
-  TQString file = TQString::fromLatin1("file:");
+  TQString file = TQString::tqfromLatin1("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( KMFilterActionSetStatus::newAction );
+  insert( KMFilterActionSeStatus::newAction );
   insert( KMFilterActionFakeDisposition::newAction );
   insert( KMFilterActionTransport::newAction );
   insert( KMFilterActionReplyTo::newAction );
diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h
index 35f7008e4..55aba2cf2 100644
--- a/kmail/kmfilteraction.h
+++ b/kmail/kmfilteraction.h
@@ -648,7 +648,7 @@ struct KMFilterActionDesc
   KMFilterActionNewFunc create;
 };
 
-/** Dictionary that contains a list of all registered filter actions
+/** Dictionary that tqcontains a list of all registered filter actions
     with their creation functions. They are hard-coded into the
     constructor. If you want to add a new KMFilterAction, make
     sure you add the details of it in init, too.
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 558031f05..c9e42d1c7 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -131,7 +131,7 @@ const char * KMPopFilterDlgHelpAnchor =  "popfilters-id" ;
 KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, bool createDummyFilter )
   : KDialogBase( parent, name,  false  /* modality */,
 		 (popFilter)? i18n("POP3 Filter Rules"): i18n("Filter Rules") /* caption*/,
-		 Help|Ok|Apply|Cancel|User1|User2 /* button mask */,
+		 Help|Ok|Apply|Cancel|User1|User2 /* button tqmask */,
 		 Ok /* default btn */,  false  /* separator */),
   bPopFilter(popFilter)
 {
@@ -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->setAlignment( AlignVCenter | AlignRight );
+      keyButtonLabel->tqsetAlignment( AlignVCenter | AlignRight );
       gl->addMultiCellWidget( keyButtonLabel, 7, 7, 2, 2 );
       mKeyButton = new KKeyButton( adv_w, "FilterShortcutSelector" );
       gl->addMultiCellWidget( mKeyButton, 7, 7, 3, 3 );
@@ -339,11 +339,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
   connect( this, TQT_SIGNAL(finished()),
 	   this, TQT_SLOT(slotFinished()) );
 
-  KConfigGroup geometry( KMKernel::config(), "Geometry");
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry");
   const char * configKey
     = bPopFilter ? "popFilterDialogSize" : "filterDialogSize";
-  if ( geometry.hasKey( configKey ) )
-    resize( geometry.readSizeEntry( configKey ) );
+  if ( tqgeometry.hasKey( configKey ) )
+    resize( tqgeometry.readSizeEntry( configKey ) );
   else
     adjustSize();
 
@@ -356,8 +356,8 @@ void KMFilterDlg::slotFinished() {
 }
 
 void KMFilterDlg::slotSaveSize() {
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  geometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  tqgeometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
 }
 
 /** Set action of popFilter */
@@ -595,19 +595,19 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
   mBtnTop = new KPushButton( TQString::null, hb );
   mBtnTop->setAutoRepeat( true );
   mBtnTop->setIconSet( BarIconSet( "top", KIcon::SizeSmall ) );
-  mBtnTop->setMinimumSize( mBtnTop->sizeHint() * 1.2 );
+  mBtnTop->setMinimumSize( mBtnTop->tqsizeHint() * 1.2 );
   mBtnUp = new KPushButton( TQString::null, hb );
   mBtnUp->setAutoRepeat( true );
   mBtnUp->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
-  mBtnUp->setMinimumSize( mBtnUp->sizeHint() * 1.2 );
+  mBtnUp->setMinimumSize( mBtnUp->tqsizeHint() * 1.2 );
   mBtnDown = new KPushButton( TQString::null, hb );
   mBtnDown->setAutoRepeat( true );
   mBtnDown->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
-  mBtnDown->setMinimumSize( mBtnDown->sizeHint() * 1.2 );
+  mBtnDown->setMinimumSize( mBtnDown->tqsizeHint() * 1.2 );
   mBtnBot = new KPushButton( TQString::null, hb );
   mBtnBot->setAutoRepeat( true );
   mBtnBot->setIconSet( BarIconSet( "bottom", KIcon::SizeSmall ) );
-  mBtnBot->setMinimumSize( mBtnBot->sizeHint() * 1.2 );
+  mBtnBot->setMinimumSize( mBtnBot->tqsizeHint() * 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::null, hb );
   mBtnNew->setPixmap( BarIcon( "filenew", KIcon::SizeSmall ) );
-  mBtnNew->setMinimumSize( mBtnNew->sizeHint() * 1.2 );
+  mBtnNew->setMinimumSize( mBtnNew->tqsizeHint() * 1.2 );
   mBtnCopy = new TQPushButton( TQString::null, hb );
   mBtnCopy->setIconSet( BarIconSet( "editcopy", KIcon::SizeSmall ) );
-  mBtnCopy->setMinimumSize( mBtnCopy->sizeHint() * 1.2 );
+  mBtnCopy->setMinimumSize( mBtnCopy->tqsizeHint() * 1.2 );
   mBtnDelete = new TQPushButton( TQString::null, hb );
   mBtnDelete->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) );
-  mBtnDelete->setMinimumSize( mBtnDelete->sizeHint() * 1.2 );
+  mBtnDelete->setMinimumSize( mBtnDelete->tqsizeHint() * 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)")
         .arg( filter->pattern()->name() ) /*label*/,
      filter->pattern()->name() /* initial value */,
-     &okPressed, topLevelWidget(), 0, validator
+     &okPressed, tqtopLevelWidget(), 0, validator
      );
   delete validator;
 
@@ -1140,13 +1140,13 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name )
 
   // don't show scroll bars.
   mComboBox->setSizeLimit( mComboBox->count() );
-  // layout management:
-  // o the combo box is not to be made larger than it's sizeHint(),
+  // tqlayout management:
+  // o the combo box is not to be made larger than it's tqsizeHint(),
   //   the parameter widget should grow instead.
   // o the whole widget takes all space horizontally, but is fixed vertically.
   mComboBox->adjustSize();
-  mComboBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-  setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  mComboBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
   updateGeometry();
 
   // redirect focus to the filter action combo box
diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h
index 18da9b568..4b8d67a7d 100644
--- a/kmail/kmfilterdlg.h
+++ b/kmail/kmfilterdlg.h
@@ -216,7 +216,7 @@ private:
       that they are 'forced' to create parameter widgets for the
       widget stack and to clear them on setAction. */
   TQPtrList<KMFilterAction> mActionList;
-  /** The combo box that contains the labels of all KMFilterActions.
+  /** The combo box that tqcontains the labels of all KMFilterActions.
       It's @p activated(int) signal is internally
       connected to the @p raiseWidget(int) slot of @p mWidgetStack. */
   TQComboBox      *mComboBox;
@@ -386,7 +386,7 @@ protected slots:
   void slotExportFilters();
 
 protected:
-  /** The widget that contains the ListBox showing the filters, and
+  /** The widget that tqcontains the ListBox showing the filters, and
       the controls to remove filters, add new ones and to change their
       order. */
   KMFilterListBox *mFilterList;
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index beb3e60a5..2d1e6c914 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -174,7 +174,7 @@ int KMFilterMgr::process( KMMessage * msg, const KMFilter * filter ) {
   return result;
 }
 
-int KMFilterMgr::process( Q_UINT32 serNum, const KMFilter *filter )
+int KMFilterMgr::process( TQ_UINT32 serNum, const KMFilter *filter )
 {
   bool stopIt = false;
   int result = 1;
@@ -284,7 +284,7 @@ int KMFilterMgr::process( KMMessage * msg, FilterSet set,
   return 1;
 }
 
-bool KMFilterMgr::isMatching( Q_UINT32 serNum, const KMFilter *filter )
+bool KMFilterMgr::isMatching( TQ_UINT32 serNum, const KMFilter *filter )
 {
   bool result = false;
   if ( FilterLog::instance()->isLogging() ) {
@@ -437,11 +437,11 @@ const TQString KMFilterMgr::createUniqueName( const TQString & name )
 
 //-----------------------------------------------------------------------------
 void KMFilterMgr::appendFilters( const TQValueList<KMFilter*> &filters,
-                                 bool replaceIfNameExists )
+                                 bool tqreplaceIfNameExists )
 {
   mDirtyBufferedFolderTarget = true;
   beginUpdate();
-  if ( replaceIfNameExists ) {
+  if ( tqreplaceIfNameExists ) {
     TQValueListConstIterator<KMFilter*> it1 = filters.constBegin();
     for ( ; it1 != filters.constEnd() ; ++it1 ) {
       TQValueListConstIterator<KMFilter*> it2 = mFilters.constBegin();
diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h
index 609238661..eabfe0935 100644
--- a/kmail/kmfiltermgr.h
+++ b/kmail/kmfiltermgr.h
@@ -89,7 +89,7 @@ public:
       write everything back into the configuration. The filter manager
       takes ownership of the filters in the list. */
   void appendFilters( const TQValueList<KMFilter*> &filters,
-                      bool replaceIfNameExists = false );
+                      bool tqreplaceIfNameExists = false );
 
   /** Replace the list of filters under control of the filter manager.
    * The manager takes ownershipt of the filters. */
@@ -123,7 +123,7 @@ public:
 
   /** For ad-hoc filters. Applies @p filter to message with @p serNum .
       Return codes are as with the above method. */
-  int process( Q_UINT32 serNum, const KMFilter * filter );
+  int process( TQ_UINT32 serNum, const KMFilter * filter );
 
   void cleanup();
   /** Increment the reference count for the filter manager.
@@ -182,7 +182,7 @@ signals:
 private:
   int processPop( KMMessage *msg ) const;
   /** Find out if a message matches the filter criteria */
-  bool isMatching( Q_UINT32 serNum, const KMFilter *filter );
+  bool isMatching( TQ_UINT32 serNum, const KMFilter *filter );
 
   TQGuardedPtr<KMFilterDlg> mEditDialog;
   TQValueVector<KMFolder *> mOpenFolders;
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 68fb52f04..3825d1ee9 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -87,15 +87,15 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName,
   }
 
   if ( aParent ) {
-    connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-             aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ) );
-    connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-             parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ) );
-    connect( this, TQT_SIGNAL( msgChanged( KMFolder*, Q_UINT32, int ) ),
-             parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, Q_UINT32, int ) ) );
+    connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+             aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) );
+    connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+             parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
+    connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ),
+             parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) );
     connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*,  int ) ),
              parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
-    connect( mStorage, TQT_SIGNAL( invalidated( KMFolder* ) ),
+    connect( mStorage, TQT_SIGNAL( tqinvalidated( KMFolder* ) ),
              parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) );
   }
 
@@ -105,17 +105,17 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName,
   connect( mStorage, TQT_SIGNAL( expunged( KMFolder* ) ),
            TQT_SIGNAL( expunged( KMFolder* ) ) );
   connect( mStorage, TQT_SIGNAL( nameChanged() ), TQT_SIGNAL( nameChanged() ) );
-  connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-           TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ) );
+  connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+           TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
   connect( mStorage, TQT_SIGNAL( msgRemoved( int, TQString ) ),
            TQT_SIGNAL( msgRemoved( int, TQString ) ) );
   connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder* ) ),
            TQT_SIGNAL( msgRemoved( KMFolder* ) ) );
   connect( mStorage, TQT_SIGNAL( msgAdded( int ) ), TQT_SIGNAL( msgAdded( int ) ) );
-  connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-           TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ) );
-  connect( mStorage, TQT_SIGNAL( msgChanged( KMFolder*, Q_UINT32 , int ) ),
-           TQT_SIGNAL( msgChanged( KMFolder*, Q_UINT32 , int ) ) );
+  connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+           TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) );
+  connect( mStorage, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ),
+           TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ) );
   connect( mStorage, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ),
            TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
   connect( mStorage, TQT_SIGNAL( statusMsg( const TQString& ) ),
@@ -717,8 +717,8 @@ TQString KMFolder::idString() const
   TQString escapedName = name();
   /* Escape [ and ] as they are disallowed for kconfig sections and that is
      what the idString is primarily used for. */
-  escapedName.replace( "[", "%(" );
-  escapedName.replace( "]", "%)" );
+  escapedName.tqreplace( "[", "%(" );
+  escapedName.tqreplace( "]", "%)" );
   return relativePath + escapedName;
 }
 
@@ -828,15 +828,15 @@ int KMFolder::writeIndex( bool createEmptyIndex )
   return mStorage->writeIndex( createEmptyIndex );
 }
 
-void KMFolder::setStatus( int idx, KMMsgStatus status, bool toggle )
+void KMFolder::seStatus( int idx, KMMsgStatus status, bool toggle )
 {
-  mStorage->setStatus( idx, status, toggle );
+  mStorage->seStatus( idx, status, toggle );
 }
 
-void KMFolder::setStatus( TQValueList<int>& ids, KMMsgStatus status,
+void KMFolder::seStatus( TQValueList<int>& ids, KMMsgStatus status,
                           bool toggle )
 {
-  mStorage->setStatus( 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 3ff1d67de..77979b98f 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -53,7 +53,7 @@ namespace KMail {
 }
 using KMail::AttachmentStrategy;
 
-typedef TQValueList<Q_UINT32> SerNumList;
+typedef TQValueList<TQ_UINT32> SerNumList;
 
 /** Mail folder.
  * (description will be here).
@@ -272,7 +272,7 @@ public:
       contained by this folder */
   int countUnreadRecursive();
 
-  /** Called by KMMsgBase::setStatus 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 KMMsgStatus oldStatus,
                          const KMMsgStatus newStatus,
@@ -337,7 +337,7 @@ public:
   /** Change the dirty flag. */
   void setDirty(bool f);
 
-  /** Returns true if the folder contains deleted messages */
+  /** Returns true if the folder tqcontains deleted messages */
   bool needsCompacting() const;
   void setNeedsCompacting(bool f);
 
@@ -489,10 +489,10 @@ public:
   int writeIndex( bool createEmptyIndex = false );
 
   /** Set the status of the message at index @p idx to @p status. */
-  void setStatus(int idx, KMMsgStatus 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 setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
+  void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
 
   /** Icon related methods */
   bool useCustomIcons() const { return mUseCustomIcons; }
@@ -541,7 +541,7 @@ public:
 
   /**
   * Returns true if the name is valid for a child of this folder.
-  * If the name contains invalid characters then false is returned and message will contain
+  * If the name tqcontains invalid characters then false is returned and message will contain
   * an explanation that can be presented to the user.
   */
   bool isValidName( const TQString &folderName, TQString &message );
@@ -573,7 +573,7 @@ signals:
   void shortcutChanged( KMFolder * );
 
   /** Emitted before a message is removed from the folder. */
-  void msgRemoved(KMFolder*, Q_UINT32 sernum);
+  void msgRemoved(KMFolder*, TQ_UINT32 sernum);
 
   /** Emitted after a message is removed from the folder. */
   void msgRemoved( int idx, TQString msgIdMD5 );
@@ -581,10 +581,10 @@ signals:
 
   /** Emitted when a message is added from the folder. */
   void msgAdded(int idx);
-  void msgAdded(KMFolder*, Q_UINT32 sernum);
+  void msgAdded(KMFolder*, TQ_UINT32 sernum);
 
   /** Emitted, when the status of a message is changed */
-  void msgChanged(KMFolder*, Q_UINT32 sernum, int delta);
+  void msgChanged(KMFolder*, TQ_UINT32 sernum, int delta);
 
   /** Emitted when a field of the header of a specific message changed. */
   void msgHeaderChanged(KMFolder*, int);
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index a1c71726b..61e155acb 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -49,7 +49,7 @@ using KMail::AccountManager;
 #include "kmglobal.h"
 #include "acljobs.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 
 using KMail::CachedImapJob;
@@ -549,7 +549,7 @@ int KMFolderCachedImap::addMsgInternal( KMMessage* msg, bool newMail,
       if ( imapPath() == "/INBOX/" )
         filter = true;
     } else {
-      if ( GlobalSettings::filterSourceFolders().contains( folder()->id() ) )
+      if ( GlobalSettings::filterSourceFolders().tqcontains( folder()->id() ) )
         filter = true;
     }
     if ( filter )
@@ -744,7 +744,7 @@ void KMFolderCachedImap::slotTroubleshoot()
     TQString s2 = i18n("&Refresh");
     if( KMessageBox::warningContinueCancel( 0, str, s1, s2 ) ==
         KMessageBox::Continue )
-      account()->invalidateIMAPFolders( this );
+      account()->tqinvalidateIMAPFolders( this );
   } else {
     // Rebuild index file
     switch ( rc ) {
@@ -1394,11 +1394,11 @@ void KMFolderCachedImap::buildSubFolderList()
     while( node ) {
       if( !node->isDir() ) {
         KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>(static_cast<KMFolder*>(node)->storage());
-        const bool folderIsNew = mNewlyCreatedSubfolders.contains( TQGuardedPtr<KMFolderCachedImap>( storage ) );
+        const bool folderIsNew = mNewlyCreatedSubfolders.tqcontains( TQGuardedPtr<KMFolderCachedImap>( storage ) );
         // Only sync folders that have been accepted by the server
         if ( !storage->imapPath().isEmpty()
              // and that were not just deleted from it
-             && !foldersForDeletionOnServer.contains( storage->imapPath() ) ) {
+             && !foldersForDeletionOnServer.tqcontains( storage->imapPath() ) ) {
           if ( mRecurse || folderIsNew ) {
             mSubfoldersForSync << storage;
           }
@@ -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::setStatus( int idx, KMMsgStatus status, bool toggle)
+void KMFolderCachedImap::seStatus( int idx, KMMsgStatus status, bool toggle)
 {
-  KMFolderMaildir::setStatus( idx, status, toggle );
+  KMFolderMaildir::seStatus( idx, status, toggle );
   const KMMsgBase *msg = getMsgBase( idx );
   Q_ASSERT( msg );
   if ( msg )
     mUIDsOfLocallyChangedStatuses.insert( msg->UID() );
 }
 
-void KMFolderCachedImap::setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
+void KMFolderCachedImap::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
 {
-  KMFolderMaildir::setStatus(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 );
@@ -1907,7 +1907,7 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
            kdDebug(5006) << "Looking at uid " << uid << " high water is: " << lastUid() << " we should delete it" << endl;
 #endif
           // double check we deleted it since the last sync
-           if ( mDeletedUIDsSinceLastSync.contains(uid) ) {
+           if ( mDeletedUIDsSinceLastSync.tqcontains(uid) ) {
                if ( mUserRightsState != KMail::ACLJobs::Ok || ( mUserRights & KMail::ACLJobs::Delete ) ) {
 #if MAIL_LOSS_DEBUGGING
                    kdDebug(5006) << "message with uid " << uid << " is gone from local cache. Must be deleted on server!!!" << endl;
@@ -1941,8 +1941,8 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
         kdDebug(5006) << "Looking at uid " << uid << " high water is: " << lastUid() << " we should download it" << endl;
 #endif
         // The message is new since the last sync, but we might have just uploaded it, in which case
-        // the uid map already contains it.
-        if ( !uidMap.contains( uid ) ) {
+        // the uid map already tqcontains it.
+        if ( !uidMap.tqcontains( uid ) ) {
           mMsgsForDownload << KMail::CachedImapJob::MsgForDownload(uid, flags, size);
           if( imapPath() == "/INBOX/" )
             mUidsForDownload << uid;
@@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState()
   KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem();
   TQString str = i18n("Aborted");
   if (progressItem)
-     progressItem->setStatus( str );
+     progressItem->seStatus( str );
   emit statusMsg( str );
   emit syncStateChanged();
 }
@@ -2620,7 +2620,7 @@ void KMFolderCachedImap::newState( int progress, const TQString& syncStatus )
     else
       str = TQString( "%1: %2" ).arg( label() ).arg( syncStatus );
     if( progressItem )
-      progressItem->setStatus( str );
+      progressItem->seStatus( str );
     emit statusMsg( str );
   }
   if( progressItem )
@@ -2944,7 +2944,7 @@ KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
 
   bool cont = true;
   if ( job->error() ) {
-    // Don't show error if the server doesn't support ANNOTATEMORE and this folder only contains mail
+    // Don't show error if the server doesn't support ANNOTATEMORE and this folder only tqcontains mail
     if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) {
       if (mAccount->slave()) mAccount->removeJob(job);
     } else {
@@ -3095,7 +3095,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
       break;
 
     // create subfolder for this incident
-    TQDate today = TQDate::currentDate();
+    TQDate today = TQDate::tqcurrentDate();
     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 21abeabf9..61fcfcbac 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -283,8 +283,8 @@ public:
   void setACLList( const ACLList& arr );
 
   // Reimplemented so the mStatusChangedLocally bool can be set
-  virtual void setStatus( int id, KMMsgStatus status, bool toggle );
-  virtual void setStatus( TQValueList<int>& ids, KMMsgStatus 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; }
 
@@ -588,7 +588,7 @@ private:
   bool mSharedSeenFlagsChanged;
 
  /**
-  * UIDs added by setStatus. 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 533173e5e..4e17ce235 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::AcceptStatus s = mTabs[i]->accept();
+    FolderDiaTab::AccepStatus s = mTabs[i]->accept();
     if ( s == FolderDiaTab::Canceled ) {
       slotCancelAccept();
       return;
@@ -234,14 +234,14 @@ void KMFolderDialog::setFolder( KMFolder* folder )
   mFolder = folder;
 }
 
-static void addLine( TQWidget *parent, TQVBoxLayout* layout )
+static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout )
 {
    TQFrame *line = new TQFrame( parent, "line" );
    line->setGeometry( TQRect( 80, 150, 250, 20 ) );
    line->setFrameShape( TQFrame::HLine );
    line->setFrameShadow( TQFrame::Sunken );
    line->setFrameShape( TQFrame::HLine );
-   layout->addWidget( line );
+   tqlayout->addWidget( line );
 }
 
 //----------------------------------------------------------------------------
@@ -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->sizeHint());
+    mNameEdit->setMinimumSize(mNameEdit->tqsizeHint());
     // prevent renaming of IMAP inbox
     if ( mDlg->folder() && mDlg->folder()->isSystemFolder() ) {
       TQString imapPath;
@@ -449,7 +449,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
 
   addLine( this, topLayout );
 
-  // use grid layout for the following combobox settings
+  // use grid tqlayout for the following combobox settings
   TQGridLayout *gl = new TQGridLayout( topLayout, 3, 2, KDialog::spacingHint() );
   gl->setColStretch( 1, 100 ); // make the second column use all available space
   int row = -1;
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index 4db30ab12..31fb26d9b 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -82,12 +82,12 @@ public:
   /// @return whether save succeeded
   virtual bool save() = 0;
 
-  enum AcceptStatus { 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 AcceptStatus accept() {
+  virtual AccepStatus accept() {
     return save() ? Accepted : Canceled;
   }
 
diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp
index 1ecab637b..f3b80e3f1 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::fromLatin1(".%1.uidcache").arg(fname);
+          TQString imapcachefile = TQString::tqfromLatin1(".%1.uidcache").arg(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 e5c7bd827..c924fa8a1 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -322,7 +322,7 @@ int KMFolderImap::rename( const TQString& newName, KMFolderDir *aParent )
 void KMFolderImap::addMsgQuiet(KMMessage* aMsg)
 {
   KMFolder *aFolder = aMsg->parent();
-  Q_UINT32 serNum = 0;
+  TQ_UINT32 serNum = 0;
   aMsg->setTransferInProgress( false );
   if (aFolder) {
     serNum = aMsg->getMsgSerNum();
@@ -787,7 +787,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames,
   }
 
   // see if we have a better parent
-  // if you have a prefix that contains a folder (e.g "INBOX.") the folders
+  // if you have a prefix that tqcontains a folder (e.g "INBOX.") the folders
   // need to be created underneath it
   if ( root && !subfolderNames.empty() )
   {
@@ -849,7 +849,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames,
       // update progress
       account()->listDirProgressItem()->incCompletedItems();
       account()->listDirProgressItem()->updateProgress();
-      account()->listDirProgressItem()->setStatus( 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()->setStatus( 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->setStatus( 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->setStatus( i18n("Retrieving messages") );
+      mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
     url.setPath(imapPath() + ";UID=" + startUid
       + ":*;SECTION=ENVELOPE");
     KIO::SimpleJob *newJob = KIO::get(url, false, false);
@@ -1341,7 +1341,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
     mMailCheckProgressItem->setCompletedItems( 0 );
     mMailCheckProgressItem->setTotalItems( jd.total );
     mMailCheckProgressItem->setProgress( 0 );
-    mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
+    mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
   }
 
   TQStringList sets;
@@ -1460,7 +1460,7 @@ void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg)
 
   const KMMsgStatus oldStatus = msg->status();
   if ( (flags & 1) && (oldStatus & KMMsgStatusOld) == 0 )
-    msg->setStatus( KMMsgStatusOld );
+    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
@@ -1468,10 +1468,10 @@ void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg)
   if ( msg->isOfUnknownStatus() || (!(flags&1) && !(oldStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) {
     if (newMsg) {
       if ( (oldStatus & KMMsgStatusNew) == 0 )
-        msg->setStatus( KMMsgStatusNew );
+        msg->seStatus( KMMsgStatusNew );
     } else {
       if ( (oldStatus & KMMsgStatusUnread) == 0 )
-        msg->setStatus( KMMsgStatusUnread );
+        msg->seStatus( KMMsgStatusUnread );
     }
   }
 }
@@ -1596,14 +1596,14 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
         }
         // Transfer the status, if it is cached.
         if ( md ) {
-          msg->setStatus( 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->setStatus( md->status() );
+            msg->seStatus( md->status() );
             if ( md->serNum() != 0 && serNum == 0 ) {
               msg->setMsgSerNum( md->serNum() );
             }
@@ -1880,15 +1880,15 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::setStatus(int idx, KMMsgStatus status, bool toggle)
+void KMFolderImap::seStatus(int idx, KMMsgStatus status, bool toggle)
 {
   TQValueList<int> ids; ids.append(idx);
-  setStatus(ids, status, toggle);
+  seStatus(ids, status, toggle);
 }
 
-void KMFolderImap::setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle)
+void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle)
 {
-  FolderStorage::setStatus(_ids, status, toggle);
+  FolderStorage::seStatus(_ids, status, toggle);
   TQValueList<int> ids;
   if ( mUploadAllFlags ) {
     kdDebug(5006) << k_funcinfo << "Migrating all flags to the server" << endl;
@@ -2345,18 +2345,18 @@ void KMFolderImap::search( const KMSearchPattern* pattern )
   if ( !pattern || pattern->isEmpty() )
   {
     // not much to do here
-    TQValueList<Q_UINT32> serNums;
+    TQValueList<TQ_UINT32> serNums;
     emit searchResult( folder(), serNums, pattern, true );
     return;
   }
   SearchJob* job = new SearchJob( this, account(), pattern );
-  connect( job, TQT_SIGNAL( searchDone( TQValueList<Q_UINT32>, const KMSearchPattern*, bool ) ),
-           this, TQT_SLOT( slotSearchDone( TQValueList<Q_UINT32>, const KMSearchPattern*, bool ) ) );
+  connect( job, TQT_SIGNAL( searchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ),
+           this, TQT_SLOT( slotSearchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) );
   job->start();
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotSearchDone( TQValueList<Q_UINT32> serNums,
+void KMFolderImap::slotSearchDone( TQValueList<TQ_UINT32> serNums,
                                    const KMSearchPattern* pattern,
                                    bool complete )
 {
@@ -2364,7 +2364,7 @@ void KMFolderImap::slotSearchDone( TQValueList<Q_UINT32> serNums,
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::search( const KMSearchPattern* pattern, Q_UINT32 serNum )
+void KMFolderImap::search( const KMSearchPattern* pattern, TQ_UINT32 serNum )
 {
   if ( !pattern || pattern->isEmpty() )
   {
@@ -2373,13 +2373,13 @@ void KMFolderImap::search( const KMSearchPattern* pattern, Q_UINT32 serNum )
     return;
   }
   SearchJob* job = new SearchJob( this, account(), pattern, serNum );
-  connect( job, TQT_SIGNAL( searchDone( Q_UINT32, const KMSearchPattern*, bool ) ),
-           this, TQT_SLOT( slotSearchDone( Q_UINT32, const KMSearchPattern*, bool ) ) );
+  connect( job, TQT_SIGNAL( searchDone( TQ_UINT32, const KMSearchPattern*, bool ) ),
+           this, TQT_SLOT( slotSearchDone( TQ_UINT32, const KMSearchPattern*, bool ) ) );
   job->start();
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotSearchDone( Q_UINT32 serNum, const KMSearchPattern* pattern,
+void KMFolderImap::slotSearchDone( TQ_UINT32 serNum, const KMSearchPattern* pattern,
                                    bool matches )
 {
   emit searchDone( folder(), serNum, pattern, matches );
@@ -2411,7 +2411,7 @@ void KMFolderImap::saveMsgMetaData( KMMessage* msg, ulong uid )
     uid = msg->UID();
   }
   ulong serNum = msg->getMsgSerNum();
-  mUidMetaDataMap.replace( uid, new KMMsgMetaData(msg->status(), serNum) );
+  mUidMetaDataMap.tqreplace( uid, new KMMsgMetaData(msg->status(), serNum) );
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 76a3db98d..2f85685b6 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -63,14 +63,14 @@ class KMMsgMetaData
 public:
   KMMsgMetaData(KMMsgStatus aStatus)
     :mStatus(aStatus), mSerNum(0) {}
-  KMMsgMetaData(KMMsgStatus aStatus, Q_UINT32 aSerNum)
+  KMMsgMetaData(KMMsgStatus aStatus, TQ_UINT32 aSerNum)
     :mStatus(aStatus), mSerNum(aSerNum) {}
   ~KMMsgMetaData() {};
   KMMsgStatus status() const { return mStatus; }
-  Q_UINT32 serNum() const { return mSerNum; }
+  TQ_UINT32 serNum() const { return mSerNum; }
 private:
   KMMsgStatus mStatus;
-  Q_UINT32 mSerNum;
+  TQ_UINT32 mSerNum;
 };
 
 
@@ -167,7 +167,7 @@ public:
    * Create a new subfolder
    * You may specify the root imap path or this folder will be used
    * If you set askUser to false and the server can only handle folders
-   * that contain messages _or_ folders the new folder is set to "contains messages"
+   * that contain messages _or_ folders the new folder is set to "tqcontains messages"
    * by default
    */
   void createFolder(const TQString &name,
@@ -183,12 +183,12 @@ public:
    * Change the status of the message indicated by @p index
    * Overloaded function for the following one
    */
-  virtual void setStatus(int idx, KMMsgStatus status, bool toggle);
+  virtual void seStatus(int idx, KMMsgStatus status, bool toggle);
 
   /**
    * Change the status of several messages indicated by @p ids
    */
-  virtual void setStatus(TQValueList<int>& _ids, KMMsgStatus 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);
@@ -314,7 +314,7 @@ public:
     * is signaled with searchDone()
     */
   virtual void search( const KMSearchPattern* );
-  virtual void search( const KMSearchPattern*, Q_UINT32 serNum );
+  virtual void search( const KMSearchPattern*, TQ_UINT32 serNum );
 
   /** Returns true if this folder can be moved */
   virtual bool isMoveable() const;
@@ -395,14 +395,14 @@ public slots:
   /**
    * Called from the SearchJob when the folder is done or messages where found
    */
-  void slotSearchDone( TQValueList<Q_UINT32> serNums,
+  void slotSearchDone( TQValueList<TQ_UINT32> serNums,
                        const KMSearchPattern* pattern,
                        bool complete );
 
   /**
    * Called from the SearchJob when the message was searched
    */
-  void slotSearchDone( Q_UINT32 serNum, const KMSearchPattern* pattern, bool matches );
+  void slotSearchDone( TQ_UINT32 serNum, const KMSearchPattern* pattern, bool matches );
 
   /**
    * Connected to ListJob::receivedFolders
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index 95746ed18..a6b7f2ce3 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -151,10 +151,10 @@ int KMFolderIndex::writeIndex( bool createEmptyIndex )
   fprintf(tmpIndexStream, "# KMail-Index V%d\n", INDEX_VERSION);
 
   // Header
-  Q_UINT32 byteOrder = 0x12345678;
-  Q_UINT32 sizeOfLong = sizeof(long);
+  TQ_UINT32 byteOrder = 0x12345678;
+  TQ_UINT32 sizeOfLong = sizeof(long);
 
-  Q_UINT32 header_length = sizeof(byteOrder)+sizeof(sizeOfLong);
+  TQ_UINT32 header_length = sizeof(byteOrder)+sizeof(sizeOfLong);
   char pad_char = '\0';
   fwrite(&pad_char, sizeof(pad_char), 1, tmpIndexStream);
   fwrite(&header_length, sizeof(header_length), 1, tmpIndexStream);
@@ -220,7 +220,7 @@ bool KMFolderIndex::readIndex()
   if ( contentsType() != KMail::ContentsTypeMail ) {
     kdDebug(5006) << k_funcinfo << "Reading index for " << label() << endl;
   }
-  Q_INT32 len;
+  TQ_INT32 len;
   KMMsgInfo* mi;
 
   assert(mIndexStream != 0);
@@ -288,7 +288,7 @@ bool KMFolderIndex::readIndex()
 #ifdef OBSOLETE
     else if (mi->isNew())
     {
-      mi->setStatus(KMMsgStatusUnread);
+      mi->seStatus(KMMsgStatusUnread);
       mi->setDirty(false);
     }
 #endif
@@ -377,10 +377,10 @@ bool KMFolderIndex::readIndexHeader(int *gv)
   }
   else {
       // Header
-      Q_UINT32 byteOrder = 0;
-      Q_UINT32 sizeOfLong = sizeof(long); // default
+      TQ_UINT32 byteOrder = 0;
+      TQ_UINT32 sizeOfLong = sizeof(long); // default
 
-      Q_UINT32 header_length = 0;
+      TQ_UINT32 header_length = 0;
       fseek(mIndexStream, sizeof(char), SEEK_CUR );
       fread(&header_length, sizeof(header_length), 1, mIndexStream);
       if (header_length > 0xFFFF)
@@ -562,10 +562,10 @@ void KMFolderIndex::updateInvitationAndAddressFieldsFromContents()
         msg.fromDwString( msgString, false );
         msg.updateInvitationState();
         if ( msg.status() & KMMsgStatusHasInvitation ) {
-          msgInfo->setStatus( msgInfo->status() | KMMsgStatusHasInvitation );
+          msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasInvitation );
         }
         if ( msg.status() & KMMsgStatusHasNoInvitation ) {
-          msgInfo->setStatus( 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 29039765d..2762d143d 100644
--- a/kmail/kmfolderindex.h
+++ b/kmail/kmfolderindex.h
@@ -112,7 +112,7 @@ protected:
     /** Inserts messages into the message dictionary by iterating over the
      * message list. The messages will get new serial numbers. This is only
      * used on newly appeared folders, where there is no .ids file yet, or
-     * when that has been invalidated. */
+     * when that has been tqinvalidated. */
   virtual void fillMessageDict();
 
   /** table of contents file */
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 09800a94d..2ec8326ed 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -291,7 +291,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS
       continue;
 
     // first, make sure this isn't in the 'new' subdir
-    if ( entryList.contains( filename ) )
+    if ( entryList.tqcontains( filename ) )
       moveInternal(subdirNew + filename, subdirCur + filename, mi);
 
     // construct a valid filename.  if it's already valid, then
@@ -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->setStatus(KMMsgStatusUnread);
+      mi->seStatus(KMMsgStatusUnread);
       setDirty( true );
     }
 #endif
@@ -385,7 +385,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
     msgParent->getMsg( idx );
   }
 
-  aMsg->setStatusFields();
+  aMsg->seStatusFields();
   if (aMsg->headerField("Content-Type").isEmpty())  // This might be added by
     aMsg->removeHeaderField("Content-Type");        // the line above
 
@@ -404,7 +404,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
 
   if (len <= 0)
   {
-    kdDebug(5006) << "Message added to folder `" << name() << "' contains no data. Ignoring it." << endl;
+    kdDebug(5006) << "Message added to folder `" << name() << "' tqcontains no data. Ignoring it." << endl;
     return 0;
   }
 
@@ -480,7 +480,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
   if (aMsg->getMsgSerNum() <= 0)
     aMsg->setMsgSerNum();
   else
-    replaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
+    tqreplaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
 
   // write index entry if desired
   if (mAutoCreateIndex)
@@ -893,13 +893,13 @@ int KMFolderMaildir::createIndexFromContents()
   correctUnreadMsgsCount();
 
   if (kmkernel->outboxFolder() == folder() && count() > 0)
-    KMessageBox::information(0, i18n("Your outbox contains messages which were "
+    KMessageBox::information(0, i18n("Your outbox tqcontains messages which were "
     "most-likely not created by KMail;\nplease remove them from there if you "
     "do not want KMail to send them."));
 
   needsCompact = true;
 
-  invalidateFolder();
+  tqinvalidateFolder();
   return 0;
 }
 
@@ -1106,7 +1106,7 @@ void KMFolderMaildir::msgStatusChanged(const KMMsgStatus oldStatus,
 }
 
 /*virtual*/
-Q_INT64 KMFolderMaildir::doFolderSize() const
+TQ_INT64 KMFolderMaildir::doFolderSize() const
 {
   if ( mCurrentlyCheckingFolderSize )
   {
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index 12f24942c..d8be0139f 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -55,7 +55,7 @@ public:
   virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE)
   { return KMFolderIndex::removeMsg(msgList, imapQuiet); }
 
-  // Called by KMMsgBase::setStatus 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 KMMsgStatus oldStatus,
                                  const KMMsgStatus newStatus,
@@ -106,7 +106,7 @@ public:
   virtual bool isReadOnly() const { return false; }
  
   /** reimp */
-  virtual Q_INT64 doFolderSize() const;
+  virtual TQ_INT64 doFolderSize() const;
 
 protected:
   virtual FolderJob* doCreateJob( KMMessage *msg, FolderJob::JobType jt, KMFolder *folder,
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index c2e60a091..025a9d71d 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -55,7 +55,7 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 
 #ifndef MAX_LINE
 #define MAX_LINE 4096
@@ -682,7 +682,7 @@ int KMFolderMbox::createIndexFromContents()
                     replyToIdStr, replyToAuxIdStr, msgIdStr,
                     KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown,
                     KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid );
-          mi->setStatus(status, xstatus);
+          mi->seStatus(status, xstatus);
           mi->setDate( dateStr.stripWhiteSpace() );
           mi->setDirty(false);
           mMsgList.append(mi, mExportsSernums );
@@ -805,11 +805,11 @@ int KMFolderMbox::createIndexFromContents()
 
   if (kmkernel->outboxFolder() == folder() && count() > 0)
     KMessageBox::queuedMessageBox(0, KMessageBox::Information,
-                                  i18n("Your outbox contains messages which were "
+                                  i18n("Your outbox tqcontains messages which were "
     "most-likely not created by KMail;\nplease remove them from there if you "
     "do not want KMail to send them."));
 
-  invalidateFolder();
+  tqinvalidateFolder();
   return 0;
 }
 
@@ -852,7 +852,7 @@ static size_t unescapeFrom( char* str, size_t strLen ) {
       *d++ = *s++;  // == '>'
       while ( s < e && *s == '>' )
         *d++ = *s++;
-      if ( qstrncmp( s, "From ", STRDIM("From ") ) == 0 )
+      if ( tqstrncmp( s, "From ", STRDIM("From ") ) == 0 )
         --d;
     }
     *d++ = *s++; // yes, s might be e here, but e is not the end :-)
@@ -887,7 +887,7 @@ TQByteArray KMFolderMbox::escapeFrom( const DwString & str ) {
     case '>':
       break;
     case 'F':
-      if ( onlyAnglesAfterLF && qstrncmp( s+1, "rom ", STRDIM("rom ") ) == 0 )
+      if ( onlyAnglesAfterLF && tqstrncmp( s+1, "rom ", STRDIM("rom ") ) == 0 )
         *d++ = '>';
       // fall through
     default:
@@ -979,7 +979,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
     fileD0.close();  // If data is 0 we just create a zero length file.
 }
 */
-    aMsg->setStatusFields();
+    aMsg->seStatusFields();
 /*
 TQFile fileD1( "testdat_xx-kmfoldermbox-1" );
 if( fileD1.open( IO_WriteOnly ) ) {
@@ -998,7 +998,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
   clearerr(mStream);
   if (len <= 0)
   {
-    kdDebug(5006) << "Message added to folder `" << name() << "' contains no data. Ignoring it." << endl;
+    kdDebug(5006) << "Message added to folder `" << name() << "' tqcontains no data. Ignoring it." << endl;
     return 0;
   }
 
@@ -1085,7 +1085,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
   if ( aMsg->getMsgSerNum() <= 0 )
     aMsg->setMsgSerNum();
   else
-    replaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
+    tqreplaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
 
   // change the length of the previous message to encompass white space added
   if ((idx > 0) && (growth > 0)) {
@@ -1175,7 +1175,7 @@ int KMFolderMbox::compact( unsigned int startIndex, int nbMessages, FILE* tmpfil
         mtext.resize(20);
       fread(mtext.data(), 20, 1, mStream);
       if(i <= 0) { //woops we've reached the top of the file, last try..
-        if ( mtext.contains( "from ", false ) ) {
+        if ( mtext.tqcontains( "from ", false ) ) {
           if (mtext.size() < (size_t)folder_offset)
               mtext.resize(folder_offset);
           if(fseek(mStream, chunk_offset, SEEK_SET) == -1 ||
@@ -1238,9 +1238,9 @@ int KMFolderMbox::compact( bool silent )
 
   // If this is the current folder, the changed signal will ultimately call
   // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it
-  TQString statusMsg = BroadcastStatus::instance()->statusMsg();
+  TQString statusMsg = BroadcasStatus::instance()->statusMsg();
   emit changed();
-  BroadcastStatus::instance()->setStatusMsg( statusMsg );
+  BroadcasStatus::instance()->seStatusMsg( statusMsg );
   return rc;
 }
 
@@ -1276,10 +1276,10 @@ int KMFolderMbox::expungeContents()
 
 //-----------------------------------------------------------------------------
 /*virtual*/
-Q_INT64 KMFolderMbox::doFolderSize() const
+TQ_INT64 KMFolderMbox::doFolderSize() const
 {
   TQFileInfo info( location() );
-  return (Q_INT64)(info.size());
+  return (TQ_INT64)(info.size());
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h
index 15159b98c..7c48324e9 100644
--- a/kmail/kmfoldermbox.h
+++ b/kmail/kmfoldermbox.h
@@ -112,7 +112,7 @@ public:
   virtual IndexStatus indexStatus();
 
   /**  reimp */
-  virtual Q_INT64 doFolderSize() const;
+  virtual TQ_INT64 doFolderSize() const;
 
 protected:
   virtual FolderJob* doCreateJob( KMMessage *msg, FolderJob::JobType jt, KMFolder *folder,
diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h
index d4ec786e0..587d85255 100644
--- a/kmail/kmfoldermgr.h
+++ b/kmail/kmfoldermgr.h
@@ -150,17 +150,17 @@ signals:
   /** Emitted, when a folder has been added. */
   void folderAdded(KMFolder*);
 
-  /** Emitted, when serial numbers for a folder have been invalidated. */
+  /** Emitted, when serial numbers for a folder have been tqinvalidated. */
   void folderInvalidated(KMFolder*);
 
   /** Emitted, when a message has been appended to a folder */
-  void msgAdded(KMFolder*, Q_UINT32);
+  void msgAdded(KMFolder*, TQ_UINT32);
 
   /** Emitted, when a message has been removed from a folder */
-  void msgRemoved(KMFolder*, Q_UINT32);
+  void msgRemoved(KMFolder*, TQ_UINT32);
 
   /** Emitted, when the status of a message is changed */
-  void msgChanged(KMFolder*, Q_UINT32, int delta);
+  void msgChanged(KMFolder*, TQ_UINT32, int delta);
 
   /** Emitted when a field of the header of a specific message changed. */
   void msgHeaderChanged(KMFolder*, int idx);
diff --git a/kmail/kmfoldernode.h b/kmail/kmfoldernode.h
index 3d0dbaddc..2eb197a3b 100644
--- a/kmail/kmfoldernode.h
+++ b/kmail/kmfoldernode.h
@@ -35,7 +35,7 @@ public:
   virtual ~KMFolderNode();
 
   /** Is it a directory where mail folders are stored or is it a folder that
-    contains mail ?
+    tqcontains mail ?
     Note that there are some kinds of mail folders like the type mh uses that
     are directories on disk but are handled as folders here. */
   virtual bool isDir(void) const;
diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp
index 522785d11..471d2f3e0 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -262,9 +262,9 @@ void KMSearch::slotProcessNextBatch()
             folder->open("kmsearch");
             mOpenedFolders.append( folder );
             connect( folder->storage(),
-                TQT_SIGNAL( searchResult( KMFolder*, TQValueList<Q_UINT32>, const KMSearchPattern*, bool ) ),
+                TQT_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ),
                 this,
-                TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<Q_UINT32>, const KMSearchPattern*, bool ) ) );
+                TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) );
             folder->storage()->search( mSearchPattern );
         } else
             --mRemainingFolders;
@@ -274,7 +274,7 @@ void KMSearch::slotProcessNextBatch()
 }
 
 void KMSearch::slotSearchFolderResult( KMFolder* folder,
-                                       TQValueList<Q_UINT32> serNums,
+                                       TQValueList<TQ_UINT32> serNums,
                                        const KMSearchPattern* pattern,
                                        bool complete )
 {
@@ -282,7 +282,7 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder,
       return;
     kdDebug(5006) << k_funcinfo << folder->label() << " found " << serNums.count() << endl;
     mLastFolder = folder->label();
-    TQValueListIterator<Q_UINT32> it;
+    TQValueListIterator<TQ_UINT32> it;
     for ( it = serNums.begin(); it != serNums.end(); ++it )
     {
       emit found( *it );
@@ -291,10 +291,10 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder,
     if ( complete )
     {
       disconnect( folder->storage(),
-          TQT_SIGNAL( searchResult( KMFolder*, TQValueList<Q_UINT32>,
+          TQT_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>,
                                 const KMSearchPattern*, bool ) ),
           this,
-          TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<Q_UINT32>,
+          TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>,
                                         const KMSearchPattern*, bool ) ) );
       --mRemainingFolders;
       mSearchCount += folder->count();
@@ -325,12 +325,12 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name)
 
     //Hook up some slots for live updating of search folders
     //TODO: Optimize folderInvalidated, folderAdded, folderRemoved
-    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineAddedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineRemovedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, Q_UINT32, int)),
-            this, TQT_SLOT(examineChangedMessage(KMFolder*, Q_UINT32, int)));
+    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
+            this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
     connect(kmkernel->folderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
             this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
     connect(kmkernel->folderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)),
@@ -340,12 +340,12 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name)
     connect(kmkernel->folderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)),
             this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int)));
 
-    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineAddedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineRemovedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, Q_UINT32, int)),
-            this, TQT_SLOT(examineChangedMessage(KMFolder*, Q_UINT32, int)));
+    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
+            this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
     connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
             this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
     connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)),
@@ -355,12 +355,12 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name)
     connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)),
             this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int)));
 
-    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineAddedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineRemovedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, Q_UINT32, int)),
-            this, TQT_SLOT(examineChangedMessage(KMFolder*, Q_UINT32, int)));
+    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
+            this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
     connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
             this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
     connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)),
@@ -399,8 +399,8 @@ void KMFolderSearch::setSearch(KMSearch *search)
         delete mSearch;
         mSearch = search; // take ownership
         if (mSearch) {
-            TQObject::connect(search, TQT_SIGNAL(found(Q_UINT32)),
-                    TQT_SLOT(addSerNum(Q_UINT32)));
+            TQObject::connect(search, TQT_SIGNAL(found(TQ_UINT32)),
+                    TQT_SLOT(addSerNum(TQ_UINT32)));
             TQObject::connect(search, TQT_SIGNAL(finished(bool)),
                     TQT_SLOT(searchFinished(bool)));
         }
@@ -423,7 +423,7 @@ void KMFolderSearch::executeSearch()
     if (mSearch)
         mSearch->stop();
     setSearch(mSearch);
-    invalidateFolder();
+    tqinvalidateFolder();
 }
 
 const KMSearch* KMFolderSearch::search() const
@@ -438,7 +438,7 @@ void KMFolderSearch::searchFinished(bool success)
     close("foldersearch");
 }
 
-void KMFolderSearch::addSerNum(Q_UINT32 serNum)
+void KMFolderSearch::addSerNum(TQ_UINT32 serNum)
 {
     if (mInvalid) // A new search is scheduled don't bother doing anything
         return;
@@ -472,9 +472,9 @@ void KMFolderSearch::addSerNum(Q_UINT32 serNum)
     emitMsgAddedSignals(mSerNums.count()-1);
 }
 
-void KMFolderSearch::removeSerNum(Q_UINT32 serNum)
+void KMFolderSearch::removeSerNum(TQ_UINT32 serNum)
 {
-    TQValueVector<Q_UINT32>::const_iterator it;
+    TQValueVector<TQ_UINT32>::const_iterator it;
     int i = 0;
     for(it = mSerNums.begin(); it != mSerNums.end(); ++it, ++i)
         if ((*it) == serNum) {
@@ -502,7 +502,7 @@ int KMFolderSearch::addMsg(KMMessage*, int* index_return)
 bool KMFolderSearch::readSearch()
 {
     mSearch = new KMSearch;
-    TQObject::connect(mSearch, TQT_SIGNAL(found(Q_UINT32)), TQT_SLOT(addSerNum(Q_UINT32)));
+    TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32)));
     TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool)));
     return mSearch->read(location());
 }
@@ -603,7 +603,7 @@ int KMFolderSearch::create()
     clearIndex();
     if (!mSearch) {
         mSearch = new KMSearch();
-        TQObject::connect(mSearch, TQT_SIGNAL(found(Q_UINT32)), TQT_SLOT(addSerNum(Q_UINT32)));
+        TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32)));
         TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool)));
     }
     mSearch->write(location());
@@ -645,7 +645,7 @@ const KMMsgBase* KMFolderSearch::getMsgBase(int idx) const
 {
     int folderIdx = -1;
     KMFolder *folder = 0;
-    if (idx < 0 || (Q_UINT32)idx >= mSerNums.count())
+    if (idx < 0 || (TQ_UINT32)idx >= mSerNums.count())
         return 0;
     KMMsgDict::instance()->getLocation(mSerNums[idx], &folder, &folderIdx);
     assert(folder && (folderIdx != -1));
@@ -656,7 +656,7 @@ KMMsgBase* KMFolderSearch::getMsgBase(int idx)
 {
     int folderIdx = -1;
     KMFolder *folder = 0;
-    if (idx < 0 || (Q_UINT32)idx >= mSerNums.count())
+    if (idx < 0 || (TQ_UINT32)idx >= mSerNums.count())
         return 0;
     KMMsgDict::instance()->getLocation(mSerNums[idx], &folder, &folderIdx);
     if (!folder || folderIdx == -1)
@@ -669,7 +669,7 @@ KMMessage* KMFolderSearch::getMsg(int idx)
 {
     int folderIdx = -1;
     KMFolder *folder = 0;
-    if (idx < 0 || (Q_UINT32)idx >= mSerNums.count())
+    if (idx < 0 || (TQ_UINT32)idx >= mSerNums.count())
         return 0;
     KMMsgDict::instance()->getLocation(mSerNums[idx], &folder, &folderIdx);
     assert(folder && (folderIdx != -1));
@@ -701,8 +701,8 @@ KMFolderSearch::ignoreJobsForMessage( KMMessage* msg )
 int KMFolderSearch::find(const KMMsgBase* msg) const
 {
     int pos = 0;
-    Q_UINT32 serNum = msg->getMsgSerNum();
-    TQValueVector<Q_UINT32>::const_iterator it;
+    TQ_UINT32 serNum = msg->getMsgSerNum();
+    TQValueVector<TQ_UINT32>::const_iterator it;
     for(it = mSerNums.begin(); it != mSerNums.end(); ++it) {
         if ((*it) == serNum)
             return pos;
@@ -757,19 +757,19 @@ int KMFolderSearch::writeIndex( bool )
         return -1;
     }
     fprintf(tmpIndexStream, IDS_SEARCH_HEADER, IDS_SEARCH_VERSION);
-    Q_UINT32 byteOrder = 0x12345678;
+    TQ_UINT32 byteOrder = 0x12345678;
     fwrite(&byteOrder, sizeof(byteOrder), 1, tmpIndexStream);
 
-    Q_UINT32 count = mSerNums.count();
+    TQ_UINT32 count = mSerNums.count();
     if (!fwrite(&count, sizeof(count), 1, tmpIndexStream)) {
         fclose(tmpIndexStream);
         truncate(TQFile::encodeName(filename), 0);
         return -1;
     }
 
-    TQValueVector<Q_UINT32>::iterator it;
+    TQValueVector<TQ_UINT32>::iterator it;
     for(it = mSerNums.begin(); it != mSerNums.end(); ++it) {
-        Q_UINT32 serNum = *it;
+        TQ_UINT32 serNum = *it;
         if (!fwrite(&serNum, sizeof(serNum), 1, tmpIndexStream))
             return -1;
     }
@@ -815,7 +815,7 @@ bool KMFolderSearch::readIndex()
         return false;
     }
     bool swapByteOrder;
-    Q_UINT32 byte_order;
+    TQ_UINT32 byte_order;
     if (!fread(&byte_order, sizeof(byte_order), 1, mIdsStream)) {
         fclose(mIdsStream);
         mIdsStream = 0;
@@ -823,7 +823,7 @@ bool KMFolderSearch::readIndex()
     }
     swapByteOrder = (byte_order == 0x78563412);
 
-    Q_UINT32 count;
+    TQ_UINT32 count;
     if (!fread(&count, sizeof(count), 1, mIdsStream)) {
         fclose(mIdsStream);
         mIdsStream = 0;
@@ -835,7 +835,7 @@ bool KMFolderSearch::readIndex()
     mUnreadMsgs = 0;
     mSerNums.reserve(count);
     for (unsigned int index = 0; index < count; index++) {
-        Q_UINT32 serNum;
+        TQ_UINT32 serNum;
         int folderIdx = -1;
         KMFolder *folder = 0;
         bool readOk = fread(&serNum, sizeof(serNum), 1, mIdsStream);
@@ -901,7 +901,7 @@ KMMsgBase* KMFolderSearch::takeIndexEntry(int idx)
 {
     assert(idx >= 0 && idx < (int)mSerNums.count());
     KMMsgBase *msgBase = getMsgBase(idx);
-    TQValueVector<Q_UINT32>::iterator it = mSerNums.begin();
+    TQValueVector<TQ_UINT32>::iterator it = mSerNums.begin();
     mSerNums.erase(&it[idx]);
     return msgBase;
 }
@@ -932,7 +932,7 @@ void KMFolderSearch::truncateIndex()
     truncate(TQFile::encodeName(indexLocation()), IDS_SEARCH_HEADER_LEN);
 }
 
-void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, Q_UINT32 serNum)
+void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, TQ_UINT32 serNum)
 {
     if (!search() && !readSearch())
         return;
@@ -954,14 +954,14 @@ void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, Q_UINT32 serNum)
     KMFolderOpener openFolder(folder, "foldersearch");
 
     // if we are already checking this folder, refcount
-    if ( mFoldersCurrentlyBeingSearched.contains( folder ) ) {
+    if ( mFoldersCurrentlyBeingSearched.tqcontains( folder ) ) {
       unsigned int count = mFoldersCurrentlyBeingSearched[folder];
-      mFoldersCurrentlyBeingSearched.replace( folder, count+1 );
+      mFoldersCurrentlyBeingSearched.tqreplace( folder, count+1 );
     } else {
       connect( folder->storage(),
-              TQT_SIGNAL( searchDone( KMFolder*, Q_UINT32, const KMSearchPattern*, bool ) ),
+              TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ),
               this,
-              TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, Q_UINT32,
+              TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
                       const KMSearchPattern*, bool ) ) );
       mFoldersCurrentlyBeingSearched.insert( folder, 1 );
     }
@@ -969,7 +969,7 @@ void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, Q_UINT32 serNum)
 }
 
 void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder,
-                                               Q_UINT32 serNum,
+                                               TQ_UINT32 serNum,
                                                const KMSearchPattern* pattern,
                                                bool matches )
 {
@@ -978,24 +978,24 @@ void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder,
      << " matches?" << matches << endl;
     KMFolderOpener openFolder(folder, "foldersearch");
 
-    Q_ASSERT( mFoldersCurrentlyBeingSearched.contains( folder ) );
+    Q_ASSERT( mFoldersCurrentlyBeingSearched.tqcontains( folder ) );
 
     unsigned int count = mFoldersCurrentlyBeingSearched[folder];
     if ( count == 1 ) {
       disconnect( folder->storage(),
-                  TQT_SIGNAL( searchDone( KMFolder*, Q_UINT32,
+                  TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32,
                                       const KMSearchPattern*, bool ) ),
                   this,
-                  TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, Q_UINT32,
+                  TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
                                                   const KMSearchPattern*, bool ) ) );
       mFoldersCurrentlyBeingSearched.remove( folder );
     } else {
-      mFoldersCurrentlyBeingSearched.replace( folder, count-1 );
+      mFoldersCurrentlyBeingSearched.tqreplace( folder, count-1 );
     }
 
     if ( !matches ) {
-        TQValueVector<Q_UINT32>::const_iterator it;
-        it = qFind( mSerNums.begin(), mSerNums.end(), serNum );
+        TQValueVector<TQ_UINT32>::const_iterator it;
+        it = tqFind( mSerNums.begin(), mSerNums.end(), serNum );
         if (it != mSerNums.end()) {
             removeSerNum( serNum );
         }
@@ -1006,15 +1006,15 @@ void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder,
 //        mSearch->stop();
 //        mExecuteSearchTimer->start( 0, true );
 //    } else {
-        TQValueVector<Q_UINT32>::const_iterator it;
-        it = qFind( mSerNums.begin(), mSerNums.end(), serNum );
+        TQValueVector<TQ_UINT32>::const_iterator it;
+        it = tqFind( mSerNums.begin(), mSerNums.end(), serNum );
         if (it == mSerNums.end()) {
             addSerNum( serNum );
         }
 //    }
 }
 
-void KMFolderSearch::examineRemovedMessage(KMFolder *folder, Q_UINT32 serNum)
+void KMFolderSearch::examineRemovedMessage(KMFolder *folder, TQ_UINT32 serNum)
 {
     if (!search() && !readSearch())
         return;
@@ -1032,7 +1032,7 @@ void KMFolderSearch::examineRemovedMessage(KMFolder *folder, Q_UINT32 serNum)
     }
 }
 
-void KMFolderSearch::examineChangedMessage(KMFolder *aFolder, Q_UINT32 serNum, int delta)
+void KMFolderSearch::examineChangedMessage(KMFolder *aFolder, TQ_UINT32 serNum, int delta)
 {
     if (!search() && !readSearch())
         return;
@@ -1042,8 +1042,8 @@ void KMFolderSearch::examineChangedMessage(KMFolder *aFolder, Q_UINT32 serNum, i
         open("foldersearch");
         mTempOpened = true;
     }
-    TQValueVector<Q_UINT32>::const_iterator it;
-    it = qFind( mSerNums.begin(), mSerNums.end(), serNum );
+    TQValueVector<TQ_UINT32>::const_iterator it;
+    it = tqFind( mSerNums.begin(), mSerNums.end(), serNum );
     if (it != mSerNums.end()) {
         mUnreadMsgs += delta;
         emit numUnreadMsgsChanged( folder() );
@@ -1102,8 +1102,8 @@ void KMFolderSearch::propagateHeaderChanged(KMFolder *aFolder, int idx)
         mTempOpened = true;
     }
 
-    Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(aFolder, idx);
-    TQValueVector<Q_UINT32>::const_iterator it;
+    TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(aFolder, idx);
+    TQValueVector<TQ_UINT32>::const_iterator it;
     for(it = mSerNums.begin(); it != mSerNums.end(); ++it) {
         if ((*it) == serNum) {
             emit msgHeaderChanged(folder(), pos);
@@ -1115,14 +1115,14 @@ void KMFolderSearch::propagateHeaderChanged(KMFolder *aFolder, int idx)
     KMFolderOpener openAFolder(aFolder, "foldersearch");
 
     // if we are already checking this folder, refcount
-    if ( mFoldersCurrentlyBeingSearched.contains( aFolder ) ) {
+    if ( mFoldersCurrentlyBeingSearched.tqcontains( aFolder ) ) {
       unsigned int count = mFoldersCurrentlyBeingSearched[aFolder];
-      mFoldersCurrentlyBeingSearched.replace( aFolder, count+1 );
+      mFoldersCurrentlyBeingSearched.tqreplace( aFolder, count+1 );
     } else {
       connect( aFolder->storage(),
-              TQT_SIGNAL( searchDone( KMFolder*, Q_UINT32, const KMSearchPattern*, bool ) ),
+              TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ),
               this,
-              TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, Q_UINT32,
+              TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
                       const KMSearchPattern*, bool ) ) );
       mFoldersCurrentlyBeingSearched.insert( aFolder, 1 );
     }
diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h
index 180995dac..ced2af350 100644
--- a/kmail/kmfoldersearch.h
+++ b/kmail/kmfoldersearch.h
@@ -37,7 +37,7 @@
     numbers of all messages that currently match the search.
 **/
 
-typedef TQValueList<Q_UINT32> SerNumList;
+typedef TQValueList<TQ_UINT32> SerNumList;
 class KMSearchPattern;
 class KMFolderImap;
 class KMFolderSearchJob;
@@ -78,12 +78,12 @@ public slots:
   void indexFinished();
 
 signals:
-  void found(Q_UINT32 serNum);
+  void found(TQ_UINT32 serNum);
   void finished(bool success);
 
 protected slots:
   void slotProcessNextBatch();
-  void slotSearchFolderResult( KMFolder*, TQValueList<Q_UINT32>,
+  void slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>,
                                const KMSearchPattern*, bool );
 
 protected:
@@ -140,12 +140,12 @@ protected slots:
   // Called when the search is finished
   void searchFinished(bool success);
   // Look at a new message and if it matches search() add it to the cache
-  void examineAddedMessage(KMFolder *folder, Q_UINT32 serNum);
+  void examineAddedMessage(KMFolder *folder, TQ_UINT32 serNum);
   // Look at a removed message and remove it from the cache
-  void examineRemovedMessage(KMFolder *folder, Q_UINT32 serNum);
+  void examineRemovedMessage(KMFolder *folder, TQ_UINT32 serNum);
   // Look at a message whose status has changed
-  void examineChangedMessage(KMFolder *folder, Q_UINT32 serNum, int delta);
-  // The serial numbers for a folder have been invalidated, deal with it
+  void examineChangedMessage(KMFolder *folder, TQ_UINT32 serNum, int delta);
+  // The serial numbers for a folder have been tqinvalidated, deal with it
   void examineInvalidatedFolder(KMFolder *folder);
   // A folder has been deleted, deal with it
   void examineRemovedFolder(KMFolder *folder);
@@ -155,16 +155,16 @@ protected slots:
 public slots:
   // Appends the serial number to the cached list of messages that match
   // the search for this folder
-  void addSerNum(Q_UINT32 serNum);
+  void addSerNum(TQ_UINT32 serNum);
   // Removes the serial number from the cached list of messages that match
   // the search for this folder
-  void removeSerNum(Q_UINT32 serNum);
+  void removeSerNum(TQ_UINT32 serNum);
 
   /** Incrementally update the index if possible else call writeIndex */
   virtual int updateIndex();
 
   // Examine the message
-  void slotSearchExamineMsgDone( KMFolder*, Q_UINT32 serNum,
+  void slotSearchExamineMsgDone( KMFolder*, TQ_UINT32 serNum,
                                  const KMSearchPattern*, bool );
 
 public:
@@ -183,7 +183,7 @@ public:
   virtual TQString indexLocation() const;
   virtual int writeIndex( bool createEmptyIndex = false );
   DwString getDwString(int idx);
-  Q_UINT32 serNum(int idx) { return mSerNums[idx]; }
+  TQ_UINT32 serNum(int idx) { return mSerNums[idx]; }
 
 protected:
   virtual FolderJob* doCreateJob(KMMessage *msg, FolderJob::JobType jt,
@@ -202,9 +202,9 @@ protected:
   virtual void truncateIndex();
 
 private:
-  TQValueVector<Q_UINT32> mSerNums;
+  TQValueVector<TQ_UINT32> mSerNums;
   TQValueList<TQGuardedPtr<KMFolder> > mFolders;
-  TQValueStack<Q_UINT32> mUnexaminedMessages;
+  TQValueStack<TQ_UINT32> mUnexaminedMessages;
   FILE *mIdsStream;
   KMSearch *mSearch;
   bool mInvalid, mUnlinked;
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index d2e098b8d..115c638e6 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -267,14 +267,14 @@ void KMFolderTreeItem::slotIconsChanged()
   else
     setPixmap( 0, normalIcon( iconSize() ) );
   emit iconChanged( this );
-  repaint();
+  tqrepaint();
 }
 
 void KMFolderTreeItem::slotNameChanged()
 {
   setText( 0, mFolder->label() );
   emit nameChanged( this );
-  repaint();
+  tqrepaint();
 }
 
 void KMFolderTreeItem::slotNoContentChanged()
@@ -495,7 +495,7 @@ void KMFolderTree::readConfig (void)
       setFont(KGlobalSettings::generalFont());
   }
 
-  // restore the layout
+  // restore the tqlayout
   restoreLayout(conf, "Geometry");
 }
 
@@ -510,7 +510,7 @@ void KMFolderTree::writeConfig()
       writeIsListViewItemOpen(fti);
   }
 
-  // save the current layout
+  // save the current tqlayout
   saveLayout(KMKernel::config(), "Geometry");
 }
 
@@ -556,7 +556,7 @@ void KMFolderTree::reload(bool openFolders)
 
   int top = contentsY();
   mLastItem = 0;
-  // invalidate selected drop item
+  // tqinvalidate selected drop item
   oldSelected = 0;
   // remember last
   KMFolder* last = currentFolder();
@@ -627,9 +627,9 @@ void KMFolderTree::reload(bool openFolders)
              this, TQT_SLOT(slotSyncStateChanged()) );
 
     // we want to be noticed of changes to update the unread/total columns
-    disconnect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)),
+    disconnect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
         this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
-    connect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)),
+    connect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
         this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
     //}
 
@@ -737,7 +737,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
     } else {
       // hide local inbox if unused
       if ( kmkernel->inboxFolder() == folder && hideLocalInbox() ) {
-        connect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)), TQT_SLOT(slotUnhideLocalInbox()) );
+        connect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(slotUnhideLocalInbox()) );
         continue;
       }
 
@@ -800,7 +800,7 @@ void KMFolderTree::delayedUpdate()
         continue;
 
       if ( fti->needsRepaint() ) {
-        fti->repaint();
+        fti->tqrepaint();
         fti->setNeedsRepaint( false );
       }
     }
@@ -1419,7 +1419,7 @@ void KMFolderTree::openFolder()
     autoopen_timer.stop();
     if ( dropItem && !dropItem->isOpen() ) {
         dropItem->setOpen( true );
-        dropItem->repaint();
+        dropItem->tqrepaint();
     }
 }
 
@@ -1467,7 +1467,7 @@ void KMFolderTree::contentsDragMoveEvent( TQDragMoveEvent *e )
         }
 
         if ( dragAccepted ) {
-            e->accept( itemRect(i) );
+            e->accept( tqitemRect(i) );
 
             switch ( e->action() ) {
                 case TQDropEvent::Copy:
@@ -1634,8 +1634,8 @@ void KMFolderTree::slotRenameFolder(TQListViewItem *item, int col,
   else
           fldName = oldFldName;
 
-  fldName.replace("/", "");
-  fldName.replace(TQRegExp("^\\."), "");
+  fldName.tqreplace("/", "");
+  fldName.tqreplace(TQRegExp("^\\."), "");
 
   if (fldName.isEmpty())
           fldName = i18n("unnamed");
@@ -1648,7 +1648,7 @@ void KMFolderTree::slotRenameFolder(TQListViewItem *item, int col,
 void KMFolderTree::slotUpdateCountsDelayed(KMFolder * folder)
 {
 //  kdDebug(5006) << "KMFolderTree::slotUpdateCountsDelayed()" << endl;
-  if ( !mFolderToUpdateCount.contains( folder->idString() ) )
+  if ( !mFolderToUpdateCount.tqcontains( folder->idString() ) )
   {
 //    kdDebug( 5006 )<< "adding " << folder->idString() << " to updateCountList " << endl;
     mFolderToUpdateCount.insert( folder->idString(),folder );
@@ -1897,7 +1897,7 @@ void KMFolderTree::folderToPopupMenu( MenuAction action, TQObject *receiver,
       continue;
     }
     TQString label = fti->text( 0 );
-    label.replace( "&","&&" );
+    label.tqreplace( "&","&&" );
     if ( fti->firstChild() )
     {
       // new level
@@ -1985,7 +1985,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
     if ( source )
       sourceFolderName = source->label();
 
-    if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( sourceFolderName ) ) {
+    if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.tqcontains( sourceFolderName ) ) {
       KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same name already exists.</qt>")
           .arg( sourceFolderName ) );
       setDragEnabled( true );
@@ -2118,7 +2118,7 @@ void KMFolderTree::cutFolder()
 void KMFolderTree::pasteFolder()
 {
   KMFolderTreeItem *item = static_cast<KMFolderTreeItem*>( currentItem() );
-  if ( !mCopySourceFolders.isEmpty() && item && !mCopySourceFolders.contains( item->folder() ) ) {
+  if ( !mCopySourceFolders.isEmpty() && item && !mCopySourceFolders.tqcontains( item->folder() ) ) {
     moveOrCopyFolder( mCopySourceFolders, item->folder(), mCutFolder );
     if ( mCutFolder )
       mCopySourceFolders.clear();
@@ -2176,7 +2176,7 @@ void KMFolderTree::slotAddToFavorites()
 
 void KMFolderTree::slotUnhideLocalInbox()
 {
-  disconnect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)),
+  disconnect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
               this, TQT_SLOT(slotUnhideLocalInbox()) );
   reload();
 }
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index b7244c6c3..640da9507 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -165,7 +165,7 @@ public:
     MoveFolder
   };
 
-  /** Generate a popup menu that contains all folders that can have content */
+  /** Generate a popup menu that tqcontains all folders that can have content */
   void folderToPopupMenu( MenuAction action, TQObject *receiver, KMMenuToFolder *,
       TQPopupMenu *menu, TQListViewItem *start = 0 );
 
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index bcfc06f3b..06fc89360 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -22,7 +22,7 @@ using KMail::ActionScheduler;
 #include "messagecopyhelper.h"
 using KMail::MessageCopyHelper;
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 using KPIM::ProgressItem;
@@ -409,7 +409,7 @@ void KMHeaders::paintEmptyArea( TQPainter * p, const TQRect & rect )
                         rect.left() + contentsX(),
                         rect.top() + contentsY() );
   else
-    p->fillRect( rect, colorGroup().base() );
+    p->fillRect( rect, tqcolorGroup().base() );
 }
 
 bool KMHeaders::event(TQEvent *e)
@@ -719,7 +719,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       disconnect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ),
-                  BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
+                  BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
       disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
       writeSortOrder();
       mFolder->close("kmheaders");
@@ -752,7 +752,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       connect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)),
-              BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
+              BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
       connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
           this, TQT_SLOT(setFolderInfoStatus()));
       connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
@@ -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 = itemRect( oldFirstVisibleItem ).y();
+  const int oldOffsetOfFirstVisibleItem = tqitemRect( 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)->setStatus( KMMsgStatusWatched );
+      mFolder->getMsgBase(id)->seStatus( KMMsgStatusWatched );
     else if (parent && mFolder->getMsgBase(parent->id())->isIgnored())
-      mFolder->getMsgBase(id)->setStatus( KMMsgStatusIgnored );
+      mFolder->getMsgBase(id)->seStatus( KMMsgStatusIgnored );
     if (parent)
       hi = new HeaderItem( parent->item(), id );
     else
@@ -952,7 +952,7 @@ void KMHeaders::msgAdded(int id)
     mItems[id] = hi;
 
     if ( !msgId.isEmpty() )
-      mSortCacheItems.replace(msgId, sci);
+      mSortCacheItems.tqreplace(msgId, sci);
     /* Add to the list of potential parents for subject threading. But only if
      * we are top level. */
     if (mSubjThreading && parent) {
@@ -1163,11 +1163,11 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
       }
 
       if ((!parent || sci->isImperfectlyThreaded())
-                      && !mImperfectlyThreadedList.containsRef(item))
+                      && !mImperfectlyThreadedList.tqcontainsRef(item))
         mImperfectlyThreadedList.append(item);
 
       if (parent && !sci->isImperfectlyThreaded()
-          && mImperfectlyThreadedList.containsRef(item))
+          && mImperfectlyThreadedList.tqcontainsRef(item))
         mImperfectlyThreadedList.removeRef(item);
     }
   }
@@ -1214,7 +1214,7 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId)
   HeaderItem *item = mItems[msgId];
   if (item) {
     item->irefresh();
-    item->repaint();
+    item->tqrepaint();
   }
 }
 
@@ -1227,7 +1227,7 @@ void KMHeaders::setMsgStatus (KMMsgStatus status, bool toggle)
   if (serNums.empty())
     return;
 
-  KMCommand *command = new KMSetStatusCommand( status, serNums, toggle );
+  KMCommand *command = new KMSeStatusCommand( status, serNums, toggle );
   command->start();
 }
 
@@ -1268,7 +1268,7 @@ void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle)
         TQListViewItem *top = item;
         while ( top->parent() )
           top = top->parent();
-        if (!topOfThreads.contains(top)) {
+        if (!topOfThreads.tqcontains(top)) {
           topOfThreads.append(top);
         }
       }
@@ -1298,7 +1298,7 @@ void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle)
   if (serNums.empty())
     return;
 
-  KMCommand *command = new KMSetStatusCommand( status, serNums, toggle );
+  KMCommand *command = new KMSeStatusCommand( status, serNums, toggle );
   command->start();
 }
 
@@ -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( style().isA("KeramikStyle") )
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != lineWidth() )
@@ -1403,7 +1403,7 @@ void KMHeaders::setFolderInfoStatus ()
               : i18n( "0 messages" ); // no need for "0 unread" to be added here
   if ( mFolder->isReadOnly() )
     str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").arg( str );
-  BroadcastStatus::instance()->setStatusMsg(str);
+  BroadcasStatus::instance()->seStatusMsg(str);
 }
 
 //-----------------------------------------------------------------------------
@@ -1452,7 +1452,7 @@ void KMHeaders::applyFiltersOnMsg()
         progressItem->updateProgress();
         TQString statusMsg = i18n("Filtering message %1 of %2");
         statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
-        KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
+        KPIM::BroadcasStatus::instance()->seStatusMsg( statusMsg );
         KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
       }
 
@@ -1501,7 +1501,7 @@ void KMHeaders::setMsgRead (int msgId)
     serNums.append( msgBase->getMsgSerNum() );
   }
 
-  KMCommand *command = new KMSetStatusCommand( KMMsgStatusRead, serNums );
+  KMCommand *command = new KMSeStatusCommand( KMMsgStatusRead, serNums );
   command->start();
 }
 
@@ -1523,7 +1523,7 @@ void KMHeaders::deleteMsg ()
            this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) );
   command->start();
 
-  BroadcastStatus::instance()->setStatusMsg("");
+  BroadcasStatus::instance()->seStatusMsg("");
   //  triggerUpdate();
 }
 
@@ -1620,11 +1620,11 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
   if ( command->result() == KMCommand::OK ) {
     // make sure the current item is shown
     makeHeaderVisible();
-    BroadcastStatus::instance()->setStatusMsg(
+    BroadcasStatus::instance()->seStatusMsg(
        deleted ? i18n("Messages deleted successfully.") : i18n("Messages moved successfully") );
   } else {
     /* The move failed or the user canceled it; reset the state of all
-     * messages involved and repaint.
+     * messages involved and tqrepaint.
      *
      * Note: This potentially resets too many items if there is more than one
      *       move going on. Oh well, I suppose no animals will be harmed.
@@ -1643,10 +1643,10 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
     }
     triggerUpdate();
     if ( command->result() == KMCommand::Failed )
-      BroadcastStatus::instance()->setStatusMsg(
+      BroadcasStatus::instance()->seStatusMsg(
            deleted ? i18n("Deleting messages failed.") : i18n("Moving messages failed.") );
     else
-      BroadcastStatus::instance()->setStatusMsg(
+      BroadcasStatus::instance()->seStatusMsg(
            deleted ? i18n("Deleting messages canceled.") : i18n("Moving messages canceled.") );
  }
  mOwner->updateMessageActions();
@@ -1736,7 +1736,7 @@ void KMHeaders::setSelectedByIndex( TQValueList<int> items, bool selected )
   }
 }
 
-void KMHeaders::clearSelectableAndAboutToBeDeleted( Q_UINT32 serNum )
+void KMHeaders::clearSelectableAndAboutToBeDeleted( TQ_UINT32 serNum )
 {
   // fugly, but I see no way around it
   for (TQListViewItemIterator it(this); it.current(); it++) {
@@ -1828,7 +1828,7 @@ void KMHeaders::selectNextMessage()
         temp->firstChild();
         temp = temp->parent();
       }
-      lvi->repaint();
+      lvi->tqrepaint();
       /* test to see if we need to unselect messages on back track */
       (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true));
       setCurrentItem(below);
@@ -1866,7 +1866,7 @@ void KMHeaders::selectPrevMessage()
         temp->firstChild();
         temp = temp->parent();
       }
-      lvi->repaint();
+      lvi->tqrepaint();
       /* test to see if we need to unselect messages on back track */
       (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true));
       setCurrentItem(above);
@@ -2135,10 +2135,10 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread)
     return;
   }
 
-  BroadcastStatus::instance()->setStatusMsg("");
+  BroadcasStatus::instance()->seStatusMsg("");
   if (markitread && idx >= 0) setMsgRead(idx);
   mItems[idx]->irefresh();
-  mItems[idx]->repaint();
+  mItems[idx]->tqrepaint();
   emit selected( msg );
   setFolderInfoStatus();
 }
@@ -2151,7 +2151,7 @@ void KMHeaders::highlightCurrentThread()
   for ( it.toFirst() ; it.current() ; ++it ) {
       TQListViewItem *lvi = *it;
       lvi->setSelected( true );
-      lvi->repaint();
+      lvi->tqrepaint();
   }
 }
 
@@ -2192,7 +2192,7 @@ void KMHeaders::updateMessageList( bool set_selection, bool forceJumpToUnread )
   noRepaint = false;
   KListView::setSorting( mSortCol, !mSortDescending );
   if (!mFolder) {
-    repaint();
+    tqrepaint();
     return;
   }
   readSortOrder( set_selection, forceJumpToUnread );
@@ -2326,10 +2326,10 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
     /* Explicitely set selection state. This is necessary because we want to
      * also select all children of closed threads when the parent is selected. */
 
-    // unless ctrl mask, set selected if it isn't already
+    // unless ctrl tqmask, set selected if it isn't already
     if ( !( e->state() & ControlButton ) && !wasSelected )
       setSelected( lvi, true );
-    // if ctrl mask, toggle selection
+    // if ctrl tqmask, toggle selection
     if ( e->state() & ControlButton )
       setSelected( lvi, !wasSelected );
 
@@ -2424,7 +2424,7 @@ void KMHeaders::highlightMessage(TQListViewItem* i)
 //-----------------------------------------------------------------------------
 void KMHeaders::slotRMB()
 {
-  if (!topLevelWidget()) return; // safe bet
+  if (!tqtopLevelWidget()) return; // safe bet
   mOwner->updateMessageActions();
 
   // check if the user clicked into a status column and only show the respective menues
@@ -2673,14 +2673,14 @@ static void internalWriteItem(FILE *sortStream, KMFolder *folder, int msgid,
 
   fwrite(&msgSerNum, sizeof(msgSerNum), 1, sortStream);
   fwrite(&parentSerNum, sizeof(parentSerNum), 1, sortStream);
-  Q_INT32 len = key.length() * sizeof(TQChar);
+  TQ_INT32 len = key.length() * sizeof(TQChar);
   fwrite(&len, sizeof(len), 1, sortStream);
   if (len)
-    fwrite(key.unicode(), QMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream);
+    fwrite(key.tqunicode(), QMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream);
 
   if (update_discover) {
     //update the discovered change count
-      Q_INT32 discovered_count = 0;
+      TQ_INT32 discovered_count = 0;
       fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 20, SEEK_SET);
       fread(&discovered_count, sizeof(discovered_count), 1, sortStream);
       discovered_count++;
@@ -2734,13 +2734,13 @@ bool KMHeaders::writeSortOrder()
     mSortInfo.column = mSortCol;
     fprintf(sortStream, KMAIL_SORT_HEADER, KMAIL_SORT_VERSION);
     //magic header information
-    Q_INT32 byteOrder = 0x12345678;
-    Q_INT32 column = mSortCol;
-    Q_INT32 ascending= !mSortDescending;
-    Q_INT32 threaded = isThreaded();
-    Q_INT32 appended=0;
-    Q_INT32 discovered_count = 0;
-    Q_INT32 sorted_count=0;
+    TQ_INT32 byteOrder = 0x12345678;
+    TQ_INT32 column = mSortCol;
+    TQ_INT32 ascending= !mSortDescending;
+    TQ_INT32 threaded = isThreaded();
+    TQ_INT32 appended=0;
+    TQ_INT32 discovered_count = 0;
+    TQ_INT32 sorted_count=0;
     fwrite(&byteOrder, sizeof(byteOrder), 1, sortStream);
     fwrite(&column, sizeof(column), 1, sortStream);
     fwrite(&ascending, sizeof(ascending), 1, sortStream);
@@ -2845,7 +2845,7 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi)
                       khi->key(mSortCol, !mSortDescending), false);
 
     //update the appended flag FIXME obsolete?
-    Q_INT32 appended = 1;
+    TQ_INT32 appended = 1;
     fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 16, SEEK_SET);
     fwrite(&appended, sizeof(appended), 1, sortStream);
     fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 16, SEEK_SET);
@@ -2950,7 +2950,7 @@ void KMHeaders::buildThreadingTree( TQMemArray<SortCacheItem *> sortCache )
         KMMsgBase *mi = mFolder->getMsgBase(x);
         TQString md5 = mi->msgIdMD5();
         if(!md5.isEmpty())
-            mSortCacheItems.replace(md5, sortCache[x]);
+            mSortCacheItems.tqreplace(md5, sortCache[x]);
     }
 }
 
@@ -3014,7 +3014,7 @@ SortCacheItem* KMHeaders::findParent(SortCacheItem *item)
         // if you keep your outgoing messages in an OUTBOX, for
         // example, try the list of references, because the second
         // to last will likely be in this folder. replyToAuxIdMD5
-        // contains the second to last one.
+        // tqcontains the second to last one.
         TQString  ref = msg->replyToAuxIdMD5();
         if (!ref.isEmpty())
             parent = mSortCacheItems[ref];
@@ -3065,8 +3065,8 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
     if (!mFolder->isOpened()) mFolder->open("kmheaders");
 
     //all cases
-    Q_INT32 column, ascending, threaded, discovered_count, sorted_count, appended;
-    Q_INT32 deleted_count = 0;
+    TQ_INT32 column, ascending, threaded, discovered_count, sorted_count, appended;
+    TQ_INT32 deleted_count = 0;
     bool unread_exists = false;
     bool jumpToUnread = (GlobalSettings::self()->actionEnterFolder() ==
                          GlobalSettings::EnumActionEnterFolder::SelectFirstUnreadNew) ||
@@ -3096,7 +3096,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
         if (fscanf(sortStream, KMAIL_SORT_HEADER, &version) != 1)
           version = -1;
         if(version == KMAIL_SORT_VERSION) {
-          Q_INT32 byteOrder = 0;
+          TQ_INT32 byteOrder = 0;
           fread(&byteOrder, sizeof(byteOrder), 1, sortStream);
           if (byteOrder == 0x12345678)
           {
@@ -3321,8 +3321,8 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
             qsort(unsorted, unsorted_count, sizeof(SortCacheItem *), //sort
                   compare_SortCacheItem);
 
-        /* The sorted list now contains all sorted children of this item, while
-         * the (aptly named) unsorted array contains all as of yet unsorted
+        /* The sorted list now tqcontains all sorted children of this item, while
+         * the (aptly named) unsorted array tqcontains all as of yet unsorted
          * ones. It has just been qsorted, so it is in itself sorted. These two
          * sorted lists are now merged into one. */
         for(TQPtrListIterator<SortCacheItem> it(*sorted);
@@ -3355,9 +3355,9 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
                 // If the parent is watched or ignored, propagate that to it's
                 // children
                 if (mFolder->getMsgBase(i->id())->isWatched())
-                  mFolder->getMsgBase(new_kci->id())->setStatus(KMMsgStatusWatched);
+                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusWatched);
                 if (mFolder->getMsgBase(i->id())->isIgnored())
-                  mFolder->getMsgBase(new_kci->id())->setStatus(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());
@@ -3515,7 +3515,7 @@ void KMHeaders::setCurrentItemBySerialNum( unsigned long serialNum )
 {
   // Linear search == slow. Don't overuse this method.
   // It's currently only used for finding the current item again
-  // after expiry deleted mails (so the index got invalidated).
+  // after expiry deleted mails (so the index got tqinvalidated).
   for (int i = 0; i < (int)mItems.size() - 1; ++i) {
     KMMsgBase *mMsgBase = mFolder->getMsgBase( i );
     if ( mMsgBase->getMsgSerNum() == serialNum ) {
@@ -3587,21 +3587,21 @@ void KMHeaders::updateActions()
     paste->setEnabled( true );
 }
 
-void KMHeaders::setCopiedMessages(const TQValueList< Q_UINT32 > & msgs, bool move)
+void KMHeaders::setCopiedMessages(const TQValueList< TQ_UINT32 > & msgs, bool move)
 {
   mCopiedMessages = msgs;
   mMoveMessages = move;
   updateActions();
 }
 
-bool KMHeaders::isMessageCut(Q_UINT32 serNum) const
+bool KMHeaders::isMessageCut(TQ_UINT32 serNum) const
 {
-  return mMoveMessages && mCopiedMessages.contains( serNum );
+  return mMoveMessages && mCopiedMessages.tqcontains( serNum );
 }
 
-TQValueList< Q_UINT32 > KMHeaders::selectedSernums()
+TQValueList< TQ_UINT32 > KMHeaders::selectedSernums()
 {
-  TQValueList<Q_UINT32> list;
+  TQValueList<TQ_UINT32> list;
   for ( TQListViewItemIterator it(this); it.current(); it++ ) {
     if ( it.current()->isSelected() && it.current()->isVisible() ) {
       HeaderItem* item = static_cast<HeaderItem*>( it.current() );
@@ -3614,9 +3614,9 @@ TQValueList< Q_UINT32 > KMHeaders::selectedSernums()
   return list;
 }
 
-TQValueList< Q_UINT32 > KMHeaders::selectedVisibleSernums()
+TQValueList< TQ_UINT32 > KMHeaders::selectedVisibleSernums()
 {
-  TQValueList<Q_UINT32> list;
+  TQValueList<TQ_UINT32> list;
   TQListViewItemIterator it(this, TQListViewItemIterator::Selected|TQListViewItemIterator::Visible);
   while( it.current() ) {
     if ( it.current()->isSelected() && it.current()->isVisible() ) {
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index 4055e3c3b..4eddbdf46 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -32,7 +32,7 @@ class TQIconSet;
 class TQDateTime;
 
 typedef TQPtrList<KMMsgBase> KMMessageList;
-typedef TQValueList<Q_UINT32> SerNumList;
+typedef TQValueList<TQ_UINT32> SerNumList;
 typedef TQMap<int,KMFolder*> KMMenuToFolder;
 enum NestingPolicy { AlwaysOpen = 0, DefaultOpen, DefaultClosed, OpenUnread };
 
@@ -102,7 +102,7 @@ public:
                                KMMessage* aMsg = 0);
 
   /** Resets toBeDeleted and selectable status of all selected items. */
-  virtual void clearSelectableAndAboutToBeDeleted(Q_UINT32 serNum);
+  virtual void clearSelectableAndAboutToBeDeleted(TQ_UINT32 serNum);
   /** Returns list of selected messages. Mark the corresponding
       header items to be deleted, if specified. */
   virtual KMMessageList* selectedMsgs(bool toBeDeleted = false);
@@ -111,12 +111,12 @@ public:
   TQValueList<int> selectedItems();
 
   /** Returns the sernums of all selected items. */
-  TQValueList<Q_UINT32> selectedSernums();
+  TQValueList<TQ_UINT32> selectedSernums();
 
   /** Returns the sernums of all visible (ie. items with expanded parent, not hidden by
       eg. the quick search) selected items.
   */
-  TQValueList<Q_UINT32> selectedVisibleSernums();
+  TQValueList<TQ_UINT32> selectedVisibleSernums();
 
   /** Returns index of message returned by last getMsg() call */
   int indexOfGetMsg (void) const { return getMsgIndex; }
@@ -198,13 +198,13 @@ public:
     @param msgs A list of serial numbers.
     @param move if true, the messages were cutted
   */
-  void setCopiedMessages( const TQValueList<Q_UINT32> &msgs, bool move );
+  void setCopiedMessages( const TQValueList<TQ_UINT32> &msgs, bool move );
 
   /**
     Returns true if the message with the given serial number has been cut.
     @param serNum A message serial number.
   */
-  bool isMessageCut( Q_UINT32 serNum ) const;
+  bool isMessageCut( TQ_UINT32 serNum ) const;
 
   /** Write global config options. */
   virtual void writeConfig(void);
@@ -469,7 +469,7 @@ private:
   KPopupMenu* mPopup;
 
   // copied messages
-  TQValueList<Q_UINT32> mCopiedMessages;
+  TQValueList<TQ_UINT32> mCopiedMessages;
   bool mMoveMessages;
 }; // class
 #endif
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index d0e706f90..b464913b6 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -11,7 +11,7 @@
 
 #include "globalsettings.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmstartup.h"
 #include "index.h"
 #include "kmmainwin.h"
@@ -814,7 +814,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
   int retval;
   bool readFolderMsgIds = false;
   TQString _foldername = foldername.stripWhiteSpace();
-  _foldername = _foldername.replace('\\',""); //try to prevent ESCAPE Sequences
+  _foldername = _foldername.tqreplace('\\',""); //try to prevent ESCAPE Sequences
 
   if ( foldername != mAddMessageLastFolder ) {
     mAddMessageMsgIds.clear();
@@ -840,7 +840,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
     msg->fromString( messageText );
 
     if (readFolderMsgIds) {
-      if ( foldername.contains("/")) {
+      if ( foldername.tqcontains("/")) {
         TQString tmp_fname = "";
         KMFolder *folder = NULL;
         KMFolderDir *subfolder;
@@ -947,7 +947,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
 
         if ( !MsgStatusFlags.isEmpty() ) {
           KMMsgStatus status = strToStatus(MsgStatusFlags);
-          if (status) msg->setStatus(status);
+          if (status) msg->seStatus(status);
         }
 
         int index;
@@ -1000,7 +1000,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
   bool createNewFolder = false;
 
   TQString _foldername = foldername.stripWhiteSpace();
-  _foldername = _foldername.replace('\\',""); //try to prevent ESCAPE Sequences
+  _foldername = _foldername.tqreplace('\\',""); //try to prevent ESCAPE Sequences
 
   if ( foldername != mAddMessageLastFolder ) {
     createNewFolder = true;
@@ -1018,7 +1018,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
     msg->fromString( messageText );
 
     if (createNewFolder) {
-      if ( foldername.contains("/")) {
+      if ( foldername.tqcontains("/")) {
         TQString tmp_fname = "";
         KMFolder *folder = NULL;
         KMFolderDir *subfolder;
@@ -1060,7 +1060,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
 
       if( !MsgStatusFlags.isEmpty() ) {
         KMMsgStatus status = strToStatus(MsgStatusFlags);
-        if (status) msg->setStatus(status);
+        if (status) msg->seStatus(status);
       }
 
       if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) {
@@ -1121,7 +1121,7 @@ void KMKernel::raise()
   kmail.call( "newInstance" );
 }
 
-bool KMKernel::showMail( Q_UINT32 serialNumber, TQString /* messageId */ )
+bool KMKernel::showMail( TQ_UINT32 serialNumber, TQString /* messageId */ )
 {
   KMMainWidget *mainWidget = 0;
   if (KMainWindow::memberList) {
@@ -1170,7 +1170,7 @@ bool KMKernel::showMail( Q_UINT32 serialNumber, TQString /* messageId */ )
   return false;
 }
 
-TQString KMKernel::getFrom( Q_UINT32 serialNumber )
+TQString KMKernel::getFrom( TQ_UINT32 serialNumber )
 {
   int idx = -1;
   KMFolder *folder = 0;
@@ -1195,7 +1195,7 @@ TQString KMKernel::debugScheduler()
   return res;
 }
 
-TQString KMKernel::debugSernum( Q_UINT32 serialNumber )
+TQString KMKernel::debugSernum( TQ_UINT32 serialNumber )
 {
   TQString res;
   if (serialNumber != 0) {
@@ -1243,7 +1243,7 @@ void KMKernel::stopNetworkJobs()
     return;
 
   GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Offline );
-  BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
+  BroadcasStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
   emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
 }
 
@@ -1253,7 +1253,7 @@ void KMKernel::resumeNetworkJobs()
     return;
 
   GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Online );
-  BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
+  BroadcasStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
   emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
 
   if ( kmkernel->msgSender()->sendImmediate() ) {
@@ -1597,7 +1597,7 @@ void KMKernel::init()
 
 bool KMKernel::isCodecAsciiCompatible( const TQTextCodec *codec )
 {
-  return !mNonAsciiCompatibleCodecs.contains( codec );
+  return !mNonAsciiCompatibleCodecs.tqcontains( codec );
 }
 
 void KMKernel::readConfig()
@@ -1880,7 +1880,7 @@ bool KMKernel::transferMail( TQString & destinationDir )
                 "%1 now uses the <i>%5</i> folder for "
                 "its messages.<p>"
                 "%2 can move the contents of <i>%6<i> into this folder for "
-                "you, though this may replace any existing files with "
+                "you, though this may tqreplace any existing files with "
                 "the same name in <i>%7</i>.<p>"
                 "<strong>Would you like %3 to move the mail "
                 "files now?</strong></qt>" )
@@ -1975,7 +1975,7 @@ void KMKernel::dumpDeadLetters()
       // yes, this is ugly and potentially dangerous, but the alternative is losing
       // currently composed messages...
       while ( win->isComposing() )
-        qApp->processEvents();
+        tqApp->processEvents();
     }
   }
 }
@@ -2046,7 +2046,7 @@ void KMKernel::slotResult(KIO::Job *job)
     if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
     {
       if (KMessageBox::warningContinueCancel(0,
-        i18n("File %1 exists.\nDo you want to replace it?")
+        i18n("File %1 exists.\nDo you want to tqreplace it?")
         .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue)
         byteArrayToRemoteFile((*it).data, (*it).url, true);
@@ -2330,13 +2330,13 @@ void KMKernel::selectFolder( TQString folderPath )
 KMMainWidget *KMKernel::getKMMainWidget()
 {
   //This could definitely use a speadup
-  TQWidgetList *l = kapp->topLevelWidgets();
+  TQWidgetList *l = kapp->tqtopLevelWidgets();
   TQWidgetListIt it( *l );
   TQWidget *wid;
 
   while ( ( wid = it.current() ) != 0 ) {
     ++it;
-    TQObjectList *l2 = wid->topLevelWidget()->queryList( "KMMainWidget" );
+    TQObjectList *l2 = wid->tqtopLevelWidget()->queryList( "KMMainWidget" );
     if (l2 && l2->first()) {
       KMMainWidget* kmmw = dynamic_cast<KMMainWidget *>( l2->first() );
       Q_ASSERT( kmmw );
@@ -2466,10 +2466,10 @@ Wallet *KMKernel::wallet() {
 
   // find an appropriate parent window for the wallet dialog
   WId window = 0;
-  if ( qApp->activeWindow() )
-    window = qApp->activeWindow()->winId();
+  if ( tqApp->activeWindow() )
+    window = tqApp->activeWindow()->winId();
   else if ( getKMMainWidget() )
-    window = getKMMainWidget()->topLevelWidget()->winId();
+    window = getKMMainWidget()->tqtopLevelWidget()->winId();
 
   delete mWallet;
   mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window );
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 455e42334..3eb19f651 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -28,7 +28,7 @@ namespace KWallet {
   class Wallet;
 }
 
-/** The KMail namespace contains classes used for KMail.
+/** The KMail namespace tqcontains classes used for KMail.
 * This is to keep them out of the way from all the other
 * un-namespaced classes in libs and the rest of PIM.
 */
@@ -202,10 +202,10 @@ public:
   DCOPRef getFolder( const TQString& vpath );
   void selectFolder( TQString folder );
   int timeOfLastMessageCountChange() const;
-  virtual bool showMail( Q_UINT32 serialNumber, TQString messageId );
-  virtual TQString getFrom( Q_UINT32 serialNumber );
+  virtual bool showMail( TQ_UINT32 serialNumber, TQString messageId );
+  virtual TQString getFrom( TQ_UINT32 serialNumber );
   virtual TQString debugScheduler();
-  virtual TQString debugSernum( Q_UINT32 serialNumber );
+  virtual TQString debugSernum( TQ_UINT32 serialNumber );
   int viewMessage( const KURL & messageFile );
 
   /**
@@ -262,7 +262,7 @@ public:
   void quit();
   /**
    * Returns true if the transfer was successful, otherwise false. In any case
-   * destinationDir contains the path to the current mail storage when the
+   * destinationDir tqcontains the path to the current mail storage when the
    * method returns.
    */
   bool transferMail( TQString & destinationDir );
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index dde827bec..0cd5aec55 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -108,7 +108,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
     KABC::Addressee::List list;
     for ( it = urls.begin(); it != urls.end(); ++it ) {
 
-      // First, let's deal with mailto Urls. The path() part contains the
+      // First, let's deal with mailto Urls. The path() part tqcontains the
       // email-address.
       if ( (*it).protocol() == "mailto" ) {
         KABC::Addressee addressee;
@@ -119,7 +119,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
       else {
         KABC::VCardConverter converter;
         TQString fileName;
-        if ( KIO::NetAccess::download( (*it), fileName, parentWidget() ) ) {
+        if ( KIO::NetAccess::download( (*it), fileName, tqparentWidget() ) ) {
           TQFile file( fileName );
           file.open( IO_ReadOnly );
           const TQByteArray data = file.readAll();
@@ -133,7 +133,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
         } else {
           TQString caption( i18n( "vCard Import Failed" ) );
           TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).arg( (*it).url() );
-          KMessageBox::error( parentWidget(), text, caption );
+          KMessageBox::error( tqparentWidget(), text, caption );
         }
       }
       // Now, let the user choose which addressee to add.
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 27b04df0d..a3363e4fc 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -46,7 +46,7 @@
 #include "globalsettings.h"
 #include "kcursorsaver.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmfoldermgr.h"
 #include "kmfolderdia.h"
 #include "accountmanager.h"
@@ -246,7 +246,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
   mStartupDone = true;
 
 
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
   KStatusBar *sb =  mainWin ? mainWin->statusBar() : 0;
   mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb );
   mVacationScriptIndicator->hide();
@@ -287,13 +287,13 @@ void KMMainWidget::destruct()
 //-----------------------------------------------------------------------------
 void KMMainWidget::readPreConfig(void)
 {
-  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
   const KConfigGroup reader( KMKernel::config(), "Reader" );
 
-  mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short";
-  mReaderWindowActive = geometry.readEntry( "readerWindowMode", "below" ) != "hide";
-  mReaderWindowBelow = geometry.readEntry( "readerWindowMode", "below" ) == "below";
-  mThreadPref = geometry.readBoolEntry( "nestedMessages", false );
+  mLongFolderList = tqgeometry.readEntry( "FolderList", "long" ) != "short";
+  mReaderWindowActive = tqgeometry.readEntry( "readerWindowMode", "below" ) != "hide";
+  mReaderWindowBelow = tqgeometry.readEntry( "readerWindowMode", "below" ) == "below";
+  mThreadPref = tqgeometry.readBoolEntry( "nestedMessages", false );
 
   mHtmlPref = reader.readBoolEntry( "htmlMail", false );
   mHtmlLoadExtPref = reader.readBoolEntry( "htmlLoadExternal", false );
@@ -351,13 +351,13 @@ void KMMainWidget::readConfig(void)
     readPreConfig();
     mHeaders->refreshNestedState();
 
-    bool layoutChanged = ( oldLongFolderList != mLongFolderList )
+    bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList )
                     || ( oldReaderWindowActive != mReaderWindowActive )
                     || ( oldReaderWindowBelow != mReaderWindowBelow )
                     || ( oldFavoriteFolderView != mEnableFavoriteFolderView );
 
 
-    if( layoutChanged ) {
+    if( tqlayoutChanged ) {
       hide();
       // delete all panners
       delete mPanner1; // will always delete the others
@@ -389,11 +389,11 @@ void KMMainWidget::readConfig(void)
     widths << folderW << headerW;
     heights << headerH << readerH;
 
-    bool layoutChanged = ( oldLongFolderList != mLongFolderList )
+    bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList )
                     || ( oldReaderWindowActive != mReaderWindowActive )
                     || ( oldReaderWindowBelow != mReaderWindowBelow );
 
-    if (!mStartupDone || layoutChanged )
+    if (!mStartupDone || tqlayoutChanged )
     {
       /** unread / total columns
        * as we have some dependencies in this widget
@@ -482,11 +482,11 @@ void KMMainWidget::readConfig(void)
     // Update systray
     toggleSystemTray();
 
-    bool layoutChanged = ( oldLongFolderList != mLongFolderList )
+    bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList )
                     || ( oldReaderWindowActive != mReaderWindowActive )
                     || ( oldReaderWindowBelow != mReaderWindowBelow )
                     || ( oldFavoriteFolderView != mEnableFavoriteFolderView );
-    if ( layoutChanged ) {
+    if ( tqlayoutChanged ) {
       activatePanners();
     }
 
@@ -516,7 +516,7 @@ void KMMainWidget::writeConfig(void)
 {
   TQString s;
   KConfig *config = KMKernel::config();
-  KConfigGroup geometry( config, "Geometry" );
+  KConfigGroup tqgeometry( config, "Geometry" );
 
   if (mMsgView)
     mMsgView->writeConfig();
@@ -527,31 +527,31 @@ void KMMainWidget::writeConfig(void)
   if ( mFavoriteFolderView )
     mFavoriteFolderView->writeConfig();
 
-  geometry.writeEntry( "MainWin", this->geometry().size() );
+  tqgeometry.writeEntry( "MainWin", this->tqgeometry().size() );
 
   const TQValueList<int> widths = ( mLongFolderList ? mPanner1 : mPanner2 )->sizes();
   const TQValueList<int> heights = ( mLongFolderList ? mPanner2 : mPanner1 )->sizes();
 
-  geometry.writeEntry( "FolderPaneWidth", widths[0] );
-  geometry.writeEntry( "HeaderPaneWidth", widths[1] );
+  tqgeometry.writeEntry( "FolderPaneWidth", widths[0] );
+  tqgeometry.writeEntry( "HeaderPaneWidth", widths[1] );
 
   // Only save when the widget is shown (to avoid saving a wrong value)
   if ( mSearchAndHeaders && mSearchAndHeaders->isShown() ) {
-    geometry.writeEntry( "HeaderPaneHeight", heights[0] );
-    geometry.writeEntry( "ReaderPaneHeight", heights[1] );
+    tqgeometry.writeEntry( "HeaderPaneHeight", heights[0] );
+    tqgeometry.writeEntry( "ReaderPaneHeight", heights[1] );
   }
 
   // save the state of the unread/total-columns
-  geometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() );
-  geometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() );
-  geometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() );
+  tqgeometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() );
+  tqgeometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() );
+  tqgeometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() );
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::createWidgets(void)
 {
-  // Create the splitters according to the layout settings
+  // Create the splitters according to the tqlayout settings
   TQWidget *headerParent = 0,
             *mimeParent = 0, *messageParent = 0;
 
@@ -587,7 +587,7 @@ void KMMainWidget::createWidgets(void)
   mTopLayout->add( mPanner1 );
 
   // BUG -sanders these accelerators stop working after switching
-  // between long/short folder layout
+  // between long/short folder tqlayout
   // Probably need to disconnect them first.
 
   // create list of messages
@@ -637,7 +637,7 @@ void KMMainWidget::createWidgets(void)
       mMsgActions->setMessageView( mMsgView );
     }
 
-    connect(mMsgView, TQT_SIGNAL(replaceMsgByUnencryptedVersion()),
+    connect(mMsgView, TQT_SIGNAL(tqreplaceMsgByUnencryptedVersion()),
         this, TQT_SLOT(slotReplaceMsgByUnencryptedVersion()));
     connect(mMsgView, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)),
         this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&)));
@@ -973,11 +973,11 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
 
   if(kmkernel->xmlGuiInstance()) {
     KNotifyClient::Instance instance(kmkernel->xmlGuiInstance());
-    KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived",
+    KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived",
                           summary );
   }
   else
-    KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived",
+    KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived",
                           summary );
 
   if (mBeepOnNew) {
@@ -1028,7 +1028,7 @@ void KMMainWidget::slotShowNewFromTemplate()
     TQString subj = mb->subject();
     if ( subj.isEmpty() ) subj = i18n("No Subject");
     mTemplateMenu->popupMenu()->insertItem(
-      KStringHandler::rsqueeze( subj.replace( "&", "&&" ) ), idx );
+      KStringHandler::rsqueeze( subj.tqreplace( "&", "&&" ) ), idx );
   }
 }
 
@@ -1170,7 +1170,7 @@ void KMMainWidget::slotEmptyFolder()
   if (mMsgView) mMsgView->clearCache();
 
   if ( !isTrash )
-    BroadcastStatus::instance()->setStatusMsg(i18n("Moved all messages to the trash"));
+    BroadcasStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash"));
 
   updateMessageActions();
 
@@ -1268,9 +1268,9 @@ void KMMainWidget::slotCompactFolder()
     KCursorSaver busy(KBusyPtr::busy());
     mFolder->compact( KMFolder::CompactNow );
     // setCurrentItemByIndex will override the statusbar message, so save/restore it
-    TQString statusMsg = BroadcastStatus::instance()->statusMsg();
+    TQString statusMsg = BroadcasStatus::instance()->statusMsg();
     mHeaders->setCurrentItemByIndex(idx);
-    BroadcastStatus::instance()->setStatusMsg( statusMsg );
+    BroadcasStatus::instance()->seStatusMsg( statusMsg );
   }
 }
 
@@ -1314,7 +1314,7 @@ void KMMainWidget::slotInvalidateIMAPFolders() {
 	       "This will remove all changes that you have done "
 	       "locally to your IMAP folders."),
 	  i18n("Refresh IMAP Cache"), i18n("&Refresh") ) == KMessageBox::Continue )
-    kmkernel->acctMgr()->invalidateIMAPFolders();
+    kmkernel->acctMgr()->tqinvalidateIMAPFolders();
 }
 
 //-----------------------------------------------------------------------------
@@ -1713,12 +1713,12 @@ void KMMainWidget::slotApplyFilters()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCheckVacation()
 {
-  updateVactionScriptStatus( false );
+  updateVactionScripStatus( false );
   if ( !kmkernel->askToGoOnline() )
     return;
 
   Vacation *vac = new Vacation( this, true /* check only */ );
-  connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptStatus(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( this );
-  connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptStatus(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 {
@@ -2468,7 +2468,7 @@ void KMMainWidget::getAccountMenu()
   TQStringList::Iterator it;
   int id = 0;
   for(it = actList.begin(); it != actList.end() ; ++it, id++)
-    mActMenu->insertItem((*it).replace("&", "&&"), id);
+    mActMenu->insertItem((*it).tqreplace("&", "&&"), id);
 }
 
 //-----------------------------------------------------------------------------
@@ -2481,7 +2481,7 @@ void KMMainWidget::getTransportMenu()
   TQStringList::Iterator it;
   int id = 0;
   for(it = availTransports.begin(); it != availTransports.end() ; ++it, id++)
-    mSendMenu->insertItem((*it).replace("&", "&&"), id);
+    mSendMenu->insertItem((*it).tqreplace("&", "&&"), id);
 }
 
 //-----------------------------------------------------------------------------
@@ -2545,7 +2545,7 @@ void KMMainWidget::updateCustomTemplateMenus()
     KAction *action;
     switch ( t.type() ) {
     case CustomTemplates::TReply:
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut( t.shortcut() ),
                             mCustomReplyMapper,
                             TQT_SLOT( map() ),
@@ -2557,7 +2557,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       ++replyc;
       break;
     case CustomTemplates::TReplyAll:
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut( t.shortcut() ),
                             mCustomReplyAllMapper,
                             TQT_SLOT( map() ),
@@ -2569,7 +2569,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       ++replyallc;
       break;
     case CustomTemplates::TForward:
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut( t.shortcut() ),
                             mCustomForwardMapper,
                             TQT_SLOT( map() ),
@@ -2581,7 +2581,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       ++forwardc;
       break;
     case CustomTemplates::TUniversal:
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut::null(),
                             mCustomReplyMapper,
                             TQT_SLOT( map() ),
@@ -2591,7 +2591,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       mCustomReplyActionMenu->insert( action, idx );
       mCustomTemplateActions.append( action );
       ++replyc;
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut::null(),
                             mCustomReplyAllMapper,
                             TQT_SLOT( map() ),
@@ -2601,7 +2601,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       mCustomReplyAllActionMenu->insert( action, idx );
       mCustomTemplateActions.append( action );
       ++replyallc;
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut::null(),
                             mCustomForwardMapper,
                             TQT_SLOT( map() ),
@@ -2659,7 +2659,7 @@ void KMMainWidget::setupActions()
 
   (void) new KAction( i18n("&Refresh Local IMAP Cache"), "refresh",
 		      this, TQT_SLOT(slotInvalidateIMAPFolders()),
-		      actionCollection(), "file_invalidate_imap_cache" );
+		      actionCollection(), "file_tqinvalidate_imap_cache" );
 
   (void) new KAction( i18n("Empty All &Trash Folders"), 0,
 		      KMKernel::self(), TQT_SLOT(slotEmptyTrash()),
@@ -3608,7 +3608,7 @@ void KMMainWidget::removeDuplicates()
     if ( !id.isEmpty() ) {
       TQString subjMD5 = (*mFolder)[i]->strippedSubjectMD5();
       int other = -1;
-      if ( idMD5s.contains(id) )
+      if ( idMD5s.tqcontains(id) )
         other = idMD5s[id].first();
       else
         idMD5s[id].append( i );
@@ -3649,7 +3649,7 @@ void KMMainWidget::removeDuplicates()
                "Removed %n duplicate messages.", numDuplicates );
     else
       msg = i18n("No duplicate messages found.");
-  BroadcastStatus::instance()->setStatusMsg( msg );
+  BroadcasStatus::instance()->seStatusMsg( msg );
 }
 
 
@@ -3713,7 +3713,7 @@ void KMMainWidget::initializeFilterActions()
   for ( ;it != kmkernel->filterMgr()->filters().constEnd(); ++it ) {
     if (!(*it)->isEmpty() && (*it)->configureShortcut()) {
       filterName = TQString("Filter %1").arg((*it)->name());
-      normalizedName = filterName.replace(" ", "_");
+      normalizedName = filterName.tqreplace(" ", "_");
       if (action(normalizedName.utf8()))
         continue;
       filterCommand = new KMMetaFilterActionCommand(*it, mHeaders, this);
@@ -3803,7 +3803,7 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder )
 
   TQString actionlabel = TQString( "FolderShortcut %1").arg( folder->prettyURL() );
   TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() );
-  TQString normalizedName = actionname.replace(" ", "_");
+  TQString normalizedName = actionname.tqreplace(" ", "_");
   KAction* action =
     new KAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()),
                 actionCollection(), normalizedName.local8Bit());
@@ -3993,14 +3993,14 @@ void KMMainWidget::slotRequestFullSearchFromQuickSearch()
     assert( mSearchWin );
     KMSearchPattern pattern;
     pattern.append( KMSearchRule::createInstance( "<message>", KMSearchRule::FuncContains, mQuickSearchLine->currentSearchTerm() ) );
-    int status = mQuickSearchLine->currentStatus();
+    int status = mQuickSearchLine->currenStatus();
     if ( status != 0 ) {
         pattern.append( new KMSearchRuleStatus( status ) );
     }
     mSearchWin->setSearchPattern( pattern );
 }
 
-void KMMainWidget::updateVactionScriptStatus(bool active)
+void KMMainWidget::updateVactionScripStatus(bool active)
 {
   mVacationIndicatorActive = active;
   if ( active ) {
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index 20e19a3c6..824f2aaab 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -178,7 +178,7 @@ public:
   void setupForwardingActionsList();
 
   KStatusBarLabel* vacationScriptIndicator() const { return mVacationScriptIndicator; }
-  void updateVactionScriptStatus() { updateVactionScriptStatus( mVacationIndicatorActive ); }
+  void updateVactionScripStatus() { updateVactionScripStatus( mVacationIndicatorActive ); }
 
 public slots:
   void slotMoveMsgToFolder( KMFolder *dest);
@@ -446,7 +446,7 @@ private:
 
 private slots:
   void slotRequestFullSearchFromQuickSearch();
-  void updateVactionScriptStatus( bool active );
+  void updateVactionScripStatus( bool active );
 
 private:
   // Message actions
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index 994219b0f..503c9a06b 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -66,7 +66,7 @@ KMMainWin::KMMainWin(TQWidget *)
 
   applyMainWindowSettings(KMKernel::config(), "Main Window");
 
-  connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
+  connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
            this, TQT_SLOT( displayStatusMsg(const TQString&) ) );
 
   connect(kmkernel, TQT_SIGNAL(configChanged()),
@@ -122,9 +122,9 @@ void KMMainWin::displayStatusMsg(const TQString& aText)
   // ### FIXME: We should disable richtext/HTML (to avoid possible denial of service attacks),
   // but this code would double the size of the satus bar if the user hovers
   // over an <[email protected]>-style email address :-(
-//  text.replace("&", "&amp;");
-//  text.replace("<", "&lt;");
-//  text.replace(">", "&gt;");
+//  text.tqreplace("&", "&amp;");
+//  text.tqreplace("<", "&lt;");
+//  text.tqreplace(">", "&gt;");
 
   statusBar()->changeItem(text, mMessageStatusId);
 }
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 6819d68d9..3af9a252a 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -246,7 +246,7 @@ bool KMMessage::transferInProgress() const
 void KMMessage::setTransferInProgress(bool value, bool force)
 {
   MessageProperty::setTransferInProgress( getMsgSerNum(), value, force );
-  if ( !transferInProgress() && sPendingDeletes.contains( this ) ) {
+  if ( !transferInProgress() && sPendingDeletes.tqcontains( this ) ) {
     sPendingDeletes.remove( this );
     if ( parent() ) {
       int idx = parent()->find( this );
@@ -260,7 +260,7 @@ void KMMessage::setTransferInProgress(bool value, bool force)
 
 
 bool KMMessage::isUrgent() const {
-  return headerField( "Priority" ).contains( "urgent", false )
+  return headerField( "Priority" ).tqcontains( "urgent", false )
     || headerField( "X-Priority" ).startsWith( "2" );
 }
 
@@ -351,7 +351,7 @@ void KMMessage::removePrivateHeaderFields() {
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::setStatusFields()
+void KMMessage::seStatusFields()
 {
   char str[2] = { 0, 0 };
 
@@ -384,7 +384,7 @@ TQString KMMessage::headerAsString() const
   header.Assemble();
   if ( header.AsString().empty() )
     return TQString::null;
-  return TQString::fromLatin1( header.AsString().c_str() );
+  return TQString::tqfromLatin1( header.AsString().c_str() );
 }
 
 
@@ -394,23 +394,23 @@ DwMediaType& KMMessage::dwContentType()
   return mMsg->Headers().ContentType();
 }
 
-void KMMessage::fromByteArray( const TQByteArray & ba, bool setStatus ) {
-  return fromDwString( DwString( ba.data(), ba.size() ), setStatus );
+void KMMessage::fromByteArray( const TQByteArray & ba, bool seStatus ) {
+  return fromDwString( DwString( ba.data(), ba.size() ), seStatus );
 }
 
-void KMMessage::fromString( const TQCString & str, bool aSetStatus ) {
-  return fromDwString( KMail::Util::dwString( str ), aSetStatus );
+void KMMessage::fromString( const TQCString & str, bool aSeStatus ) {
+  return fromDwString( KMail::Util::dwString( str ), aSeStatus );
 }
 
-void KMMessage::fromDwString(const DwString& str, bool aSetStatus)
+void KMMessage::fromDwString(const DwString& str, bool aSeStatus)
 {
   delete mMsg;
   mMsg = new DwMessage;
   mMsg->FromString( str );
   mMsg->Parse();
 
-  if (aSetStatus) {
-    setStatus(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").at(0).latin1() ) );
@@ -852,7 +852,7 @@ TQString KMMessage::asQuotedString( const TQString& aHeaderStr,
 
   const TQString indentStr = formatString( aIndentStr );
 
-  content.replace( '\n', '\n' + indentStr );
+  content.tqreplace( '\n', '\n' + indentStr );
   content.prepend( indentStr );
   content += '\n';
 
@@ -916,7 +916,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
     // strip all my addresses from the list of recipients
     TQStringList recipients = KPIM::splitEmailAddrList( toStr );
     toStr = stripMyAddressesFromAddressList( recipients ).join(", ");
-    // ... unless the list contains only my addresses (reply to self)
+    // ... unless the list tqcontains only my addresses (reply to self)
     if ( toStr.isEmpty() && !recipients.isEmpty() )
       toStr = recipients[0];
 
@@ -1081,7 +1081,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
        parser.process( this );
      }
   }
-  // setStatus(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::fromLatin1( field->FieldNameStr().c_str() ) ) )
+             && !whiteList.tqcontains( TQString::tqfromLatin1( field->FieldNameStr().c_str() ) ) )
        header.RemoveField(field);
      field = nextField;
    }
@@ -1276,7 +1276,7 @@ KMMessage* KMMessage::createForward( const TQString &tmpl /* = TQString::null */
     msg->initFromMessage( this );
     msg->removeHeaderField("Content-Type");
     msg->removeHeaderField("Content-Transfer-Encoding");
-    // Modify the ContentType directly (replaces setAutomaticFields(true))
+    // Modify the ContentType directly (tqreplaces setAutomaticFields(true))
     DwHeaders & header = msg->mMsg->Headers();
     header.MimeVersion().FromString("1.0");
     DwMediaType & contentType = msg->dwContentType();
@@ -1328,32 +1328,32 @@ static const struct {
   const char * text;
 } mdnMessageBoxes[] = {
   { "mdnNormalAsk", true,
-    I18N_NOOP("This message contains a request to return a notification "
+    I18N_NOOP("This message tqcontains a request to return a notification "
 	      "about your reception of the message.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"denied\" or normal response.") },
   { "mdnUnknownOption", false,
-    I18N_NOOP("This message contains a request to send a notification "
+    I18N_NOOP("This message tqcontains a request to send a notification "
 	      "about your reception of the message.\n"
-	      "It contains a processing instruction that is marked as "
+	      "It tqcontains a processing instruction that is marked as "
 	      "\"required\", but which is unknown to KMail.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"failed\" response.") },
   { "mdnMultipleAddressesInReceiptTo", true,
-    I18N_NOOP("This message contains a request to send a notification "
+    I18N_NOOP("This message tqcontains a request to send a notification "
 	      "about your reception of the message,\n"
 	      "but it is requested to send the notification to more "
 	      "than one address.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"denied\" or normal response.") },
   { "mdnReturnPathEmpty", true,
-    I18N_NOOP("This message contains a request to send a notification "
+    I18N_NOOP("This message tqcontains a request to send a notification "
 	      "about your reception of the message,\n"
 	      "but there is no return-path set.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"denied\" or normal response.") },
   { "mdnReturnPathNotInReceiptTo", true,
-    I18N_NOOP("This message contains a request to send a notification "
+    I18N_NOOP("This message tqcontains a request to send a notification "
 	      "about your reception of the message,\n"
 	      "but the return-path address differs from the address "
 	      "the notification was requested to be sent to.\n"
@@ -1442,7 +1442,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   // an MDN with any disposition type other than "failed" in response
   // to the request.
   TQString notificationOptions = headerField("Disposition-Notification-Options");
-  if ( notificationOptions.contains( "required", false ) ) {
+  if ( notificationOptions.tqcontains( "required", false ) ) {
     // ### hacky; should parse...
     // There is a required option that we don't understand. We need to
     // ask the user what we should do:
@@ -1476,7 +1476,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   TQString returnPath = returnPathList.isEmpty() ? TQString::null
     : returnPathList.front().localPart + '@' + returnPathList.front().domain ;
   kdDebug(5006) << "clean return path: " << returnPath << endl;
-  if ( returnPath.isEmpty() || !receiptTo.contains( returnPath, false ) ) {
+  if ( returnPath.isEmpty() || !receiptTo.tqcontains( returnPath, false ) ) {
     if ( !allowGUI ) return 0; // don't setMDNSentState here!
     mode = requestAdviceOnMDN( returnPath.isEmpty() ?
 			       "mdnReturnPathEmpty" :
@@ -1523,7 +1523,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   receipt->initFromMessage( this );
   receipt->removeHeaderField("Content-Type");
   receipt->removeHeaderField("Content-Transfer-Encoding");
-  // Modify the ContentType directly (replaces setAutomaticFields(true))
+  // Modify the ContentType directly (tqreplaces setAutomaticFields(true))
   DwHeaders & header = receipt->mMsg->Headers();
   header.MimeVersion().FromString("1.0");
   DwMediaType & contentType = receipt->dwContentType();
@@ -1533,7 +1533,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   receipt->mNeedsAssembly = true;
   receipt->setContentTypeParam( "report-type", "disposition-notification" );
 
-  TQString description = replaceHeadersInString( MDN::descriptionFor( d, m ) );
+  TQString description = tqreplaceHeadersInString( MDN::descriptionFor( d, m ) );
 
   // text/plain part:
   KMMessagePart firstMsgPart;
@@ -1605,7 +1605,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   return receipt;
 }
 
-TQString KMMessage::replaceHeadersInString( const TQString & s ) const {
+TQString KMMessage::tqreplaceHeadersInString( const TQString & s ) const {
   TQString result = s;
   TQRegExp rx( "\\$\\{([a-z0-9-]+)\\}", false );
   Q_ASSERT( rx.isValid() );
@@ -1618,14 +1618,14 @@ TQString KMMessage::replaceHeadersInString( const TQString & s ) const {
 
   int idx = 0;
   if( ( idx = rxDate.search( result, idx ) ) != -1  ) {
-    result.replace( idx, rxDate.matchedLength(), sDate );
+    result.tqreplace( idx, rxDate.matchedLength(), sDate );
   }
 
   idx = 0;
   while ( ( idx = rx.search( result, idx ) ) != -1 ) {
-    TQString replacement = headerField( rx.cap(1).latin1() );
-    result.replace( idx, rx.matchedLength(), replacement );
-    idx += replacement.length();
+    TQString tqreplacement = headerField( rx.cap(1).latin1() );
+    result.tqreplace( idx, rx.matchedLength(), tqreplacement );
+    idx += tqreplacement.length();
   }
   return result;
 }
@@ -2144,7 +2144,7 @@ TQString KMMessage::references() const
 TQString KMMessage::replyToAuxIdMD5() const
 {
   TQString result = references();
-  // references contains two items, use the first one
+  // references tqcontains two items, use the first one
   // (the second to last reference)
   const int rightAngle = result.find( '>' );
   if( rightAngle != -1 )
@@ -2666,7 +2666,7 @@ TQValueList<int> KMMessage::determineAllowedCtes( const CharFreq& cf,
   }
 
   // In the following cases only QP and Base64 are allowed:
-  // - the buffer will be OpenPGP/MIME signed and it contains trailing
+  // - the buffer will be OpenPGP/MIME signed and it tqcontains trailing
   //   whitespace (cf. RFC 3156)
   // - a line starts with "From "
   if ( ( willBeSigned && cf.hasTrailingWhitespace() ) ||
@@ -2819,7 +2819,7 @@ int KMMessage::numBodyParts() const
       parts.append( part );
       part = part->Body().FirstBodyPart();
     }
-    // this is where currPart->msgPart contains a leaf message part
+    // this is where currPart->msgPart tqcontains a leaf message part
     count++;
     // go up in the tree until reaching a node with next
     // (or the last top-level node)
@@ -2871,7 +2871,7 @@ int KMMessage::partNumber( DwBodyPart * aDwBodyPart ) const
       parts.append( curpart );
       curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where currPart->msgPart contains a leaf message part
+    // this is where currPart->msgPart tqcontains a leaf message part
     if (curpart == aDwBodyPart)
       idx = curIdx;
     curIdx++;
@@ -2911,7 +2911,7 @@ DwBodyPart * KMMessage::dwBodyPart( int aIdx ) const
       parts.append( curpart );
       curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where currPart->msgPart contains a leaf message part
+    // this is where currPart->msgPart tqcontains a leaf message part
     if (curIdx==aIdx)
         part = curpart;
     curIdx++;
@@ -2949,7 +2949,7 @@ DwBodyPart * KMMessage::findDwBodyPart( int type, int subtype ) const
 	parts.append( curpart );
 	curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where curPart->msgPart contains a leaf message part
+    // this is where curPart->msgPart tqcontains a leaf message part
 
     // pending(khz): Find out WHY this look does not travel down *into* an
     //               embedded "Message/RfF822" message containing a "Multipart/Mixed"
@@ -2998,7 +2998,7 @@ DwBodyPart * KMMessage::findDwBodyPart( const TQCString& type, const TQCString&
 	parts.append( curpart );
 	curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where curPart->msgPart contains a leaf message part
+    // this is where curPart->msgPart tqcontains a leaf message part
 
     // pending(khz): Find out WHY this look does not travel down *into* an
     //               embedded "Message/RfF822" message containing a "Multipart/Mixed"
@@ -3198,7 +3198,7 @@ bool KMMessage::deleteBodyPart( int partIndex )
   dummyPart.setBodyEncodedBinary( TQByteArray() );
   TQCString cd = dummyPart.contentDisposition();
   if ( cd.find( "inline", 0, false ) == 0 ) {
-    cd.replace( 0, 10, "attachment" );
+    cd.tqreplace( 0, 10, "attachment" );
     dummyPart.setContentDisposition( cd );
   } else if ( cd.isEmpty() ) {
     dummyPart.setContentDisposition( "attachment" );
@@ -3358,7 +3358,7 @@ void KMMessage::addBodyPart(const KMMessagePart* aPart)
 //-----------------------------------------------------------------------------
 TQString KMMessage::generateMessageId( const TQString& addr )
 {
-  TQDateTime datetime = TQDateTime::currentDateTime();
+  TQDateTime datetime = TQDateTime::tqcurrentDateTime();
   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::fromLatin1( KMMsgBase::encodeRFC2047String( str,
+  result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str,
                                                                 "utf-8" ) );
   result = KURL::encode_string( result );
   return result;
@@ -4015,7 +4015,7 @@ TQString KMMessage::guessEmailAddressFromLoginName( const TQString& loginName )
   if ( user.isValid() ) {
     TQString fullName = user.fullName();
     if ( fullName.find( TQRegExp( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" ) ) != -1 )
-      address = '"' + fullName.replace( '\\', "\\" ).replace( '"', "\\" )
+      address = '"' + fullName.tqreplace( '\\', "\\" ).tqreplace( '"', "\\" )
 	      + "\" <" + address + '>';
     else
       address = fullName + " <" + address + '>';
@@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity )
 
 
 //-----------------------------------------------------------------------------
-void KMMessage::setStatus(const KMMsgStatus aStatus, int idx)
+void KMMessage::seStatus(const KMMsgStatus aStatus, int idx)
 {
   if (mStatus == aStatus)
     return;
-  KMMsgBase::setStatus(aStatus, idx);
+  KMMsgBase::seStatus(aStatus, idx);
 }
 
 void KMMessage::setEncryptionState(const KMMsgEncryptionState s, int idx)
@@ -4208,10 +4208,10 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus )
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *retStatus) const
+void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const
 {
   *retMsgSerNum = 0;
-  *retStatus = 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, KMMsgStatus *retStatus) cons
   if ( !message.isEmpty() && !type.isEmpty() ) {
     *retMsgSerNum = message.toULong();
     if ( type == "reply" )
-      *retStatus = KMMsgStatusReplied;
+      *reStatus = KMMsgStatusReplied;
     else if ( type == "forward" )
-      *retStatus = KMMsgStatusForwarded;
+      *reStatus = KMMsgStatusForwarded;
     else if ( type == "deleted" )
-      *retStatus = KMMsgStatusDeleted;
+      *reStatus = KMMsgStatusDeleted;
   }
 }
 
@@ -4347,11 +4347,11 @@ void KMMessage::updateInvitationState()
     cntType += '/';
     cntType += mMsg->Headers().ContentType().SubtypeStr().c_str();
     if ( cntType.lower() == "text/calendar" ) {
-      setStatus( KMMsgStatusHasInvitation );
+      seStatus( KMMsgStatusHasInvitation );
       return;
     }
   }
-  setStatus( KMMsgStatusHasNoInvitation );
+  seStatus( KMMsgStatusHasNoInvitation );
   return;
 }
 
@@ -4364,7 +4364,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( !part )
   {
     // kdDebug(5006) << "updateAttachmentState - no part!" << endl;
-    setStatus( 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 ) )
     {
-      setStatus( KMMsgStatusHasAttach );
+      seStatus( KMMsgStatusHasAttach );
     }
     return;
   }
@@ -4429,7 +4429,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( part->Next() )
     updateAttachmentState( part->Next() );
   else if ( attachmentState() == KMMsgAttachmentUnknown )
-    setStatus( KMMsgStatusHasNoAttach );
+    seStatus( KMMsgStatusHasNoAttach );
 }
 
 void KMMessage::setBodyFromUnicode( const TQString &str, DwEntity *entity )
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index 958d017e2..a063ca1a8 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -131,7 +131,7 @@ public:
   */
   void setUnencryptedMsg( KMMessage* unencrypted );
 
-  /** Returns TRUE if the message contains an unencrypted copy of itself. */
+  /** Returns TRUE if the message tqcontains an unencrypted copy of itself. */
   bool hasUnencryptedMsg() const { return 0 != mUnencryptedMsg; }
 
   /** Returns an unencrypted copy of this message or 0 if none exists. */
@@ -150,13 +150,13 @@ public:
   }
 
   /** Mark the message as deleted */
-  void del() { setStatus(KMMsgStatusDeleted); }
+  void del() { seStatus(KMMsgStatusDeleted); }
 
   /** Undelete the message. Same as touch */
-  void undel() { setStatus(KMMsgStatusOld); }
+  void undel() { seStatus(KMMsgStatusOld); }
 
   /** Touch the message - mark it as read */
-  void touch() { setStatus(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 setStatus=false);
-  void fromString(const TQCString& str, bool setStatus=false);
-  void fromByteArray(const TQByteArray & ba, bool setStatus=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
@@ -545,7 +545,7 @@ public:
    */
   void setBodyFromUnicode( const TQString & str, DwEntity *entity = 0 );
 
-  /** Returns the body part decoded to unicode.
+  /** Returns the body part decoded to tqunicode.
    **/
   TQString bodyToUnicode(const TQTextCodec* codec=0) const;
 
@@ -663,13 +663,13 @@ public:
 
   /**
    * Delete a body part with the specified part index.
-   * A dummy body part with the text "the attachment foo was deleted" will replace the old part.
+   * A dummy body part with the text "the attachment foo was deleted" will tqreplace the old part.
    */
   bool deleteBodyPart( int partIndex );
 
   /** Set "Status" and "X-Status" fields of the message from the
    * internal message status. */
-  void setStatusFields();
+  void seStatusFields();
 
   /** Generates the Message-Id. It uses either the Message-Id suffix
    * defined by the user or the given email address as suffix. The address
@@ -679,7 +679,7 @@ public:
 
   /** Convert '<' into "&lt;" resp. '>' into "&gt;" in order to
     * prevent their interpretation by KHTML.
-    * Does *not* use the Qt replace function but runs a very fast C code
+    * Does *not* use the Qt tqreplace function but runs a very fast C code
     * the same way as lf2crlf() does.
    */
   static TQCString html2source( const TQCString & src );
@@ -713,7 +713,7 @@ public:
                                  bool removeLineBreaks = false );
 
   /** Converts the email address(es) to (a) nice HTML mailto: anchor(s).
-   * If stripped is TRUE then the visible part of the anchor contains
+   * If stripped is TRUE then the visible part of the anchor tqcontains
    * only the name part and not the given emailAddr.
    */
   static TQString emailAddrAsAnchor(const TQString& emailAddr,
@@ -746,7 +746,7 @@ public:
   static TQString guessEmailAddressFromLoginName( const TQString& userName );
 
   /**
-   *  Given argument msg add quoting characters and relayout for max width maxLength
+   *  Given argument msg add quoting characters and retqlayout for max width maxLength
    *  @param msg the string which it to be quoted
    *  @param maxLineLength reformat text to be this amount of columns at maximum, adding
    *    linefeeds at word boundaries to make it fit.
@@ -760,7 +760,7 @@ public:
   static const TQStringList &preferredCharsets();
 
   /** Replaces every occurrence of "${foo}" in @p s with headerField("foo") */
-  TQString replaceHeadersInString( const TQString & s ) const;
+  TQString tqreplaceHeadersInString( const TQString & s ) const;
 
   /** Get the message charset.*/
   TQCString charset() const;
@@ -825,8 +825,8 @@ public:
   /** Status of the message. */
   KMMsgStatus status() const { return mStatus; }
   /** Set status and mark dirty. */
-  void setStatus(const KMMsgStatus status, int idx = -1);
-  void setStatus(const char* s1, const char* s2=0) { KMMsgBase::setStatus(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);
@@ -847,8 +847,8 @@ public:
   /** 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 retStatus. */
-  void getLink(int n, ulong *retMsgSerNum, KMMsgStatus *retStatus) const;
+   * and @p reStatus. */
+  void getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const;
 
   /** Convert wildcards into normal string */
   TQString formatString(const TQString&) const;
@@ -886,7 +886,7 @@ public:
   /** Returns message body with quoting header and indented by the
     given indentation string. This is suitable for including the message
     in another message of for replies, forwards. The header string is
-    a template where the following fields are replaced with the
+    a template where the following fields are tqreplaced with the
     corresponding values:
     <pre>
         %D: date of this message
@@ -969,7 +969,7 @@ private:
   KMMessage* mUnencryptedMsg;
   DwBodyPart* mLastUpdated;
   int mCursorPos;
-  KMMsgInfo* mMsgInfo; // used to remember the KMMsgInfo object this KMMessage replaced in the KMMsgList
+  KMMsgInfo* mMsgInfo; // used to remember the KMMsgInfo object this KMMessage tqreplaced in the KMMsgList
   static TQValueList<KMMessage*> sPendingDeletes;
 };
 
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index d7fb9541e..6e73051f7 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -95,7 +95,7 @@ void KMMimePartTree::restoreLayoutIfPresent() {
   header()->setStretchEnabled( true, 0 );
   // rest of the columns:
   if ( KMKernel::config()->hasGroup( configGroup ) ) {
-    // there is a saved layout. use it...
+    // there is a saved tqlayout. use it...
     restoreLayout( KMKernel::config(), configGroup );
     // and disable Maximum mode:
     for ( int i = 1 ; i < 4 ; ++i )
@@ -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( style().isA("KeramikStyle") )
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != lineWidth() )
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index e3d3fec15..71a1731ca 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -150,7 +150,7 @@ void KMMsgBase::toggleStatus(const KMMsgStatus aStatus, int idx)
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgBase::setStatus(const KMMsgStatus aStatus, int idx)
+void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx)
 {
   mDirty = true;
   KMMsgStatus oldStatus = status();
@@ -267,40 +267,40 @@ void KMMsgBase::setStatus(const KMMsgStatus aStatus, int idx)
 
 
 //-----------------------------------------------------------------------------
-void KMMsgBase::setStatus(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')) setStatus(KMMsgStatusNew);
-    if (strchr(aXStatusStr, 'U')) setStatus(KMMsgStatusUnread);
-    if (strchr(aXStatusStr, 'O')) setStatus(KMMsgStatusOld);
-    if (strchr(aXStatusStr, 'R')) setStatus(KMMsgStatusRead);
-    if (strchr(aXStatusStr, 'D')) setStatus(KMMsgStatusDeleted);
-    if (strchr(aXStatusStr, 'A')) setStatus(KMMsgStatusReplied);
-    if (strchr(aXStatusStr, 'F')) setStatus(KMMsgStatusForwarded);
-    if (strchr(aXStatusStr, 'Q')) setStatus(KMMsgStatusQueued);
-    if (strchr(aXStatusStr, 'K')) setStatus(KMMsgStatusTodo);
-    if (strchr(aXStatusStr, 'S')) setStatus(KMMsgStatusSent);
-    if (strchr(aXStatusStr, 'G')) setStatus(KMMsgStatusFlag);
-    if (strchr(aXStatusStr, 'P')) setStatus(KMMsgStatusSpam);
-    if (strchr(aXStatusStr, 'H')) setStatus(KMMsgStatusHam);
-    if (strchr(aXStatusStr, 'T')) setStatus(KMMsgStatusHasAttach);
-    if (strchr(aXStatusStr, 'C')) setStatus(KMMsgStatusHasNoAttach);
+    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')) {
-      setStatus( KMMsgStatusOld );
-      setStatus( KMMsgStatusRead );
+      seStatus( KMMsgStatusOld );
+      seStatus( KMMsgStatusRead );
     }
     else if (aStatusStr[0] == 'R')
-      setStatus(KMMsgStatusRead);
+      seStatus(KMMsgStatusRead);
     else if (aStatusStr[0] == 'D')
-      setStatus(KMMsgStatusDeleted);
+      seStatus(KMMsgStatusDeleted);
     else
-      setStatus(KMMsgStatusNew);
+      seStatus(KMMsgStatusNew);
   }
 }
 
@@ -587,7 +587,7 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok)
   TQString result = _str;
   int len = result.length();
   for (int i = 0; i < len; i++)
-    if (result.at(i).unicode() >= 128) {
+    if (result.at(i).tqunicode() >= 128) {
       result.at(i) = '?';
       all_ok = false;
     }
@@ -800,7 +800,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
   unsigned int nonAscii = 0;
   unsigned int strLength(_str.length());
   for (unsigned int i = 0; i < strLength; i++)
-    if (_str.at(i).unicode() >= 128) nonAscii++;
+    if (_str.at(i).tqunicode() >= 128) nonAscii++;
   bool useBase64 = (nonAscii * 6 > strLength);
 
   unsigned int start, stop, p, pos = 0, encLength;
@@ -815,7 +815,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
     {
       if (!breakLine && (_str.at(p) == ' ' || dontQuote.find(_str.at(p)) != -1))
         start = p + 1;
-      if (_str.at(p).unicode() >= 128 || _str.at(p).unicode() < 32)
+      if (_str.at(p).tqunicode() >= 128 || _str.at(p).tqunicode() < 32)
         break;
       p++;
     }
@@ -1037,7 +1037,7 @@ TQCString KMMsgBase::autoDetectCharset(const TQCString &_encoding, const TQStrin
     TQStringList charsets = encodingList;
     if (!_encoding.isEmpty())
     {
-       TQString currentCharset = TQString::fromLatin1(_encoding);
+       TQString currentCharset = TQString::tqfromLatin1(_encoding);
        charsets.remove(currentCharset);
        charsets.prepend(currentCharset);
     }
@@ -1119,9 +1119,9 @@ static void swapEndian(TQString &str)
 {
   uint len = str.length();
   str = TQDeepCopy<TQString>(str);
-  TQChar *unicode = const_cast<TQChar*>( str.unicode() );
+  TQChar *tqunicode = const_cast<TQChar*>( str.tqunicode() );
   for (uint i = 0; i < len; i++)
-    unicode[i] = kmail_swap_16(unicode[i].unicode());
+    tqunicode[i] = kmail_swap_16(tqunicode[i].tqunicode());
 }
 
 //-----------------------------------------------------------------------------
@@ -1171,9 +1171,9 @@ retry:
   }
 
   MsgPartType type;
-  Q_UINT16 l;
+  TQ_UINT16 l;
   while(g_chunk_offset < mIndexLength) {
-    Q_UINT32 tmp;
+    TQ_UINT32 tmp;
     copy_from_stream(tmp);
     copy_from_stream(l);
     if (swapByteOrder)
@@ -1193,7 +1193,7 @@ retry:
     }
     if(type == t) {
         // This works because the TQString constructor does a memcpy.
-        // Otherwise we would need to be concerned about the alignment.
+        // Otherwise we would need to be concerned about the tqalignment.
 	if(l)
 	    ret = TQString((TQChar *)(g_chunk + g_chunk_offset), l/2);
 	break;
@@ -1248,9 +1248,9 @@ retry:
   }
 
   MsgPartType type;
-  Q_UINT16 l;
+  TQ_UINT16 l;
   while (g_chunk_offset < mIndexLength) {
-    Q_UINT32 tmp;
+    TQ_UINT32 tmp;
     copy_from_stream(tmp);
     copy_from_stream(l);
     if (swapByteOrder)
@@ -1285,7 +1285,7 @@ retry:
       else if (sizeOfLong == 4)
       {
          // Long is stored as 4 bytes in index file, sizeof(long) = 8
-         Q_UINT32 ret_32;
+         TQ_UINT32 ret_32;
          copy_from_stream(ret_32);
          if (swapByteOrder)
             ret_32 = kmail_swap_32(ret_32);
@@ -1294,8 +1294,8 @@ retry:
       else if (sizeOfLong == 8)
       {
          // Long is stored as 8 bytes in index file, sizeof(long) = 4
-         Q_UINT32 ret_1;
-         Q_UINT32 ret_2;
+         TQ_UINT32 ret_1;
+         TQ_UINT32 ret_2;
          copy_from_stream(ret_1);
          copy_from_stream(ret_2);
          if (!swapByteOrder)
@@ -1347,8 +1347,8 @@ retry:
 	int len2 = (len > 256) ? 256 : len; \
 	if(csize < (length + (len2 + sizeof(short) + sizeof(MsgPartType)))) \
     	   ret = (uchar *)realloc(ret, csize += len2+sizeof(short)+sizeof(MsgPartType)); \
-        Q_UINT32 t = (Q_UINT32) type; memcpy(ret+length, &t, sizeof(t)); \
-        Q_UINT16 l = len2; memcpy(ret+length+sizeof(t), &l, sizeof(l)); \
+        TQ_UINT32 t = (TQ_UINT32) type; memcpy(ret+length, &t, sizeof(t)); \
+        TQ_UINT16 l = len2; memcpy(ret+length+sizeof(t), &l, sizeof(l)); \
         if (network_order) \
            memcpy_networkorder(ret+length+sizeof(t)+sizeof(l), x, len2); \
         else \
@@ -1371,23 +1371,23 @@ 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.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp = mLegacyStatus;
   STORE_DATA(MsgLegacyStatusPart, tmp);
 
   //these are completely arbitrary order
   tmp_str = fromStrip().stripWhiteSpace();
-  STORE_DATA_LEN(MsgFromStripPart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgFromStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = subject().stripWhiteSpace();
-  STORE_DATA_LEN(MsgSubjectPart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgSubjectPart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = toStrip().stripWhiteSpace();
-  STORE_DATA_LEN(MsgToStripPart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgToStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = replyToIdMD5().stripWhiteSpace();
-  STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = xmark().stripWhiteSpace();
-  STORE_DATA_LEN(MsgXMarkPart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgXMarkPart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = fileName().stripWhiteSpace();
-  STORE_DATA_LEN(MsgFilePart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgFilePart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp = msgSize();
   STORE_DATA(MsgSizePart, tmp);
   tmp = folderOffset();
@@ -1400,10 +1400,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const
   STORE_DATA(MsgMDNSentPart, tmp);
 
   tmp_str = replyToAuxIdMD5().stripWhiteSpace();
-  STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
 
   tmp_str = strippedSubjectMD5().stripWhiteSpace();
-  STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
 
   tmp = status();
   STORE_DATA(MsgStatusPart, tmp);
@@ -1414,10 +1414,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const
   STORE_DATA(MsgUIDPart, tmp);
 
   tmp_str = from();
-  STORE_DATA_LEN( MsgFromPart, tmp_str.unicode(), tmp_str.length() * 2, true );
+  STORE_DATA_LEN( MsgFromPart, tmp_str.tqunicode(), tmp_str.length() * 2, true );
 
   tmp_str = to();
-  STORE_DATA_LEN( MsgToPart, tmp_str.unicode(), tmp_str.length() * 2, true );
+  STORE_DATA_LEN( MsgToPart, tmp_str.tqunicode(), tmp_str.length() * 2, true );
 
   return ret;
 }
@@ -1450,37 +1450,37 @@ void KMMsgBase::readConfig()
   sReplySubjPrefixes = composerGroup.readListEntry("reply-prefixes", ',');
   if (sReplySubjPrefixes.isEmpty())
     sReplySubjPrefixes << "Re\\s*:" << "Re\\[\\d+\\]:" << "Re\\d+:";
-  sReplaceSubjPrefix = composerGroup.readBoolEntry("replace-reply-prefix", true);
+  sReplaceSubjPrefix = composerGroup.readBoolEntry("tqreplace-reply-prefix", true);
   sForwardSubjPrefixes = composerGroup.readListEntry("forward-prefixes", ',');
   if (sForwardSubjPrefixes.isEmpty())
     sForwardSubjPrefixes << "Fwd:" << "FW:";
-  sReplaceForwSubjPrefix = composerGroup.readBoolEntry("replace-forward-prefix", true);
+  sReplaceForwSubjPrefix = composerGroup.readBoolEntry("tqreplace-forward-prefix", true);
 }
 
 //-----------------------------------------------------------------------------
 // static
 TQString KMMsgBase::stripOffPrefixes( const TQString& str )
 {
-  return replacePrefixes( str, sReplySubjPrefixes + sForwardSubjPrefixes,
+  return tqreplacePrefixes( str, sReplySubjPrefixes + sForwardSubjPrefixes,
                           true, TQString::null ).stripWhiteSpace();
 }
 
 //-----------------------------------------------------------------------------
 // static
-TQString KMMsgBase::replacePrefixes( const TQString& str,
+TQString KMMsgBase::tqreplacePrefixes( const TQString& str,
                                     const TQStringList& prefixRegExps,
-                                    bool replace,
+                                    bool tqreplace,
                                     const TQString& newPrefix )
 {
   bool recognized = false;
   // 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::fromLatin1("^(?:\\s+|(?:%1))+\\s*")
+  TQString bigRegExp = TQString::tqfromLatin1("^(?:\\s+|(?:%1))+\\s*")
                       .arg( prefixRegExps.join(")|(?:") );
   TQRegExp rx( bigRegExp, false /*case insens.*/ );
   if ( !rx.isValid() ) {
-    kdWarning(5006) << "KMMessage::replacePrefixes(): bigRegExp = \""
+    kdWarning(5006) << "KMMessage::tqreplacePrefixes(): bigRegExp = \""
                     << bigRegExp << "\"\n"
                     << "prefix regexp is invalid!" << endl;
     // try good ole Re/Fwd:
@@ -1489,8 +1489,8 @@ TQString KMMsgBase::replacePrefixes( const TQString& str,
     TQString tmp = str;
     if ( rx.search( tmp ) == 0 ) {
       recognized = true;
-      if ( replace )
-	return tmp.replace( 0, rx.matchedLength(), newPrefix + ' ' );
+      if ( tqreplace )
+	return tmp.tqreplace( 0, rx.matchedLength(), newPrefix + ' ' );
     }
   }
   if ( !recognized )
@@ -1508,10 +1508,10 @@ TQString KMMsgBase::cleanSubject() const
 
 //-----------------------------------------------------------------------------
 TQString KMMsgBase::cleanSubject( const TQStringList & prefixRegExps,
-                                 bool replace,
+                                 bool tqreplace,
                                  const TQString & newPrefix ) const
 {
-  return KMMsgBase::replacePrefixes( subject(), prefixRegExps, replace,
+  return KMMsgBase::tqreplacePrefixes( subject(), prefixRegExps, tqreplace,
                                      newPrefix );
 }
 
diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h
index 1137bb6e9..d5b7107f2 100644
--- a/kmail/kmmsgbase.h
+++ b/kmail/kmmsgbase.h
@@ -220,9 +220,9 @@ public:
 
   /** Set status and mark dirty.  Optional optimization: @p idx may
    * specify the index of this message within the parent folder. */
-  virtual void setStatus(const KMMsgStatus status, int idx = -1);
+  virtual void seStatus(const KMMsgStatus status, int idx = -1);
   virtual void toggleStatus(const KMMsgStatus status, int idx = -1);
-  virtual void setStatus(const char* statusField, const char* xstatusField=0);
+  virtual void seStatus(const char* statusField, const char* xstatusField=0);
 
   /** Encryption status of the message. */
   virtual KMMsgEncryptionState encryptionState() const = 0;
@@ -403,18 +403,18 @@ public:
   /** Return if the message has at least one attachment */
   virtual KMMsgAttachmentState attachmentState() const;
 
-  /** Return if the message contains an invitation */
+  /** Return if the message tqcontains an invitation */
   virtual KMMsgInvitationState invitationState() const;
 
   /** Check for prefixes @p prefixRegExps in @p str. If none
       is found, @p newPrefix + ' ' is prepended to @p str and the
-      resulting string is returned. If @p replace is true, any
+      resulting string is returned. If @p tqreplace is true, any
       sequence of whitespace-delimited prefixes at the beginning of
-      @p str is replaced by @p newPrefix.
+      @p str is tqreplaced by @p newPrefix.
   **/
-  static TQString replacePrefixes( const TQString& str,
+  static TQString tqreplacePrefixes( const TQString& str,
                                   const TQStringList& prefixRegExps,
-                                  bool replace,
+                                  bool tqreplace,
                                   const TQString& newPrefix );
 
   /** Returns @p str with all "forward" and "reply" prefixes stripped off.
@@ -423,11 +423,11 @@ public:
 
   /** Check for prefixes @p prefixRegExps in #subject(). If none
       is found, @p newPrefix + ' ' is prepended to the subject and the
-      resulting string is returned. If @p replace is true, any
+      resulting string is returned. If @p tqreplace is true, any
       sequence of whitespace-delimited prefixes at the beginning of
-      #subject() is replaced by @p newPrefix
+      #subject() is tqreplaced by @p newPrefix
   **/
-  TQString cleanSubject(const TQStringList& prefixRegExps, bool replace,
+  TQString cleanSubject(const TQStringList& prefixRegExps, bool tqreplace,
 		       const TQString& newPrefix) const;
 
   /** Return this mails subject, with all "forward" and "reply"
@@ -459,7 +459,7 @@ public:
   enum MsgPartType
   {
     MsgNoPart = 0,
-    //unicode strings
+    //tqunicode strings
     MsgFromStripPart = 1,
     MsgSubjectPart = 2,
     MsgToStripPart = 3,
@@ -474,7 +474,7 @@ public:
     MsgFilePart = 11,
     MsgCryptoStatePart = 12,
     MsgMDNSentPart = 13,
-    //another two unicode strings
+    //another two tqunicode strings
     MsgReplyToAuxIdMD5Part = 14,
     MsgStrippedSubjectMD5Part = 15,
     // and another unsigned long
diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp
index 8f9a9551c..07f5797d0 100644
--- a/kmail/kmmsgdict.cpp
+++ b/kmail/kmmsgdict.cpp
@@ -223,7 +223,7 @@ unsigned long KMMsgDict::insert(unsigned long msgSerNum,
     folder->setDirty( true ); // rewrite id file
   }
 
-  // Insert into the dict. Don't use dict->replace() as we _know_
+  // Insert into the dict. Don't use dict->tqreplace() as we _know_
   // there is no entry with the same msn, we just made sure.
   KMMsgDictEntry *entry = new KMMsgDictEntry(folder->folder(), index);
   dict->insert((long)msn, entry);
@@ -246,12 +246,12 @@ unsigned long KMMsgDict::insert(const KMMsgBase *msg, int index)
 
 //-----------------------------------------------------------------------------
 
-void KMMsgDict::replace(unsigned long msgSerNum,
+void KMMsgDict::tqreplace(unsigned long msgSerNum,
 		       const KMMsgBase *msg, int index)
 {
   KMFolderIndex* folder = static_cast<KMFolderIndex*>( msg->storage() );
   if ( !folder ) {
-    kdDebug(5006) << "KMMsgDict::replace: Cannot replace the message serial "
+    kdDebug(5006) << "KMMsgDict::tqreplace: Cannot tqreplace the message serial "
       << "number, null pointer to storage. Requested serial: " << msgSerNum
       << endl;
     kdDebug(5006) << "  Message info: Subject: " << msg->subject() << ", To: "
@@ -411,14 +411,14 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
   }
 
   bool swapByteOrder;
-  Q_UINT32 byte_order;
+  TQ_UINT32 byte_order;
   if (!fread(&byte_order, sizeof(byte_order), 1, fp)) {
     fclose(fp);
     return -1;
   }
   swapByteOrder = (byte_order == 0x78563412);
 
-  Q_UINT32 count;
+  TQ_UINT32 count;
   if (!fread(&count, sizeof(count), 1, fp)) {
     fclose(fp);
     return -1;
@@ -434,7 +434,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
   fseek(fp, pos, SEEK_SET);   // back to previous position
 
   // the file must at least contain what we try to read below
-  if ( (fileSize - pos) < (long)(count * sizeof(Q_UINT32)) ) {
+  if ( (fileSize - pos) < (long)(count * sizeof(TQ_UINT32)) ) {
     fclose(fp);
     return -1;
   }
@@ -442,7 +442,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
   KMMsgDictREntry *rentry = new KMMsgDictREntry(count);
 
   for (unsigned int index = 0; index < count; index++) {
-    Q_UINT32 msn;
+    TQ_UINT32 msn;
 
     bool readOk = fread(&msn, sizeof(msn), 1, fp);
     if (swapByteOrder)
@@ -468,7 +468,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
       Q_ASSERT( msn != 0 );
     }
 
-    // Insert into the dict. Don't use dict->replace() as we _know_
+    // Insert into the dict. Don't use dict->tqreplace() as we _know_
     // there is no entry with the same msn, we just made sure.
     KMMsgDictEntry *entry = new KMMsgDictEntry( storage.folder(), index);
     dict->insert((long)msn, entry);
@@ -506,7 +506,7 @@ KMMsgDictREntry *KMMsgDict::openFolderIds( const FolderStorage& storage, bool tr
       fscanf(fp, IDS_HEADER, &version);
       if (version == IDS_VERSION)
       {
-         Q_UINT32 byte_order = 0;
+         TQ_UINT32 byte_order = 0;
          fread(&byte_order, sizeof(byte_order), 1, fp);
          rentry->swapByteOrder = (byte_order == 0x78563412);
       }
@@ -530,7 +530,7 @@ KMMsgDictREntry *KMMsgDict::openFolderIds( const FolderStorage& storage, bool tr
          return 0;
       }
       fprintf(fp, IDS_HEADER, IDS_VERSION);
-      Q_UINT32 byteOrder = 0x12345678;
+      TQ_UINT32 byteOrder = 0x12345678;
       fwrite(&byteOrder, sizeof(byteOrder), 1, fp);
       rentry->swapByteOrder = false;
     }
@@ -552,7 +552,7 @@ int KMMsgDict::writeFolderIds( const FolderStorage &storage )
 
   fseek(fp, rentry->baseOffset, SEEK_SET);
   // kdDebug(5006) << "Dict writing for folder " << storage.label() << endl;
-  Q_UINT32 count = rentry->getRealSize();
+  TQ_UINT32 count = rentry->getRealSize();
   if (!fwrite(&count, sizeof(count), 1, fp)) {
     kdDebug(5006) << "Dict cannot write count with folder " << storage.label() << ": "
                   << strerror(errno) << " (" << errno << ")" << endl;
@@ -560,7 +560,7 @@ int KMMsgDict::writeFolderIds( const FolderStorage &storage )
   }
 
   for (unsigned int index = 0; index < count; index++) {
-    Q_UINT32 msn = rentry->getMsn(index);
+    TQ_UINT32 msn = rentry->getMsn(index);
     if (!fwrite(&msn, sizeof(msn), 1, fp))
       return -1;
     if ( msn == 0 ) {
@@ -605,7 +605,7 @@ int KMMsgDict::appendToFolderIds( FolderStorage& storage, int index)
 //  kdDebug(5006) << "Dict appending for folder " << storage.label() << endl;
 
   fseek(fp, rentry->baseOffset, SEEK_SET);
-  Q_UINT32 count;
+  TQ_UINT32 count;
   if (!fread(&count, sizeof(count), 1, fp)) {
     kdDebug(5006) << "Dict cannot read count for folder " << storage.label() << ": "
                   << strerror(errno) << " (" << errno << ")" << endl;
@@ -629,7 +629,7 @@ int KMMsgDict::appendToFolderIds( FolderStorage& storage, int index)
   if (ofs > 0)
     fseek(fp, ofs, SEEK_CUR);
 
-  Q_UINT32 msn = rentry->getMsn(index);
+  TQ_UINT32 msn = rentry->getMsn(index);
   if (rentry->swapByteOrder)
      msn = kmail_swap_32(msn);
   if (!fwrite(&msn, sizeof(msn), 1, fp)) {
diff --git a/kmail/kmmsgdict.h b/kmail/kmmsgdict.h
index 60fabf6c8..a13165340 100644
--- a/kmail/kmmsgdict.h
+++ b/kmail/kmmsgdict.h
@@ -97,7 +97,7 @@ private:
   unsigned long insert(const KMMsgBase *msg, int index = -1);
 
   /** Set the serial number of @p msg to @p msgSerNum */
-  void replace(unsigned long msgSerNum,
+  void tqreplace(unsigned long msgSerNum,
                const KMMsgBase *msg, int index = -1);
 
   /** Removes a message. */
diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp
index ece847a38..9a7b1ed88 100644
--- a/kmail/kmmsginfo.cpp
+++ b/kmail/kmmsginfo.cpp
@@ -666,11 +666,11 @@ void KMMsgInfo::setFileName(const TQString& file)
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgInfo::setStatus(const KMMsgStatus aStatus, int idx)
+void KMMsgInfo::seStatus(const KMMsgStatus aStatus, int idx)
 {
     if(aStatus == status())
         return;
-    KMMsgBase::setStatus(aStatus, idx); //base does more "stuff"
+    KMMsgBase::seStatus(aStatus, idx); //base does more "stuff"
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h
index 8f557f25b..ce15e3127 100644
--- a/kmail/kmmsginfo.h
+++ b/kmail/kmmsginfo.h
@@ -91,7 +91,7 @@ public:
   void setMsgSizeServer(size_t sz);
   void setFolderOffset(off_t offs);
   void setFileName(const TQString& file);
-  virtual void setStatus(const KMMsgStatus 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 setStatus(const char* s1, const char* s2=0) { KMMsgBase::setStatus(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/kmmsgpart.cpp b/kmail/kmmsgpart.cpp
index 112236c03..a96d6aae2 100644
--- a/kmail/kmmsgpart.cpp
+++ b/kmail/kmmsgpart.cpp
@@ -406,7 +406,7 @@ TQCString KMMessagePart::bodyDecoded(void) const
   //kdWarning( result.length() != (unsigned int)len, 5006 )
   //  << "KMMessagePart::bodyDecoded(): body is binary but used as text!" << endl;
 
-  result = result.replace( "\r\n", "\n" ); // CRLF -> LF conversion
+  result = result.tqreplace( "\r\n", "\n" ); // CRLF -> LF conversion
 
   assert( mBodyDecodedSize < 0 || mBodyDecodedSize == len );
   if ( mBodyDecodedSize < 0 )
@@ -422,7 +422,7 @@ void KMMessagePart::magicSetType(bool aAutoDecode)
   KMimeMagic::self()->setFollowLinks( true ); // is it necessary ?
 
   const TQByteArray body = ( aAutoDecode ) ? bodyDecodedBinary() : mBody ;
-  KMimeMagicResult * result = KMimeMagic::self()->findBufferType( body );
+  KMimeMagicResult * result = KMimeMagic::self()->tqfindBufferType( body );
 
   TQString mimetype = result->mimeType();
   const int sep = mimetype.find('/');
@@ -445,7 +445,7 @@ TQString KMMessagePart::iconName( int size ) const
     if ( fileName.isEmpty() ) fileName = this->name();
     if ( !fileName.isEmpty() )
     {
-      fileName = KMimeType::findByPath( "/tmp/"+fileName, 0, true )->icon( TQString::null, true );
+      fileName = KMimeType::tqfindByPath( "/tmp/"+fileName, 0, true )->icon( TQString::null, true );
     }
   }
 
@@ -558,7 +558,7 @@ TQString KMMessagePart::fileName(void) const
 
   // Allow for multiple filname*0, filename*1, ... params (defined by RFC 2231)
   // in the Content-Disposision
-  if ( mContentDisposition.contains( "filename*", false ) ) {
+  if ( mContentDisposition.tqcontains( "filename*", false ) ) {
 
     // It's RFC 2231 encoded, so extract the file name with the 2231 method
     str = KMMsgBase::extractRFC2231HeaderField( mContentDisposition, "filename" );
diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h
index 000837c75..85906af5f 100644
--- a/kmail/kmmsgpart.h
+++ b/kmail/kmmsgpart.h
@@ -58,17 +58,17 @@ public:
    **/
   void setBodyFromUnicode( const TQString & str );
 
-  /** Returns the body part decoded to unicode.
+  /** Returns the body part decoded to tqunicode.
    **/
   TQString bodyToUnicode(const TQTextCodec* codec=0) const;
 
   /** Returns body as decoded string. Assumes that content-transfer-encoding
-    contains the correct encoding. This routine is meant for binary data.
+    tqcontains the correct encoding. This routine is meant for binary data.
     No trailing 0 is appended. */
   TQByteArray bodyDecodedBinary(void) const;
 
   /** Returns body as decoded string. Assumes that content-transfer-encoding
-      contains the correct encoding. This routine is meant for text strings! */
+      tqcontains the correct encoding. This routine is meant for text strings! */
   TQCString bodyDecoded(void) const;
 
   /** Sets body, encoded in the best fitting
@@ -209,7 +209,7 @@ public:
   /** Sets the part number */
   void setPartSpecifier( const TQString & part ) { mPartSpecifier = part; }
 
-  /** If this part is complete (contains a body) */
+  /** If this part is complete (tqcontains a body) */
   bool isComplete() { return (!mBody.isNull()); }
 
   /** Returns the parent part */
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index 4a897291f..e87fbd8ac 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -54,7 +54,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
   TQLabel      * label;
   TQString       msg;
 
-  setHelp( TQString::fromLatin1("attachments") );
+  setHelp( TQString::tqfromLatin1("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( mMimeType ) );
   mMimeType->insertStringList( TQStringList()
-			       << 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") );
+			       << 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") );
   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::fromLatin1("%1/%2").arg(type).arg(subtype) );
+  setMimeType( TQString::tqfromLatin1("%1/%2").arg(type).arg(subtype) );
 }
 
 void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) {
@@ -396,7 +396,7 @@ void KMMsgPartDialogCompat::applyChanges()
     if ( name != TQString( encName ) )
       cDisp += "*=" + encName;
     else
-      cDisp += "=\"" + encName.replace( '\\', "\\\\" ).replace( '"', "\\\"" ) + '"';
+      cDisp += "=\"" + encName.tqreplace( '\\', "\\\\" ).tqreplace( '"', "\\\"" ) + '"';
     mMsgPart->setContentDisposition( cDisp );
   }
 
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index 2654f52ca..3139aa32f 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -464,7 +464,7 @@ void KMPopFilterCnfrmDlg::slotToggled(bool aOn)
 
 void KMPopFilterCnfrmDlg::slotUpdateMinimumSize()
 {
-  mainWidget()->setMinimumSize(mainWidget()->sizeHint());
+  mainWidget()->setMinimumSize(mainWidget()->tqsizeHint());
 }
 
 #include "kmpopfiltercnfrmdlg.moc"
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index 2f5227cde..375234c09 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -363,7 +363,7 @@ void KMReaderMainWin::setupAccel()
   KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() );
   KStdAction::selectAll( this, TQT_SLOT( slotMarkAll() ), actionCollection() );
   KStdAction::find( this, TQT_SLOT(slotFind()), actionCollection() );
-  KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection() );
+  KStdAction::tqfindNext( this, TQT_SLOT( slotFindNext() ), actionCollection() );
   mTrashAction = new KAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash",
                               i18n( "Move message to trashcan" ) ),
                               Key_Delete, this, TQT_SLOT( slotTrashMsg() ),
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 21be5a44a..0fce722d3 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -161,7 +161,7 @@ NewByteArray& NewByteArray::operator+=( const char * newData )
         return *this;
     TQByteArray::detach();
     uint len1 = size();
-    uint len2 = qstrlen( newData );
+    uint len2 = tqstrlen( newData );
     if ( !TQByteArray::resize( len1 + len2 ) )
         return *this;
     memcpy( data() + len1, newData, len2 );
@@ -281,14 +281,14 @@ void KMReaderWin::objectTreeToDecryptedMsg( partNode* node,
 kdDebug(5006) << "dataNode == curNode:  Save curNode without replacing it." << endl;
 
       // A) Store the headers of this part IF curNode is not the root node
-      //    AND we are not replacing a node that already *has* replaced
+      //    AND we are not replacing a node that already *has* tqreplaced
       //    the root node in previous recursion steps of this function...
       if( headers ) {
         if( dataNode->parentNode() && !weAreReplacingTheRootNode ) {
 kdDebug(5006) << "dataNode is NOT replacing the root node:  Store the headers." << endl;
           resultingData += headers->AsString().c_str();
         } else if( weAreReplacingTheRootNode && part && part->hasHeaders() ){
-kdDebug(5006) << "dataNode replace the root node:  Do NOT store the headers but change" << endl;
+kdDebug(5006) << "dataNode tqreplace the root node:  Do NOT store the headers but change" << endl;
 kdDebug(5006) << "                                 the Message's headers accordingly." << endl;
 kdDebug(5006) << "              old Content-Type = " << rootHeaders.ContentType().AsString().c_str() << endl;
 kdDebug(5006) << "              new Content-Type = " << headers->ContentType(   ).AsString().c_str() << endl;
@@ -323,7 +323,7 @@ kdDebug(5006) << "--boundary" << endl;
           resultingData += boundary;
           resultingData += "\n";
           // note: We are processing a harmless multipart that is *not*
-          //       to be replaced by one of it's children, therefor
+          //       to be tqreplaced by one of it's children, therefor
           //       we set their doStoreHeaders to true.
           objectTreeToDecryptedMsg( curNode,
                                     resultingData,
@@ -347,11 +347,11 @@ kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE
 kdDebug(5006) << "dataNode != curNode:  Replace curNode by dataNode." << endl;
       bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->parentNode();
       if( rootNodeReplaceFlag ) {
-kdDebug(5006) << "                      Root node will be replaced." << endl;
+kdDebug(5006) << "                      Root node will be tqreplaced." << endl;
       } else {
-kdDebug(5006) << "                      Root node will NOT be replaced." << endl;
+kdDebug(5006) << "                      Root node will NOT be tqreplaced." << endl;
       }
-      // store special data to replace the current part
+      // store special data to tqreplace the current part
       // (e.g. decrypted data or embedded RfC 822 data)
       objectTreeToDecryptedMsg( dataNode,
                                 resultingData,
@@ -1017,24 +1017,24 @@ void KMReaderWin::initHtmlWidget(void)
   connect(mViewer,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),
           TQT_SLOT(slotUrlPopup(const TQString &, const TQPoint &)));
   connect( kmkernel->imProxy(), TQT_SIGNAL( sigContactPresenceChanged( const TQString & ) ),
-          this, TQT_SLOT( contactStatusChanged( const TQString & ) ) );
+          this, TQT_SLOT( contacStatusChanged( const TQString & ) ) );
   connect( kmkernel->imProxy(), TQT_SIGNAL( sigPresenceInfoExpired() ),
           this, TQT_SLOT( updateReaderWin() ) );
 }
 
-void KMReaderWin::contactStatusChanged( const TQString &uid)
+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::fromLatin1("presence-") + uid ) );
+    .getElementsByName( DOM::DOMString( TQString::tqfromLatin1("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::null )
-      newPresence = TQString::fromLatin1( "ENOIMRUNNING" );
+      newPresence = TQString::tqfromLatin1( "ENOIMRUNNING" );
     n.firstChild().setNodeValue( newPresence );
 //    kdDebug( 5006 ) << "value of content is now " << n.firstChild().nodeValue().string() << endl;
   }
@@ -1423,7 +1423,7 @@ void KMReaderWin::updateReaderWin()
   {
     TQScrollView * scrollview = static_cast<TQScrollView *>(mViewer->widget());
     scrollview->setContentsPos( 0,
-      qRound( scrollview->contentsHeight() * mSavedRelativePosition ) );
+      tqRound( scrollview->contentsHeight() * mSavedRelativePosition ) );
     mSavedRelativePosition = 0;
   }
 }
@@ -1653,7 +1653,7 @@ kdDebug(5006) << "KMReaderWin  -  composing unencrypted message" << endl;
 
   if( emitReplaceMsgByUnencryptedVersion ) {
     kdDebug(5006) << "KMReaderWin  -  invoce saving in decrypted form:" << endl;
-    emit replaceMsgByUnencryptedVersion();
+    emit tqreplaceMsgByUnencryptedVersion();
   } else {
     kdDebug(5006) << "KMReaderWin  -  finished parsing and displaying of message." << endl;
     showHideMimeTree( rootNodeCntType == DwMime::kTypeText &&
@@ -1805,7 +1805,7 @@ void KMReaderWin::slotTouchMessage()
 
   SerNumList serNums;
   serNums.append( message()->getMsgSerNum() );
-  KMCommand *command = new KMSetStatusCommand( KMMsgStatusRead, serNums );
+  KMCommand *command = new KMSeStatusCommand( KMMsgStatusRead, serNums );
   command->start();
 
   // should we send an MDN?
@@ -1892,7 +1892,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl)
   }
 
   if ( aUrl.stripWhiteSpace().isEmpty() ) {
-    KPIM::BroadcastStatus::instance()->reset();
+    KPIM::BroadcasStatus::instance()->reset();
     mHoveredUrl = KURL();
     mLastClickImagePath = TQString();
     return;
@@ -1903,7 +1903,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl)
   const TQString msg = URLHandlerManager::instance()->statusBarMessage( url, this );
 
   kdWarning( msg.isEmpty(), 5006 ) << "KMReaderWin::slotUrlOn(): Unhandled URL hover!" << endl;
-  KPIM::BroadcastStatus::instance()->setTransientStatusMsg( msg );
+  KPIM::BroadcasStatus::instance()->setTransienStatusMsg( msg );
 }
 
 
@@ -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( style().isA("KeramikStyle") )
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != mBox->lineWidth() )
@@ -2050,13 +2050,13 @@ void KMReaderWin::slotHandleAttachment( int choice )
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotFind()
 {
-  mViewer->findText();
+  mViewer->tqfindText();
 }
 
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotFindNext()
 {
-  mViewer->findTextNext();
+  mViewer->tqfindTextNext();
 }
 
 //-----------------------------------------------------------------------------
@@ -2190,8 +2190,8 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML,
     // A TQString cannot handle binary data. So if it's shorter than the
     // attachment, we assume the attachment is binary:
     if( str.length() < (unsigned) aMsgPart->decodedSize() ) {
-      str.prepend( i18n("[KMail: Attachment contains binary data. Trying to show first character.]",
-          "[KMail: Attachment contains binary data. Trying to show first %n characters.]",
+      str.prepend( i18n("[KMail: Attachment tqcontains binary data. Trying to show first character.]",
+          "[KMail: Attachment tqcontains binary data. Trying to show first %n characters.]",
           str.length()) + TQChar('\n') );
     }
     htmlWriter()->queue( TQStyleSheet::escape( str ) );
@@ -2267,16 +2267,16 @@ 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::fromLatin1( contentTypeStr ) );
+  mimetype = KMimeType::mimeType( TQString::tqfromLatin1( 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 */ );
+    mimetype = KMimeType::tqfindByPath( name, 0, true /* no disk access */ );
   }
   if ( ( mimetype->name() == "application/octet-stream" )
        && msgPart.isComplete() ) {
     // consider the attachment's contents if neither the Content-Type header
     // nor the filename give us a clue
-    mimetype = KMimeType::findByFileContent( name );
+    mimetype = KMimeType::tqfindByFileContent( name );
   }
 
   KService::Ptr offer =
@@ -2297,7 +2297,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
                        .arg( filenameText );
   const int choice = KMessageBox::questionYesNoCancel( this, text,
       i18n("Open Attachment?"), KStdGuiItem::saveAs(), open_text,
-      TQString::fromLatin1("askSave") + mimetype->name() ); // dontAskAgainName
+      TQString::tqfromLatin1("askSave") + mimetype->name() ); // dontAskAgainName
 
   if( choice == KMessageBox::Yes ) {		// Save
     mAtmUpdate = true;
@@ -2738,7 +2738,7 @@ void KMReaderWin::fillCommandInfo( partNode *node, KMMessage **msg, int *nodeId
 void KMReaderWin::slotDeleteAttachment(partNode * node)
 {
   if ( KMessageBox::warningContinueCancel( this,
-       i18n("Deleting an attachment might invalidate any digital signature on this message."),
+       i18n("Deleting an attachment might tqinvalidate any digital signature on this message."),
        i18n("Delete Attachment"), KStdGuiItem::del(), "DeleteAttachmentSignatureWarning" )
      != KMessageBox::Continue ) {
     return;
@@ -2794,7 +2794,7 @@ void KMReaderWin::disconnectMsgAdded()
 void KMReaderWin::slotEditAttachment(partNode * node)
 {
   if ( KMessageBox::warningContinueCancel( this,
-        i18n("Modifying an attachment might invalidate any digital signature on this message."),
+        i18n("Modifying an attachment might tqinvalidate any digital signature on this message."),
         i18n("Edit Attachment"), KGuiItem( i18n("Edit"), "edit" ), "EditAttachmentSignatureWarning" )
         != KMessageBox::Continue ) {
     return;
@@ -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::fromLatin1( "att%1" ).arg( node->nodeId() ) );
+  mViewer->gotoAnchor( TQString::tqfromLatin1( "att%1" ).arg( 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::fromLatin1( "<div style=\"float:left;\">%1&nbsp;</div>" ).
+    html.prepend( TQString::tqfromLatin1( "<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::fromLatin1("<div style=\"background:%1; %2"
+        html += TQString::tqfromLatin1("<div style=\"background:%1; %2"
                 "vertical-align:middle; float:%3; %4\">").arg( bgColor.name() ).arg( margin )
                                                          .arg( align ).arg( 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::fromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).arg( bgColor.name() );
+      html += TQString::tqfromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).arg( bgColor.name() );
       TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() );
       TQString href = node->asHREF( "header" );
-      html += TQString::fromLatin1( "<a href=\"" ) + href +
-              TQString::fromLatin1( "\">" );
+      html += TQString::tqfromLatin1( "<a href=\"" ) + href +
+              TQString::tqfromLatin1( "\">" );
       html += "<img style=\"vertical-align:middle;\" src=\"" + info.icon + "\"/>&nbsp;";
       if ( headerStyle() == HeaderStyle::enterprise() ) {
         TQFont bodyFont = mCSSHelper->bodyFont( isFixedFont() );
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index 32c7abdf6..27bc33b0e 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -323,7 +323,7 @@ public:
   /* show or hide the list that points to the attachments */
   void setShowAttachmentQuicklist( bool showAttachmentQuicklist = true ) { mShowAttachmentQuicklist = showAttachmentQuicklist; }
 
-  // This controls whether a Toltec invitation is shown in its raw form or as a replacement text.
+  // This controls whether a Toltec invitation is shown in its raw form or as a tqreplacement text.
   // This can be toggled with the "kmail:showRawToltecMail" link.
   bool showRawToltecMail() const { return mShowRawToltecMail; }
   void setShowRawToltecMail( bool showRawToltecMail ) { mShowRawToltecMail = showRawToltecMail; }
@@ -331,9 +331,9 @@ public:
   /* retrieve BodyPartMemento of id \a which for partNode \a node */
   KMail::Interface::BodyPartMemento * bodyPartMemento( const partNode * node, const TQCString & which ) const;
 
-  /* set/replace BodyPartMemento \a memento of id \a which for
+  /* set/tqreplace BodyPartMemento \a memento of id \a which for
      partNode \a node. If there was a BodyPartMemento registered
-     already, replaces (deletes) that one. */
+     already, tqreplaces (deletes) that one. */
   void setBodyPartMemento( const partNode * node, const TQCString & which, KMail::Interface::BodyPartMemento * memento );
 
   /// Scrolls to the given attachment and marks it with a yellow border
@@ -347,7 +347,7 @@ private:
 signals:
   /** Emitted after parsing of a message to have it stored
       in unencrypted state in it's folder. */
-  void replaceMsgByUnencryptedVersion();
+  void tqreplaceMsgByUnencryptedVersion();
 
   /** The user presses the right mouse button. 'url' may be 0. */
   void popupMenu(KMMessage &msg, const KURL &url, const TQPoint& mousePos);
@@ -369,7 +369,7 @@ public slots:
   /** Refresh the reader window */
   void updateReaderWin();
 
-  /** HTML Widget scrollbar and layout handling. */
+  /** HTML Widget scrollbar and tqlayout handling. */
   void slotScrollUp();
   void slotScrollDown();
   void slotScrollPrior();
@@ -420,7 +420,7 @@ public slots:
   void slotMessageArrived( KMMessage *msg );
   /** start IM Chat with addressee */
   void slotIMChat();
-  void contactStatusChanged( const TQString &uid);
+  void contacStatusChanged( const TQString &uid);
 
   void slotLevelQuote( int l );
   void slotTouchMessage();
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index 3d97a2b31..dc2cc4a1c 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -33,7 +33,7 @@ using KMail::FilterLog;
 #include <assert.h>
 
 static const char* funcConfigNames[] =
-  { "contains", "contains-not", "equals", "not-equal", "regexp",
+  { "tqcontains", "tqcontains-not", "equals", "not-equal", "regexp",
     "not-regexp", "greater", "less-or-equal", "less", "greater-or-equal",
     "is-in-addressbook", "is-not-in-addressbook" , "is-in-category", "is-not-in-category",
     "has-attachment", "has-no-attachment"};
@@ -294,11 +294,11 @@ bool KMSearchRuleString::matches( const DwString & aStr, KMMessage & msg,
     static const DwBoyerMoore to("\nTo: ");
     static const DwBoyerMoore cc("\nCc: ");
     static const DwBoyerMoore bcc("\nBcc: ");
-    // <recipients> "contains" "foo" is true if any of the fields contains
+    // <recipients> "tqcontains" "foo" is true if any of the fields tqcontains
     // "foo", while <recipients> "does not contain" "foo" is true if none
-    // of the fields contains "foo"
+    // of the fields tqcontains "foo"
     if ( ( function() & 1 ) == 0 ) {
-      // positive function, e.g. "contains"
+      // positive function, e.g. "tqcontains"
       rc = ( matches( aStr, msg, &to, 2 ) ||
              matches( aStr, msg, &cc, 2 ) ||
              matches( aStr, msg, &bcc, 3 ) );
@@ -357,7 +357,7 @@ bool KMSearchRuleString::matches( const KMMessage * msg ) const
     msgContents = msg->headerAsString();
     logContents = false;
   } else if ( field() == "<recipients>" ) {
-    // (mmutz 2001-11-05) hack to fix "<recipients> !contains foo" to
+    // (mmutz 2001-11-05) hack to fix "<recipients> !tqcontains foo" to
     // meet user's expectations. See FAQ entry in KDE 2.2.2's KMail
     // handbook
     if ( function() == FuncEquals || function() == FuncNotEqual )
@@ -455,7 +455,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
     for( TQStringList::ConstIterator it = addressList.begin();
          ( it != addressList.end() );
          ++it ) {
-      if ( !stdAb->findByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
+      if ( !stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
         return true;
     }
     return false;
@@ -468,7 +468,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
     for( TQStringList::ConstIterator it = addressList.begin();
          ( it != addressList.end() );
          ++it ) {
-      if ( stdAb->findByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
+      if ( stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
         return true;
     }
     return false;
@@ -481,7 +481,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
 
     for( TQStringList::ConstIterator it = addressList.begin();
       it != addressList.end(); ++it ) {
-        KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) );
+        KABC::Addressee::List addresses = stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) );
 
           for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd )
               if ( (*itAd).hasCategory(category) )
@@ -498,7 +498,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
 
       for( TQStringList::ConstIterator it = addressList.begin();
         it != addressList.end(); ++it ) {
-          KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) );
+          KABC::Addressee::List addresses = stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) );
 
             for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd )
                 if ( (*itAd).hasCategory(category) )
@@ -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::currentDateTime() );
+    numericalMsgContents = msgDateTime.daysTo( TQDateTime::tqcurrentDateTime() );
     numericalValue = contents().toInt();
     msgContents.setNum( numericalMsgContents );
   }
@@ -775,7 +775,7 @@ bool KMSearchPattern::matches( const DwString & aStr, bool ignoreBody ) const
   }
 }
 
-bool KMSearchPattern::matches( Q_UINT32 serNum, bool ignoreBody ) const
+bool KMSearchPattern::matches( TQ_UINT32 serNum, bool ignoreBody ) const
 {
   if ( isEmpty() )
     return true;
diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index 45ffe6808..a79b6122a 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -90,7 +90,7 @@ public:
 
   /** Determine whether the rule is worth considering. It isn't if
       either the field is not set or the contents is empty.
-      KFilter should make sure that it's rule list contains
+      KFilter should make sure that it's rule list tqcontains
       only non-empty rules, as matches doesn't check this. */
   virtual bool isEmpty() const = 0;
 
@@ -299,7 +299,7 @@ public:
     under which it could be stored in the config file.
 
     As a TQPtrList with autoDelete enabled, it assumes that it is the
-    central repository for the rules it contains. So if you want to
+    central repository for the rules it tqcontains. So if you want to
     reuse a rule in another pattern, make a deep copy of that rule.
 
     @short An abstraction of a search over messages.
@@ -339,7 +339,7 @@ public:
   */
   bool matches( const KMMessage * msg, bool ignoreBody = false ) const;
   bool matches( const DwString & str, bool ignoreBody = false ) const;
-  bool matches( Q_UINT32 sernum, bool ignoreBody = false ) const;
+  bool matches( TQ_UINT32 sernum, bool ignoreBody = false ) const;
 
   /** Returns true if the pattern only depends the DwString that backs
       a message */
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index 399bc0e15..5f7c96cbd 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->setSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
+  mFunctionStack->tqsetSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
 
   hlay->addWidget( mFunctionStack );
 
   mValueStack = new TQWidgetStack( this, "mValueStack" );
-  mValueStack->setSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
+  mValueStack->tqsetSizePolicy( 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::fromLatin1( aRule->field() ), 0 );
+    mRuleField->changeItem( TQString::tqfromLatin1( aRule->field() ), 0 );
     i = 0;
   } else { // found in the list of predefined fields
     mRuleField->changeItem( TQString::null, 0 );
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index 7f7730daf..208bf5746 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -77,10 +77,10 @@ KMSender::~KMSender()
 }
 
 //-----------------------------------------------------------------------------
-void KMSender::setStatusMsg(const TQString &msg)
+void KMSender::seStatusMsg(const TQString &msg)
 {
   if ( mProgressItem )
-    mProgressItem->setStatus(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->setStatus(KMMsgStatusQueued);
+  aMsg->seStatus(KMMsgStatusQueued);
 
   if ( const int err = outbox->addMsg(aMsg) ) {
     Q_UNUSED( err );
@@ -178,7 +178,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow)
    * the mail is in a sane state before sending. The unGet makes the
    * attached unencrypted version of the mail (if there is one ) disappear.
    * though, so we need to make sure to keep it around and restore it
-   * afterwards. The real fix would be to replace the unGet with
+   * afterwards. The real fix would be to tqreplace the unGet with
    * whatever parsing is triggered by it, but I'm too chicken to do that,
    * in this branch.
    * Note that the unencrypted mail will be lost if the mail remains in
@@ -293,7 +293,7 @@ void KMSender::doSendMsg()
   {
     mCurrentMsg->setTransferInProgress( false );
     if( mCurrentMsg->hasUnencryptedMsg() ) {
-      kdDebug(5006) << "KMSender::doSendMsg() post-processing: replace mCurrentMsg body by unencryptedMsg data" << endl;
+      kdDebug(5006) << "KMSender::doSendMsg() post-processing: tqreplace mCurrentMsg body by unencryptedMsg data" << endl;
       // delete all current body parts
       mCurrentMsg->deleteBodyParts();
       // copy Content-[..] headers from unencrypted message to current one
@@ -314,8 +314,8 @@ void KMSender::doSendMsg()
         mCurrentMsg->addBodyPart( &msgPart );
       }
     }
-    mCurrentMsg->setStatus(KMMsgStatusSent);
-    mCurrentMsg->setStatus(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();
 
@@ -400,7 +400,7 @@ void KMSender::doSendMsg()
     default:
       break;
     }
-    setStatusByLink( mCurrentMsg );
+    seStatusByLink( mCurrentMsg );
     if (mCurrentMsg->parent() && !imapSentFolder) {
       // for speed optimization, this code assumes that mCurrentMsg is the
       // last one in it's parent folder; make sure that's really the case:
@@ -450,11 +450,11 @@ void KMSender::doSendMsg()
         sentFolder->close("sentFolder");
     if ( someSent ) {
       if ( mSentMessages == mTotalMessages ) {
-        setStatusMsg(i18n("%n queued message successfully sent.",
+        seStatusMsg(i18n("%n queued message successfully sent.",
                           "%n queued messages successfully sent.",
                           mSentMessages));
       } else {
-        setStatusMsg(i18n("%1 of %2 queued messages successfully sent.")
+        seStatusMsg(i18n("%1 of %2 queued messages successfully sent.")
             .arg(mSentMessages).arg( mTotalMessages ));
       }
     }
@@ -536,7 +536,7 @@ void KMSender::doSendMsg()
 }
 
 bool KMSender::runPrecommand( const TQString & cmd ) {
-  setStatusMsg( i18n("Executing precommand %1").arg( cmd ) );
+  seStatusMsg( i18n("Executing precommand %1").arg( cmd ) );
   mPrecommand = new KMPrecommand( cmd );
   connect( mPrecommand, TQT_SIGNAL(finished(bool)),
            TQT_SLOT(slotPrecommandFinished(bool)) );
@@ -554,7 +554,7 @@ void KMSender::sendProcStarted(bool success)
     if (mSendProc)
        mSendProc->finish();
     else
-      setStatusMsg(i18n("Unrecognized transport protocol. Unable to send message."));
+      seStatusMsg(i18n("Unrecognized transport protocol. Unable to send message."));
     mSendProc = 0;
     mSendProcStarted = false;
     cleanup();
@@ -595,7 +595,7 @@ void KMSender::doSendMsgAux()
 
   // start sending the current message
 
-  setStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3")
+  seStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3")
 	       .arg(mSentMessages+mFailedMessages+1).arg(mTotalMessages)
 	       .arg(mCurrentMsg->subject()));
   TQStringList to, cc, bcc;
@@ -614,7 +614,7 @@ void KMSender::doSendMsgAux()
       mOutboxFolder->unGetMsg( mFailedMessages );
     mCurrentMsg = 0;
     cleanup();
-    setStatusMsg(i18n("Failed to send (some) queued messages."));
+    seStatusMsg(i18n("Failed to send (some) queued messages."));
     return;
   }
   // Do *not* add code here, after send(). It can happen that this method
@@ -699,7 +699,7 @@ void KMSender::slotIdle()
       .arg(errString)
       .arg(mMethodStr);
     if (!errString.isEmpty()) KMessageBox::error(0,msg);
-    setStatusMsg( i18n( "Sending aborted." ) );
+    seStatusMsg( i18n( "Sending aborted." ) );
   } else {
     if (!mSendProc->sendOk()) {
       if ( mCurrentMsg )
@@ -744,7 +744,7 @@ void KMSender::slotIdle()
           doSendMsg();
           return;
         } else {
-          setStatusMsg( i18n( "Sending aborted." ) );
+          seStatusMsg( i18n( "Sending aborted." ) );
         }
       }
     } else {
@@ -845,7 +845,7 @@ KMSendProc* KMSender::createSendProcFromString( const TQString & transport )
 }
 
 //-----------------------------------------------------------------------------
-void KMSender::setStatusByLink(const KMMessage *aMsg)
+void KMSender::seStatusByLink(const KMMessage *aMsg)
 {
   int n = 0;
   while (1) {
@@ -867,7 +867,7 @@ void KMSender::setStatusByLink(const KMMessage *aMsg)
           new KMDeleteMsgCommand( folder, folder->getMsg( index ) );
         cmd->start();
       } else {
-        folder->setStatus(index, status);
+        folder->seStatus(index, status);
       }
     } else {
       kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl;
@@ -905,7 +905,7 @@ void KMSendProc::failed(const TQString &aMsg)
 //-----------------------------------------------------------------------------
 void KMSendProc::statusMsg(const TQString& aMsg)
 {
-  if (mSender) mSender->setStatusMsg(aMsg);
+  if (mSender) mSender->seStatusMsg(aMsg);
 }
 
 //=============================================================================
@@ -1019,7 +1019,7 @@ void KMSendSendmail::receivedStderr(KProcess *proc, char *buffer, int buflen)
 {
   assert(proc!=0);
   Q_UNUSED( proc );
-  mLastErrorMessage.replace(mLastErrorMessage.length(), buflen, buffer);
+  mLastErrorMessage.tqreplace(mLastErrorMessage.length(), buflen, buffer);
 }
 
 
@@ -1139,7 +1139,7 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const
   if ( mMessageLength )
     // allow +5% for subsequent LF->CRLF and dotstuffing (an average
     // over 2G-lines gives an average line length of 42-43):
-    query += "&size=" + TQString::number( qRound( mMessageLength * 1.05 ) );
+    query += "&size=" + TQString::number( tqRound( mMessageLength * 1.05 ) );
 
   destination.setPath("/send");
   destination.setQuery( query );
diff --git a/kmail/kmsender.h b/kmail/kmsender.h
index 9771e9924..600737fe4 100644
--- a/kmail/kmsender.h
+++ b/kmail/kmsender.h
@@ -104,10 +104,10 @@ public:
 
 private:
   /** sets a status msg and emits statusMsg() */
-  void setStatusMsg(const TQString&);
+  void seStatusMsg(const TQString&);
 
   /** sets replied/forwarded status in the linked message for @p aMsg. */
-  void setStatusByLink(const KMMessage *aMsg);
+  void seStatusByLink(const KMMessage *aMsg);
 
   /** Emit progress info - calculates a percent value based on the amount of bytes sent */
   void emitProgressInfo( int currentFileProgress );
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index f0a560e5c..9007fe1a5 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -200,8 +200,8 @@ void lockOrDie() {
                    "can cause the loss of mail. You should not start %1 "
                    "unless you are sure that it is not already running.")
               .arg( programName, programName );
-              // TQString::arg( st ) only replaces the first occurrence of %1
-              // with st while TQString::arg( s1, s2 ) replacess all occurrences
+              // TQString::arg( st ) only tqreplaces the first occurrence of %1
+              // with st while TQString::arg( s1, s2 ) tqreplacess all occurrences
               // of %1 with s1 and all occurrences of %2 with s2. So don't
               // even think about changing the above to .arg( programName ).
       else
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 8dc4eee94..f10faabe6 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -67,7 +67,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name)
     mNewMessagePopupId(-1),
     mPopupMenu(0)
 {
-  setAlignment( AlignCenter );
+  tqsetAlignment( 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->topLevelWidget();
+    TQWidget * mainWin = mainWidget->tqtopLevelWidget();
     if ( mainWin ) {
       mDesktopOfMainWin = KWin::windowInfo( mainWin->winId(),
                                             NET::WMDesktop ).desktop();
@@ -133,7 +133,7 @@ void KMSystemTray::buildPopupMenu()
     action->plug( mPopupMenu );
   mPopupMenu->insertSeparator();
 
-  KMainWindow *mainWin = ::qt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->topLevelWidget());
+  KMainWindow *mainWin = ::qt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->tqtopLevelWidget());
   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()->topLevelWidget();
+  TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget();
   if ( !mainWin )
     return false;
 
@@ -401,7 +401,7 @@ void KMSystemTray::showKMail()
 {
   if (!kmkernel->getKMMainWidget())
     return;
-  TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget();
+  TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget();
   assert(mainWin);
   if(mainWin)
   {
@@ -429,7 +429,7 @@ void KMSystemTray::hideKMail()
 {
   if (!kmkernel->getKMMainWidget())
     return;
-  TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget();
+  TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget();
   assert(mainWin);
   if(mainWin)
   {
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index a5bf6b9ce..dce1ccf07 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::fromLatin1("sendmail") )
+  if( transportInfo->type == TQString::tqfromLatin1("sendmail") )
   {
     makeSendmailPage();
   } else {
@@ -479,7 +479,7 @@ void KMTransportDialog::makeSmtpPage()
                        "a custom hostname when identifying itself "
                        "to the mail server."
                        "<p>This is useful when your system's hostname "
-                       "may not be set correctly or to mask your "
+                       "may not be set correctly or to tqmask your "
                        "system's true hostname."));
 
   mSmtp.localHostnameLabel = new TQLabel( i18n("Hos&tname:"), page1 );
@@ -522,7 +522,7 @@ void KMTransportDialog::makeSmtpPage()
   mSmtp.authDigestMd5 = new TQRadioButton( i18n("&DIGEST-MD5"), mSmtp.authGroup );
   mSmtp.authNTLM = new TQRadioButton( i18n("&NTLM"), mSmtp.authGroup );
   mSmtp.authGSSAPI = new TQRadioButton( i18n("&GSSAPI"), mSmtp.authGroup );
-  if ( KProtocolInfo::capabilities("smtp").contains("SASL") == 0 ) {
+  if ( KProtocolInfo::capabilities("smtp").tqcontains("SASL") == 0 ) {
     mSmtp.authNTLM->hide();
     mSmtp.authGSSAPI->hide();
   }
diff --git a/kmail/korghelper.cpp b/kmail/korghelper.cpp
index 789d85ea7..adec13992 100644
--- a/kmail/korghelper.cpp
+++ b/kmail/korghelper.cpp
@@ -29,18 +29,18 @@ void KMail::KorgHelper::ensureRunning()
 {
   TQString error;
   TQCString dcopService;
-  int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService );
+  int result = KDCOPServiceStarter::self()->tqfindServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService );
   if ( result == 0 ) {
     // OK, so korganizer (or kontact) is running. Now ensure the object we want is available
     // [that's not the case when kontact was already running, but korganizer not loaded into it...]
     static const char* const dcopObjectId = "KOrganizerIface";
     TQCString dummy;
-    if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+    if ( !kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
       DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper
       DCOPReply reply = ref.call( "load()" );
       if ( reply.isValid() && (bool)reply ) {
         kdDebug() << "Loaded " << dcopService << " successfully" << endl;
-        Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+        Q_ASSERT( kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
       } else
         kdWarning() << "Error loading " << dcopService << endl;
     }
diff --git a/kmail/kwindowpositioner.cpp b/kmail/kwindowpositioner.cpp
index fefbdde2c..4fb399479 100644
--- a/kmail/kwindowpositioner.cpp
+++ b/kmail/kwindowpositioner.cpp
@@ -29,7 +29,7 @@ KWindowPositioner::KWindowPositioner( TQWidget *master, TQWidget *slave,
   Mode mode )
   : TQObject( master ), mMaster( master ), mSlave( slave ), mMode( mode )
 {
-  master->topLevelWidget()->installEventFilter( this );
+  master->tqtopLevelWidget()->installEventFilter( this );
 }
 
 bool KWindowPositioner::eventFilter( TQObject *, TQEvent *e )
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index f51a04eec..07d118b22 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -118,7 +118,7 @@ void ListJob::execute()
         i18n("retrieving folders"),
         false,
         mAccount->useSSL() || mAccount->useTLS() );
-    mParentProgressItem->setStatus( escapedStatus );
+    mParentProgressItem->seStatus( escapedStatus );
   }
 
   // make the URL
diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp
index 0816ba40a..a020fa57b 100644
--- a/kmail/localsubscriptiondialog.cpp
+++ b/kmail/localsubscriptiondialog.cpp
@@ -72,7 +72,7 @@ void LocalSubscriptionDialog::processFolderListing()
   uint done = 0;
   for (uint i = mCount; i < mFolderNames.count(); ++i)
   {
-    // give the dialog a chance to repaint
+    // give the dialog a chance to tqrepaint
     if (done == 1000)
     {
       emit listChanged();
diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp
index 8a9487b06..525faf3df 100644
--- a/kmail/mailinglistpropertiesdialog.cpp
+++ b/kmail/mailinglistpropertiesdialog.cpp
@@ -55,12 +55,12 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
   TQLabel* label;
   mLastItem = 0;
 
-  TQVBoxLayout *topLayout = new TQVBoxLayout( layout(), spacingHint(),
+  TQVBoxLayout *topLayout = new TQVBoxLayout( tqlayout(), spacingHint(),
                                             "topLayout" );
 
   TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this );
   mlGroup->setColumnLayout( 0,  Qt::Vertical );
-  TQGridLayout *groupLayout = new TQGridLayout( mlGroup->layout(), 6, 3, spacingHint() );
+  TQGridLayout *groupLayout = new TQGridLayout( mlGroup->tqlayout(), 6, 3, spacingHint() );
   topLayout->addWidget( mlGroup );
   setMainWidget( mlGroup );
 
@@ -144,7 +144,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
                     TQT_SLOT(slotAddressChanged(int)) );
 
   load();
-  resize( TQSize(295, 204).expandedTo(minimumSizeHint()) );
+  resize( TQSize(295, 204).expandedTo(tqminimumSizeHint()) );
   clearWState( WState_Polished );
 }
 
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index 3bec71323..dc8e42f44 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 * sizeHint().width(), sizeHint().height() );
+  resize( 2 * tqsizeHint().width(), tqsizeHint().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 * sizeHint() );
+  resize( 3 * tqsizeHint() );
 }
 
 KMail::SieveEditor::~SieveEditor() {}
diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index cc5431954..c1f569925 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -124,13 +124,13 @@ void MessageActions::setCurrentMessage(KMMessage * msg)
   updateActions();
 }
 
-void MessageActions::setSelectedSernums(const TQValueList< Q_UINT32 > & sernums)
+void MessageActions::setSelectedSernums(const TQValueList< TQ_UINT32 > & sernums)
 {
   mSelectedSernums = sernums;
   updateActions();
 }
 
-void MessageActions::setSelectedVisibleSernums(const TQValueList< Q_UINT32 > & sernums)
+void MessageActions::setSelectedVisibleSernums(const TQValueList< TQ_UINT32 > & sernums)
 {
   mVisibleSernums = sernums;
   updateActions();
@@ -248,12 +248,12 @@ void MessageActions::slotSetMsgStatusTodo()
 
 void MessageActions::setMessageStatus( KMMsgStatus status, bool toggle )
 {
-  TQValueList<Q_UINT32> serNums = mVisibleSernums;
+  TQValueList<TQ_UINT32> serNums = mVisibleSernums;
   if ( serNums.isEmpty() && mCurrentMessage )
     serNums.append( mCurrentMessage->getMsgSerNum() );
   if ( serNums.empty() )
     return;
-  KMCommand *command = new KMSetStatusCommand( status, serNums, toggle );
+  KMCommand *command = new KMSeStatusCommand( status, serNums, toggle );
   command->start();
 }
 
diff --git a/kmail/messageactions.h b/kmail/messageactions.h
index 41279c552..fe040c2cf 100644
--- a/kmail/messageactions.h
+++ b/kmail/messageactions.h
@@ -44,8 +44,8 @@ class MessageActions : public QObject
     void setMessageView( KMReaderWin *msgView );
 
     void setCurrentMessage( KMMessage *msg );
-    void setSelectedSernums( const TQValueList<Q_UINT32> &sernums );
-    void setSelectedVisibleSernums( const TQValueList<Q_UINT32> &sernums );
+    void setSelectedSernums( const TQValueList<TQ_UINT32> &sernums );
+    void setSelectedVisibleSernums( const TQValueList<TQ_UINT32> &sernums );
 
     KActionMenu* replyMenu() const { return mReplyActionMenu; }
     KAction* replyListAction() const { return mReplyListAction; }
@@ -88,8 +88,8 @@ class MessageActions : public QObject
     TQWidget *mParent;
     KActionCollection *mActionCollection;
     KMMessage* mCurrentMessage;
-    TQValueList<Q_UINT32> mSelectedSernums;
-    TQValueList<Q_UINT32> mVisibleSernums;
+    TQValueList<TQ_UINT32> mSelectedSernums;
+    TQValueList<TQ_UINT32> mVisibleSernums;
     KMReaderWin *mMessageView;
 
     KActionMenu *mReplyActionMenu;
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index 8b3f1c5c4..2ff7cd6a0 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -1000,7 +1000,7 @@ void MessageComposer::composeMessage()
 }
 
 //
-// These are replacements for StructuringInfo(Wrapper):
+// These are tqreplacements for StructuringInfo(Wrapper):
 //
 
 // check whether to use multipart/{signed,encrypted}
@@ -1137,7 +1137,7 @@ static inline GpgME::Context::SignatureMode signingMode( Kleo::CryptoMessageForm
 }
 
 //
-// END replacements for StructuringInfo(Wrapper)
+// END tqreplacements for StructuringInfo(Wrapper)
 //
 
 class EncryptMessageJob : public MessageComposerJob {
@@ -1600,7 +1600,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage,
       }
     }
 
-    // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
+    // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs
     // according to RfC 2633, 3.1.1 Canonicalization
     //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
     mEncodedBody = KMail::Util::lf2crlf( mEncodedBody );
@@ -1700,7 +1700,7 @@ void MessageComposer::encryptMessage( KMMessage* msg,
     }
 
     // now do the encrypting:
-    // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
+    // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs
     // according to RfC 2633, 3.1.1 Canonicalization
     //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
     innerContent = KMail::Util::lf2crlf( innerContent );
@@ -1792,7 +1792,7 @@ void MessageComposer::addBodyAndAttachments( KMMessage* msg,
       delete innerDwPart;
       innerDwPart = 0;
 
-      // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
+      // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs
       // according to RfC 2633, 3.1.1 Canonicalization
       //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
       encodedAttachment = KMail::Util::lf2crlf( encodedAttachment );
@@ -1928,7 +1928,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL,
     const TQCString boundaryCStr = KMime::multiPartBoundary();
     // add "boundary" parameter
     if ( makeMultiMime( format, signing ) )
-      mainHeader.replace( "%boundary", boundaryCStr );
+      mainHeader.tqreplace( "%boundary", boundaryCStr );
 
     if ( toplevelCT ) {
       if ( const char * str = toplevelContentDisposition( format, signing ) ) {
@@ -2092,7 +2092,7 @@ TQByteArray MessageComposer::breakLinesAndApplyCodec()
 
   if( mCharset == "us-ascii" ) {
     cText = KMMsgBase::toUsAscii( text );
-    newText = TQString::fromLatin1( cText );
+    newText = TQString::tqfromLatin1( 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/messagecopyhelper.cpp b/kmail/messagecopyhelper.cpp
index e0a27fc35..4d9983308 100644
--- a/kmail/messagecopyhelper.cpp
+++ b/kmail/messagecopyhelper.cpp
@@ -26,7 +26,7 @@
 using namespace KMail;
 using namespace KPIM;
 
-MessageCopyHelper::MessageCopyHelper( const TQValueList< Q_UINT32 > & msgs,
+MessageCopyHelper::MessageCopyHelper( const TQValueList< TQ_UINT32 > & msgs,
                                       KMFolder * dest, bool move, TQObject * parent ) :
     TQObject( parent )
 {
@@ -37,13 +37,13 @@ MessageCopyHelper::MessageCopyHelper( const TQValueList< Q_UINT32 > & msgs,
   int index;
   TQPtrList<KMMsgBase> list;
 
-  for ( TQValueList<Q_UINT32>::ConstIterator it = msgs.constBegin(); it != msgs.constEnd(); ++it ) {
+  for ( TQValueList<TQ_UINT32>::ConstIterator it = msgs.constBegin(); it != msgs.constEnd(); ++it ) {
     KMMsgDict::instance()->getLocation( *it, &f, &index );
     if ( !f ) // not found
       continue;
     if ( f == dest )
       continue; // already there
-    if ( !mOpenFolders.contains( f ) ) {// not yet opened
+    if ( !mOpenFolders.tqcontains( f ) ) {// not yet opened
       f->open( "messagecopyhelper" );
       mOpenFolders.insert( f, 0 );
     }
@@ -79,17 +79,17 @@ void MessageCopyHelper::copyCompleted(KMCommand * cmd)
   deleteLater();
 }
 
-TQValueList< Q_UINT32 > MessageCopyHelper::serNumListFromMailList(const KPIM::MailList & list)
+TQValueList< TQ_UINT32 > MessageCopyHelper::serNumListFromMailList(const KPIM::MailList & list)
 {
-  TQValueList<Q_UINT32> rv;
+  TQValueList<TQ_UINT32> rv;
   for ( MailList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it )
     rv.append( (*it).serialNumber() );
   return rv;
 }
 
-TQValueList< Q_UINT32 > MessageCopyHelper::serNumListFromMsgList(TQPtrList< KMMsgBase > list)
+TQValueList< TQ_UINT32 > MessageCopyHelper::serNumListFromMsgList(TQPtrList< KMMsgBase > list)
 {
-  TQValueList<Q_UINT32> rv;
+  TQValueList<TQ_UINT32> rv;
   KMMsgBase* msg = list.first();
   while( msg ) {
     rv.append( msg->getMsgSerNum() );
@@ -98,11 +98,11 @@ TQValueList< Q_UINT32 > MessageCopyHelper::serNumListFromMsgList(TQPtrList< KMMs
   return rv;
 }
 
-bool MessageCopyHelper::inReadOnlyFolder(const TQValueList< Q_UINT32 > & sernums)
+bool MessageCopyHelper::inReadOnlyFolder(const TQValueList< TQ_UINT32 > & sernums)
 {
   KMFolder *f = 0;
   int index;
-  for ( TQValueList<Q_UINT32>::ConstIterator it = sernums.begin(); it != sernums.end(); ++it ) {
+  for ( TQValueList<TQ_UINT32>::ConstIterator it = sernums.begin(); it != sernums.end(); ++it ) {
     KMMsgDict::instance()->getLocation( *it, &f, &index );
     if ( !f ) // not found
       continue;
diff --git a/kmail/messagecopyhelper.h b/kmail/messagecopyhelper.h
index 22a718dc6..419382cf8 100644
--- a/kmail/messagecopyhelper.h
+++ b/kmail/messagecopyhelper.h
@@ -49,23 +49,23 @@ class MessageCopyHelper : public QObject
       @param move If set to true, messages will be moved instead of copied
       @param parent The parent object.
     */
-    MessageCopyHelper( const TQValueList<Q_UINT32> &msgs, KMFolder *dest,
+    MessageCopyHelper( const TQValueList<TQ_UINT32> &msgs, KMFolder *dest,
                        bool move, TQObject *parent = 0 );
 
     /**
       Converts a MailList into a serial number list.
     */
-    static TQValueList<Q_UINT32> serNumListFromMailList( const KPIM::MailList &list );
+    static TQValueList<TQ_UINT32> serNumListFromMailList( const KPIM::MailList &list );
 
     /**
       Converts a KMMsgsBase* list into a serial number list.
     */
-    static TQValueList<Q_UINT32> serNumListFromMsgList( TQPtrList<KMMsgBase> list );
+    static TQValueList<TQ_UINT32> serNumListFromMsgList( TQPtrList<KMMsgBase> list );
 
     /**
       Checks of any of the given messages comes from a read-only source.
     */
-    static bool inReadOnlyFolder( const TQValueList<Q_UINT32> &sernums );
+    static bool inReadOnlyFolder( const TQValueList<TQ_UINT32> &sernums );
 
   private slots:
     void copyCompleted( KMCommand *cmd );
diff --git a/kmail/messageproperty.cpp b/kmail/messageproperty.cpp
index b1e02161b..e9897cd64 100644
--- a/kmail/messageproperty.cpp
+++ b/kmail/messageproperty.cpp
@@ -35,21 +35,21 @@
 #include "messageproperty.h"
 using namespace KMail;
 
-TQMap<Q_UINT32, TQGuardedPtr<KMFolder> > MessageProperty::sFolders;
-TQMap<Q_UINT32, TQGuardedPtr<ActionScheduler> > MessageProperty::sHandlers;
-TQMap<Q_UINT32, int > MessageProperty::sTransfers;
+TQMap<TQ_UINT32, TQGuardedPtr<KMFolder> > MessageProperty::sFolders;
+TQMap<TQ_UINT32, TQGuardedPtr<ActionScheduler> > MessageProperty::sHandlers;
+TQMap<TQ_UINT32, int > MessageProperty::sTransfers;
 TQMap<const KMMsgBase*, long > MessageProperty::sSerialCache;
 
-bool MessageProperty::filtering( Q_UINT32 serNum )
+bool MessageProperty::filtering( TQ_UINT32 serNum )
 {
-  return sFolders.contains( serNum );
+  return sFolders.tqcontains( serNum );
 }
 
-void MessageProperty::setFiltering( Q_UINT32 serNum, bool filter )
+void MessageProperty::setFiltering( TQ_UINT32 serNum, bool filter )
 {
   assert(!filtering(serNum) || !filter);
   if (filter && !filtering(serNum))
-    sFolders.replace(serNum, TQGuardedPtr<KMFolder>(0) );
+    sFolders.tqreplace(serNum, TQGuardedPtr<KMFolder>(0) );
   else if (!filter)
     sFolders.remove(serNum);
 }
@@ -64,13 +64,13 @@ void MessageProperty::setFiltering( const KMMsgBase *msgBase, bool filter )
   setFiltering( msgBase->getMsgSerNum(), filter );
 }
 
-KMFolder* MessageProperty::filterFolder( Q_UINT32 serNum )
+KMFolder* MessageProperty::filterFolder( TQ_UINT32 serNum )
 {
-  TQMap<Q_UINT32, TQGuardedPtr<KMFolder> >::const_iterator it = sFolders.find( serNum );
+  TQMap<TQ_UINT32, TQGuardedPtr<KMFolder> >::const_iterator it = sFolders.find( serNum );
   return it == sFolders.constEnd() ? 0 : (*it).operator->();
 }
 
-void MessageProperty::setFilterFolder( Q_UINT32 serNum, KMFolder* folder )
+void MessageProperty::setFilterFolder( TQ_UINT32 serNum, KMFolder* folder )
 {
   sFolders.insert(serNum, TQGuardedPtr<KMFolder>(folder) );
 }
@@ -85,13 +85,13 @@ void MessageProperty::setFilterFolder( const KMMsgBase *msgBase, KMFolder* folde
   setFilterFolder( msgBase->getMsgSerNum(), folder );
 }
 
-ActionScheduler* MessageProperty::filterHandler( Q_UINT32 serNum )
+ActionScheduler* MessageProperty::filterHandler( TQ_UINT32 serNum )
 {
-  TQMap<Q_UINT32, TQGuardedPtr<ActionScheduler> >::const_iterator it = sHandlers.find( serNum );
+  TQMap<TQ_UINT32, TQGuardedPtr<ActionScheduler> >::const_iterator it = sHandlers.find( serNum );
   return it == sHandlers.constEnd() ? 0 : (*it).operator->();
 }
 
-void MessageProperty::setFilterHandler( Q_UINT32 serNum, ActionScheduler* handler )
+void MessageProperty::setFilterHandler( TQ_UINT32 serNum, ActionScheduler* handler )
 {
   if (handler)
     sHandlers.insert( serNum, TQGuardedPtr<ActionScheduler>(handler) );
@@ -109,16 +109,16 @@ void MessageProperty::setFilterHandler( const KMMsgBase *msgBase, ActionSchedule
   setFilterHandler( msgBase->getMsgSerNum(), handler );
 }
 
-bool MessageProperty::transferInProgress( Q_UINT32 serNum )
+bool MessageProperty::transferInProgress( TQ_UINT32 serNum )
 {
-  TQMap<Q_UINT32, int >::const_iterator it = sTransfers.find( serNum );
+  TQMap<TQ_UINT32, int >::const_iterator it = sTransfers.find( serNum );
   return it == sTransfers.constEnd() ? false : *it;
 }
 
-void MessageProperty::setTransferInProgress( Q_UINT32 serNum, bool transfer, bool force )
+void MessageProperty::setTransferInProgress( TQ_UINT32 serNum, bool transfer, bool force )
 {
   int transferInProgress = 0;
-  TQMap<Q_UINT32, int >::const_iterator it = sTransfers.find( serNum );
+  TQMap<TQ_UINT32, int >::const_iterator it = sTransfers.find( serNum );
   if (it != sTransfers.constEnd())
     transferInProgress = *it;
   if ( force && !transfer )
@@ -143,13 +143,13 @@ void MessageProperty::setTransferInProgress( const KMMsgBase *msgBase, bool tran
   setTransferInProgress( msgBase->getMsgSerNum(), transfer, force );
 }
 
-Q_UINT32 MessageProperty::serialCache( const KMMsgBase *msgBase )
+TQ_UINT32 MessageProperty::serialCache( const KMMsgBase *msgBase )
 {
   TQMap<const KMMsgBase*, long >::const_iterator it = sSerialCache.find( msgBase );
   return it == sSerialCache.constEnd() ? 0 : *it;
 }
 
-void MessageProperty::setSerialCache( const KMMsgBase *msgBase, Q_UINT32 serNum )
+void MessageProperty::setSerialCache( const KMMsgBase *msgBase, TQ_UINT32 serNum )
 {
   if (serNum)
     sSerialCache.insert( msgBase, serNum );
@@ -159,7 +159,7 @@ void MessageProperty::setSerialCache( const KMMsgBase *msgBase, Q_UINT32 serNum
 
 void MessageProperty::forget( const KMMsgBase *msgBase )
 {
-  Q_UINT32 serNum = serialCache( msgBase );
+  TQ_UINT32 serNum = serialCache( msgBase );
   if (serNum) {
     Q_ASSERT( !transferInProgress( serNum ) );
     sTransfers.remove( serNum );
diff --git a/kmail/messageproperty.h b/kmail/messageproperty.h
index 91168e6f3..0dd3f3b2d 100644
--- a/kmail/messageproperty.h
+++ b/kmail/messageproperty.h
@@ -60,20 +60,20 @@ class MessageProperty : public QObject
 
 public:
   /** If the message is being filtered  */
-  static bool filtering( Q_UINT32 );
-  static void setFiltering( Q_UINT32, bool filtering );
+  static bool filtering( TQ_UINT32 );
+  static void setFiltering( TQ_UINT32, bool filtering );
   static bool filtering( const KMMsgBase* );
   static void setFiltering( const KMMsgBase*, bool filtering );
   /** The folder this message is to be moved into once
       filtering is finished, or null if the message is not
       scheduled to be moved */
-  static KMFolder* filterFolder( Q_UINT32 );
-  static void setFilterFolder( Q_UINT32, KMFolder* folder );
+  static KMFolder* filterFolder( TQ_UINT32 );
+  static void setFilterFolder( TQ_UINT32, KMFolder* folder );
   static KMFolder* filterFolder( const KMMsgBase* );
   static void setFilterFolder( const KMMsgBase*, KMFolder* folder );
   /* Set the filterHandler for a message */
-  static ActionScheduler* filterHandler( Q_UINT32 );
-  static void setFilterHandler( Q_UINT32, ActionScheduler* filterHandler );
+  static ActionScheduler* filterHandler( TQ_UINT32 );
+  static void setFilterHandler( TQ_UINT32, ActionScheduler* filterHandler );
   static ActionScheduler* filterHandler( const KMMsgBase* );
   static void setFilterHandler( const KMMsgBase*, ActionScheduler* filterHandler );
 
@@ -81,16 +81,16 @@ public:
      KMMsgBase based instance representing a message.
      This property becomes invalid when the message is destructed or
      assigned a new value */
-  static void setSerialCache( const KMMsgBase*, Q_UINT32 );
-  static Q_UINT32 serialCache( const KMMsgBase* );
+  static void setSerialCache( const KMMsgBase*, TQ_UINT32 );
+  static TQ_UINT32 serialCache( const KMMsgBase* );
 
   /* Set the transferInProgress for a message
      This property becomes invalid when the message is destructed or
      assigned a new value */
   static void setTransferInProgress( const KMMsgBase*, bool, bool = false );
   static bool transferInProgress( const KMMsgBase* );
-  static void setTransferInProgress( Q_UINT32, bool, bool = false );
-  static bool transferInProgress( Q_UINT32 );
+  static void setTransferInProgress( TQ_UINT32, bool, bool = false );
+  static bool transferInProgress( TQ_UINT32 );
 
   /** Some properties, namely complete, transferInProgress, and
       serialCache must be forgotten when a message class instance is
@@ -99,13 +99,13 @@ public:
 
 private:
   // The folder a message is to be moved into once filtering is finished if any
-  static TQMap<Q_UINT32, TQGuardedPtr<KMFolder> > sFolders;
+  static TQMap<TQ_UINT32, TQGuardedPtr<KMFolder> > sFolders;
 
   // The action scheduler currently processing a message if any
-  static TQMap<Q_UINT32, TQGuardedPtr<ActionScheduler> > sHandlers;
+  static TQMap<TQ_UINT32, TQGuardedPtr<ActionScheduler> > sHandlers;
 
   // The transferInProgres state of a message if any.
-  static TQMap<Q_UINT32, int > sTransfers;
+  static TQMap<TQ_UINT32, int > sTransfers;
 
   // The cached serial number of a message if any.
   static TQMap<const KMMsgBase*, long > sSerialCache;
diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp
index 99051222e..acd5b3321 100644
--- a/kmail/newfolderdialog.cpp
+++ b/kmail/newfolderdialog.cpp
@@ -121,7 +121,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
     mContentsHBox = new TQHBoxLayout( 0, 0, 6, "mContentsHBox");
 
     mContentsLabel = new TQLabel( privateLayoutWidget, "mContentsLabel" );
-    mContentsLabel->setText( i18n( "Folder &contains:" ) );
+    mContentsLabel->setText( i18n( "Folder &tqcontains:" ) );
     mContentsHBox->addWidget( mContentsLabel );
 
     mContentsComboBox = new TQComboBox( false, privateLayoutWidget, "mContentsComboBox" );
@@ -176,7 +176,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
     }
   }
 
-  resize( TQSize(282, 108).expandedTo(minimumSizeHint()) );
+  resize( TQSize(282, 108).expandedTo(tqminimumSizeHint()) );
   clearWState( WState_Polished );
   slotFolderNameChanged( mNameLineEdit->text());
 }
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index d8b98f24d..132dc058e 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -272,7 +272,7 @@ namespace KMail {
       ProcessResult processResult;
 
       if ( mReader ) {
-        htmlWriter()->queue( TQString::fromLatin1("<a name=\"att%1\"/>").arg( node->nodeId() ) );
+        htmlWriter()->queue( TQString::tqfromLatin1("<a name=\"att%1\"/>").arg( node->nodeId() ) );
       }
 
       if ( const Interface::BodyPartFormatter * formatter
@@ -461,7 +461,7 @@ namespace KMail {
         dumpToFile( "dat_01_reader_signedtext_before_canonicalization",
                     cleartext.data(), cleartext.length() );
 
-        // replace simple LFs by CRLSs
+        // tqreplace simple LFs by CRLSs
         // according to RfC 2633, 3.1.1 Canonicalization
         //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
         cleartext = Util::lf2crlf( cleartext );
@@ -829,7 +829,7 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
     if ( mReader )
       emit mReader->noDrag(); // in case pineentry pops up, don't let kmheaders start a drag afterwards
 
-    // Check whether the memento contains a result from last time:
+    // Check whether the memento tqcontains a result from last time:
     const DecryptVerifyBodyPartMemento * m
       = dynamic_cast<DecryptVerifyBodyPartMemento*>( data.bodyPartMemento( "decryptverify" ) );
     if ( !m ) {
@@ -936,7 +936,7 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
 }
 
   //static
-  bool ObjectTreeParser::containsExternalReferences( const TQCString & str )
+  bool ObjectTreeParser::tqcontainsExternalReferences( const TQCString & str )
   {
     TQRegExp httpRegExp("(\\\"|\\\'|url\\s*\\(\\s*)http[s]?:");
     int httpPos = str.find( httpRegExp, 0 );
@@ -990,12 +990,12 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
         // ---Sven's strip </BODY> and </HTML> from end of attachment end-
         // Show the "external references" warning (with possibility to load
         // external references only if loading external references is disabled
-        // and the HTML code contains obvious external references). For
+        // and the HTML code tqcontains obvious external references). For
         // messages where the external references are obfuscated the user won't
         // have an easy way to load them but that shouldn't be a problem
-        // because only spam contains obfuscated external references.
+        // because only spam tqcontains obfuscated external references.
         if ( !mReader->htmlLoadExternal() &&
-             containsExternalReferences( cstr ) ) {
+             tqcontainsExternalReferences( cstr ) ) {
           htmlWriter()->queue( "<div class=\"htmlWarn\">\n" );
           htmlWriter()->queue( i18n("<b>Note:</b> This HTML message may contain external "
                                     "references to images etc. For security/privacy reasons "
@@ -1357,7 +1357,7 @@ namespace KMail {
     const Kleo::CryptoBackend::Protocol * useThisCryptProto = 0;
 
     /*
-      ATTENTION: This code is to be replaced by the new 'auto-detect' feature. --------------------------------------
+      ATTENTION: This code is to be tqreplaced by the new 'auto-detect' feature. --------------------------------------
     */
     partNode * data = child->findType( DwMime::kTypeApplication,
                                        DwMime::kSubtypeOctetStream, false, true );
@@ -1559,7 +1559,7 @@ namespace KMail {
         writeDeferredDecryptionBlock();
       } else {
         /*
-          ATTENTION: This code is to be replaced by the planned 'auto-detect' feature.
+          ATTENTION: This code is to be tqreplaced by the planned 'auto-detect' feature.
         */
         PartMetaData messagePart;
         setCryptoProtocol( Kleo::CryptoBackendFactory::instance()->openpgp() );
@@ -2795,7 +2795,7 @@ void ObjectTreeParser::writeBodyStr( const TQCString& aStr, const TQTextCodec *a
   bool goodSignature = false;
   Kpgp::Module* pgp = Kpgp::Module::getKpgp();
   assert(pgp != 0);
-  bool isPgpMessage = false; // true if the message contains at least one
+  bool isPgpMessage = false; // true if the message tqcontains at least one
                              // PGP MESSAGE or one PGP SIGNED MESSAGE block
   TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
   TQString headerStr = TQString("<div dir=\"%1\">").arg(dir);
@@ -3083,7 +3083,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
     {
       // don't write empty <div ...></div> blocks (they have zero height)
       // ignore ^M DOS linebreaks
-      if( !line.replace('\015', "").isEmpty() )
+      if( !line.tqreplace('\015', "").isEmpty() )
       {
          htmlStr +=TQString( "<div dir=\"%1\">" ).arg( line.isRightToLeft() ? "rtl":"ltr" );
          htmlStr += LinkLocator::convertToHtml( line, convertFlags );
diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h
index ad980edaf..5cfe1d0e7 100644
--- a/kmail/objecttreeparser.h
+++ b/kmail/objecttreeparser.h
@@ -151,7 +151,7 @@ namespace KMail {
       mIncludeSignatures = include;
     }
 
-    // Controls whether Toltec invitations are displayed in their raw form or as a replacement text,
+    // Controls whether Toltec invitations are displayed in their raw form or as a tqreplacement text,
     // which is used in processToltecMail().
     void setShowRawToltecMail( bool showRawToltecMail ) { mShowRawToltecMail = showRawToltecMail; }
     bool showRawToltecMail() const { return mShowRawToltecMail; }
@@ -171,7 +171,7 @@ namespace KMail {
     /** Parse beginning at a given node and recursively parsing
         the children of that node and it's next sibling. */
     //  Function is called internally by "parseMsg(KMMessage* msg)"
-    //  and it will be replaced once KMime is alive.
+    //  and it will be tqreplaced once KMime is alive.
     void parseObjectTree( partNode * node );
 
   private:
@@ -193,7 +193,7 @@ namespace KMail {
      *                            Setting this to false is useful for encapsulated messages, as we
      *                            do not want the text in those to appear in the editor
      */
-    //  Function will be replaced once KMime is alive.
+    //  Function will be tqreplaced once KMime is alive.
     void insertAndParseNewChildNode( partNode & node,
                                      const char * content,
                                      const char * cntDesc,
@@ -252,11 +252,11 @@ namespace KMail {
      */
     bool processToltecMail( partNode * node );
 
-    /** Checks whether @p str contains external references. To be precise,
-        we only check whether @p str contains 'xxx="http[s]:' where xxx is
+    /** Checks whether @p str tqcontains external references. To be precise,
+        we only check whether @p str tqcontains 'xxx="http[s]:' where xxx is
         not href. Obfuscated external references are ignored on purpose.
     */
-    static bool containsExternalReferences( const TQCString & str );
+    static bool tqcontainsExternalReferences( const TQCString & str );
 
   public:// (during refactoring)
 
diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp
index a645b3989..947c76ae3 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::fromLatin1( m_vr.signature( 0 ).fingerprint() ) );
+  return TQStringList( TQString::tqfromLatin1( 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::fromLatin1( m_vr.signature( 0 ).fingerprint() ) );
+  return TQStringList( TQString::tqfromLatin1( m_vr.signature( 0 ).fingerprint() ) );
 }
 
 void VerifyOpaqueBodyPartMemento::saveResult( const VerificationResult & vr,
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index dbd5442ca..b75c54e42 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -50,7 +50,7 @@
 
 
   ===========================================================================
-  N O T E :   The partNode structure will most likely be replaced by KMime.
+  N O T E :   The partNode structure will most likely be tqreplaced by KMime.
   It's purpose: Speed optimization for KDE 3.   (khz, 28.11.01)
   ===========================================================================
 */
@@ -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::fromLatin1( param->Value().data(), param->Value().size() );
+      return TQString::tqfromLatin1( param->Value().data(), param->Value().size() );
     // warning: misses rfc2231 handling!
   }
   return TQString::null;
@@ -516,7 +516,7 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem,
         cntSize = size;
     }
     // remove linebreak+whitespace from folded Content-Description
-    cntDesc.replace( TQRegExp("\\n\\s*"), " " );
+    cntDesc.tqreplace( TQRegExp("\\n\\s*"), " " );
 
     if( parentItem )
       mMimePartTreeItem = new KMMimePartTreeItem( parentItem,
diff --git a/kmail/partNode.h b/kmail/partNode.h
index ddc76aa62..6459a0a68 100644
--- a/kmail/partNode.h
+++ b/kmail/partNode.h
@@ -60,7 +60,7 @@ class KMReaderWin;
 
 
  ===========================================================================
-  N O T E :   The partNode structure will most likely be replaced by KMime.
+  N O T E :   The partNode structure will most likely be tqreplaced by KMime.
               It's purpose: Speed optimization for KDE 3.   (khz, 28.11.01)
  ===========================================================================
 */
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index 94dbf8a5e..7bb830bc0 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -27,7 +27,7 @@
 #include "popaccount.h"
 
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 #include "kmfoldermgr.h"
 #include "kmfiltermgr.h"
@@ -514,13 +514,13 @@ void PopAccount::slotJobFinished() {
                                                      mUidForIdMap[hids.key()],
                                                      Later));//TODO
             //set Action if already known
-            if( mHeaderDeleteUids.contains( headersOnServer.current()->uid() ) ) {
+            if( mHeaderDeleteUids.tqcontains( headersOnServer.current()->uid() ) ) {
               headersOnServer.current()->setAction(Delete);
             }
-            else if( mHeaderDownUids.contains( headersOnServer.current()->uid() ) ) {
+            else if( mHeaderDownUids.tqcontains( headersOnServer.current()->uid() ) ) {
               headersOnServer.current()->setAction(Down);
             }
-            else if( mHeaderLaterUids.contains( headersOnServer.current()->uid() ) ) {
+            else if( mHeaderLaterUids.tqcontains( headersOnServer.current()->uid() ) ) {
               headersOnServer.current()->setAction(Later);
             }
           }
@@ -625,7 +625,7 @@ void PopAccount::slotJobFinished() {
           headersOnServer.current()->action() == Later) {
         //remove entries from the lists when the mails should not be downloaded
         //(deleted or downloaded later)
-        if ( mMsgsPendingDownload.contains( headersOnServer.current()->id() ) ) {
+        if ( mMsgsPendingDownload.tqcontains( headersOnServer.current()->id() ) ) {
           mMsgsPendingDownload.remove( headersOnServer.current()->id() );
         }
         if (headersOnServer.current()->action() == Delete) {
@@ -747,7 +747,7 @@ void PopAccount::slotJobFinished() {
     if ( !idsOfMsgsToDelete.isEmpty() ) {
       stage = Dele;
       if ( mMailCheckProgressItem )
-        mMailCheckProgressItem->setStatus(
+        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->setStatus(
+        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->setStatus(
+      mMailCheckProgressItem->seStatus(
         i18n( "Fetched 1 message from %1. Terminating transmission...",
               "Fetched %n messages from %1. Terminating transmission...",
               numMsgs )
@@ -798,7 +798,7 @@ void PopAccount::slotJobFinished() {
     if( mMailCheckProgressItem ) { // do this only once...
       bool canceled = !kmkernel || kmkernel->mailCheckAborted() || mMailCheckProgressItem->canceled();
       int numMessages = canceled ? indexOfCurrentMsg : idsOfMsgs.count();
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
         this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, mLeaveOnServer, mMailCheckProgressItem );
       // set mMailCheckProgressItem = 0 before calling setComplete() to prevent
       // a race condition
@@ -913,7 +913,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
           .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
           .arg(numBytesToRead/1024).arg(mLogin).arg(mHost);
       }
-      mMailCheckProgressItem->setStatus( 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
@@ -990,7 +990,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
     *size = mMsgsPendingDownload[id];
     mSizeOfNextSeenMsgsDict.insert( uid, size );
     if ( mUidsOfSeenMsgsDict.find( uid ) != 0 ) {
-      if ( mMsgsPendingDownload.contains( id ) ) {
+      if ( mMsgsPendingDownload.tqcontains( id ) ) {
         mMsgsPendingDownload.remove( id );
       }
       else
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index a27e70f8c..31bd1ef58 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -109,7 +109,7 @@ class QuotaInfo {
 typedef TQValueVector<QuotaInfo> QuotaInfoList;
 
 /**
- * This namespace contains functions that return jobs for quota operations.
+ * This namespace tqcontains functions that return jobs for quota operations.
  *
  * The current implementation is tied to IMAP.
  * If someone wants to extend this to other protocols, turn the namespace into a class
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index fe7b85ca9..9f33a5016 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -288,10 +288,10 @@ void RecipientLine::keyPressEvent( TQKeyEvent *ev )
 
 int RecipientLine::setComboWidth( int w )
 {
-  w = QMAX( w, mCombo->sizeHint().width() );
+  w = QMAX( w, mCombo->tqsizeHint().width() );
   mCombo->setFixedWidth( w );
   mCombo->updateGeometry();
-  parentWidget()->updateGeometry();
+  tqparentWidget()->updateGeometry();
   return w;
 }
 
@@ -331,7 +331,7 @@ RecipientsView::RecipientsView( TQWidget *parent )
 
   addLine();
   setResizePolicy( TQScrollView::Manual );
-  setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+  tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
 
   viewport()->setPaletteBackgroundColor( paletteBackgroundColor() );
 }
@@ -400,7 +400,7 @@ RecipientLine *RecipientsView::addLine()
 
   mFirstColumnWidth = line->setComboWidth( mFirstColumnWidth );
 
-  mLineHeight = line->minimumSizeHint().height();
+  mLineHeight = line->tqminimumSizeHint().height();
 
   line->resize( viewport()->width(), mLineHeight );
 
@@ -536,8 +536,8 @@ void RecipientsView::resizeView()
 //    setFixedHeight( mLineHeight * mLines.count() );
   }
 
-  parentWidget()->layout()->activate();
-  emit sizeHintChanged();
+  tqparentWidget()->tqlayout()->activate();
+  emit tqsizeHintChanged();
   TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) );
 }
 
@@ -555,12 +555,12 @@ void RecipientsView::viewportResizeEvent ( TQResizeEvent *ev )
   ensureVisible( 0, mLines.count() * mLineHeight );
 }
 
-TQSize RecipientsView::sizeHint() const
+TQSize RecipientsView::tqsizeHint() const
 {
   return TQSize( 200, mLineHeight * mLines.count() );
 }
 
-TQSize RecipientsView::minimumSizeHint() const
+TQSize RecipientsView::tqminimumSizeHint() const
 {
   int height;
   uint numLines = 5;
@@ -742,9 +742,9 @@ void RecipientsToolTip::maybeTip( const TQPoint & p )
 
   text.append( "</qt>" );
 
-  TQRect geometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) );
+  TQRect tqgeometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) );
 
-  tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, geometry );
+  tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, tqgeometry );
 }
 
 
@@ -757,7 +757,7 @@ SideWidget::SideWidget( RecipientsView *view, TQWidget *parent )
   topLayout->addStretch( 1 );
 
   mTotalLabel = new TQLabel( this );
-  mTotalLabel->setAlignment( AlignCenter );
+  mTotalLabel->tqsetAlignment( AlignCenter );
   topLayout->addWidget( mTotalLabel );
   mTotalLabel->hide();
 
@@ -862,8 +862,8 @@ RecipientsEditor::RecipientsEditor( TQWidget *parent )
   connect( mRecipientsView, TQT_SIGNAL( focusRight() ),
     mSideWidget, TQT_SLOT( setFocus() ) );
 
-  connect( mRecipientsView, TQT_SIGNAL(sizeHintChanged()),
-           TQT_SIGNAL(sizeHintChanged()) );
+  connect( mRecipientsView, TQT_SIGNAL(tqsizeHintChanged()),
+           TQT_SIGNAL(tqsizeHintChanged()) );
 }
 
 RecipientsEditor::~RecipientsEditor()
diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h
index 6f5ffb8eb..e6b7718b0 100644
--- a/kmail/recipientseditor.h
+++ b/kmail/recipientseditor.h
@@ -173,8 +173,8 @@ class RecipientsView : public QScrollView
   public:
     RecipientsView( TQWidget *parent );
 
-    TQSize minimumSizeHint() const;
-    TQSize sizeHint() const;
+    TQSize tqminimumSizeHint() const;
+    TQSize tqsizeHint() const;
 
     RecipientLine *activeLine();
 
@@ -221,7 +221,7 @@ class RecipientsView : public QScrollView
     void focusDown();
     void focusRight();
     void completionModeChanged( KGlobalSettings::Completion );
-    void sizeHintChanged();
+    void tqsizeHintChanged();
 
   protected:
     void viewportResizeEvent( TQResizeEvent * );
@@ -352,7 +352,7 @@ class RecipientsEditor : public QWidget
     void focusUp();
     void focusDown();
     void completionModeChanged( KGlobalSettings::Completion );
-    void sizeHintChanged();
+    void tqsizeHintChanged();
 
   protected slots:
     void slotPickedRecipient( const Recipient & );
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index 44df528c9..adbf4c4a0 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->sizeHint() << endl;
+  kdDebug() << "SIZEHINT: " << mRecipients->tqsizeHint() << endl;
 
 //  mRecipients->setFixedHeight( 10 );
   
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index c1d2b3aed..a45a76830 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->itemRect( item );
+    r = mListView->tqitemRect( item );
     TQString tipText( i->recipientItem()->tooltip() );
     if ( !tipText.isEmpty() ) {
       tip( r, tipText );
diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h
index 74df3b13b..2d25a87b7 100644
--- a/kmail/recipientspicker.h
+++ b/kmail/recipientspicker.h
@@ -152,7 +152,7 @@ class RecipientsCollection
     TQString id() const;
 
   private:
-    // flag to indicate if this collection contains just references
+    // flag to indicate if this collection tqcontains just references
     // or should manage memory (de)allocation as well.
     bool mIsReferenceContainer;
     TQString mId;
diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp
index bf8fe51ce..275e623b1 100644
--- a/kmail/redirectdialog.cpp
+++ b/kmail/redirectdialog.cpp
@@ -68,7 +68,7 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name,
 
   mBtnTo = new TQPushButton( TQString::null, hbox, "toBtn" );
   mBtnTo->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) );
-  mBtnTo->setMinimumSize( mBtnTo->sizeHint() * 1.2 );
+  mBtnTo->setMinimumSize( mBtnTo->tqsizeHint() * 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 81748c220..86e8df2d6 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->setSizePolicy( TQSizePolicy::Minimum,
+      mRegExpEditButton->tqsetSizePolicy( TQSizePolicy::Minimum,
                                         TQSizePolicy::Fixed );
       hlay->addWidget( mRegExpEditButton );
 
diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp
index 09966cf9d..0c220cf9d 100644
--- a/kmail/renamejob.cpp
+++ b/kmail/renamejob.cpp
@@ -138,7 +138,7 @@ void RenameJob::execute()
     ImapAccountBase* account = static_cast<KMFolderImap*>(mStorage)->account();
     // first rename it on the server
     mNewImapPath = mOldImapPath;
-    mNewImapPath = mNewImapPath.replace( mOldName, mNewName );
+    mNewImapPath = mNewImapPath.tqreplace( mOldName, mNewName );
     KURL src( account->getUrl() );
     src.setPath( mOldImapPath );
     KURL dst( account->getUrl() );
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index 016b8a577..75940e4ca 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -159,7 +159,7 @@ namespace {
 
   private:
     KMSearchRule::Function currentFunction( const TQWidgetStack *functionStack ) const;
-    int currentStatusValue( const TQWidgetStack *valueStack ) const;
+    int currenStatusValue( const TQWidgetStack *valueStack ) const;
   };
 
   class NumericRuleWidgetHandler : public KMail::RuleWidgetHandler {
@@ -403,7 +403,7 @@ namespace {
     const KMSearchRule::Function id;
     const char *displayName;
   } TextFunctions[] = {
-    { KMSearchRule::FuncContains,           I18N_NOOP( "contains" )          },
+    { KMSearchRule::FuncContains,           I18N_NOOP( "tqcontains" )          },
     { KMSearchRule::FuncContainsNot,        I18N_NOOP( "does not contain" )   },
     { KMSearchRule::FuncEquals,             I18N_NOOP( "equals" )            },
     { KMSearchRule::FuncNotEqual,           I18N_NOOP( "does not equal" )     },
@@ -499,7 +499,7 @@ namespace {
   TQString TextRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack,
                                                KMSearchRule::Function func ) const
   {
-    // here we gotta check the combobox which contains the categories
+    // here we gotta check the combobox which tqcontains the categories
     if ( func  == KMSearchRule::FuncIsInCategory ||
          func  == KMSearchRule::FuncIsNotInCategory ) {
       const TQComboBox *combo=
@@ -738,7 +738,7 @@ namespace {
     const KMSearchRule::Function id;
     const char *displayName;
   } MessageFunctions[] = {
-    { KMSearchRule::FuncContains,        I18N_NOOP( "contains" )          },
+    { KMSearchRule::FuncContains,        I18N_NOOP( "tqcontains" )          },
     { KMSearchRule::FuncContainsNot,     I18N_NOOP( "does not contain" )  },
     { KMSearchRule::FuncRegExp,          I18N_NOOP( "matches regular expr." ) },
     { KMSearchRule::FuncNotRegExp,       I18N_NOOP( "does not match reg. expr." ) },
@@ -1095,7 +1095,7 @@ namespace {
 
   //---------------------------------------------------------------------------
 
-  int StatusRuleWidgetHandler::currentStatusValue( const TQWidgetStack *valueStack ) const
+  int StatusRuleWidgetHandler::currenStatusValue( const TQWidgetStack *valueStack ) const
   {
     const TQComboBox *statusCombo =
       dynamic_cast<TQComboBox*>( QObject_child_const( valueStack,
@@ -1107,7 +1107,7 @@ namespace {
       return statusCombo->currentItem();
     }
     else
-      kdDebug(5006) << "StatusRuleWidgetHandler::currentStatusValue: "
+      kdDebug(5006) << "StatusRuleWidgetHandler::currenStatusValue: "
                        "statusRuleValueCombo not found." << endl;
     return -1;
   }
@@ -1121,9 +1121,9 @@ namespace {
     if ( !handlesField( field ) )
       return TQString::null;
 
-    const int status = currentStatusValue( valueStack );
+    const int status = currenStatusValue( valueStack );
     if ( status != -1 )
-      return TQString::fromLatin1( KMail::StatusValues[ status ].text );
+      return TQString::tqfromLatin1( KMail::StatusValues[ status ].text );
     else
       return TQString::null;
   }
@@ -1137,7 +1137,7 @@ namespace {
     if ( !handlesField( field ) )
       return TQString::null;
 
-    const int status = currentStatusValue( valueStack );
+    const int status = currenStatusValue( valueStack );
     if ( status != -1 )
       return i18n( KMail::StatusValues[ status ].text );
     else
@@ -1215,7 +1215,7 @@ namespace {
     const TQString value = rule->contents();
     int valueIndex = 0;
     for ( ; valueIndex < KMail::StatusValueCountWithoutHidden; ++valueIndex )
-      if ( value == TQString::fromLatin1(
+      if ( value == TQString::tqfromLatin1(
                KMail::StatusValues[ valueIndex ].text ) )
         break;
     TQComboBox *statusCombo =
diff --git a/kmail/scalix.cpp b/kmail/scalix.cpp
index 4910119d0..5db8a168d 100644
--- a/kmail/scalix.cpp
+++ b/kmail/scalix.cpp
@@ -60,7 +60,7 @@ KMFolder* Utils::findStandardResourceFolder( KMFolderDir* folderParentDir,
   typeMap.insert( KMail::ContentsTypeNote, "IPF.StickyNote" );
   typeMap.insert( KMail::ContentsTypeTask, "IPF.Task" );
 
-  if ( !typeMap.contains( contentsType ) )
+  if ( !typeMap.tqcontains( contentsType ) )
     return 0;
 
   for ( uint i = 0; i < attributes.count(); ++i ) {
diff --git a/kmail/scalix.h b/kmail/scalix.h
index ac07f504a..66f78e79b 100644
--- a/kmail/scalix.h
+++ b/kmail/scalix.h
@@ -19,9 +19,9 @@
  */
 
 /**
- * This file contains helper classes for Scalix groupware support.
+ * This file tqcontains helper classes for Scalix groupware support.
  * As the storage system of Scalix is quite similiar to Kolab we reuse some of
- * the exsiting code and replace other code by our own.
+ * the exsiting code and tqreplace other code by our own.
  *
  * Differences between Kolab and Scalix:
  *
diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index 89dde8214..50bf287d8 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -51,7 +51,7 @@ using KPIM::ProgressManager;
 namespace KMail {
 
 SearchJob::SearchJob( KMFolderImap* folder, ImapAccountBase* account,
-                      const KMSearchPattern* pattern, Q_UINT32 serNum )
+                      const KMSearchPattern* pattern, TQ_UINT32 serNum )
  : FolderJob( 0, tOther, (folder ? folder->folder() : 0) ),
    mFolder( folder ), mAccount( account ), mSearchPattern( pattern ),
    mSerNum( serNum ), mRemainingMsgs( 0 ), mProgress( 0 ),
@@ -186,7 +186,7 @@ void SearchJob::slotSearchData( KIO::Job* job, const TQString& data )
   if ( mLocalSearchPattern->isEmpty() && data.isEmpty() )
   {
     // no local search and the server found nothing
-    TQValueList<Q_UINT32> serNums;
+    TQValueList<TQ_UINT32> serNums;
     emit searchDone( serNums, mSearchPattern, true );
   } else
   {
@@ -226,7 +226,7 @@ void SearchJob::slotSearchFolder()
 
   if ( mLocalSearchPattern->isEmpty() ) {
     // pure imap search - now get the serial number for the UIDs
-    TQValueList<Q_UINT32> serNums;
+    TQValueList<TQ_UINT32> serNums;
     for ( TQStringList::Iterator it = mImapSearchHits.begin(); 
         it != mImapSearchHits.end(); ++it ) 
     {
@@ -257,7 +257,7 @@ void SearchJob::slotSearchFolder()
             i18n("Continue Search"), i18n("&Search"), 
             "continuedownloadingforsearch" ) != KMessageBox::Continue ) 
       {
-        TQValueList<Q_UINT32> serNums;
+        TQValueList<TQ_UINT32> serNums;
         emit searchDone( serNums, mSearchPattern, true );
         return;
       }
@@ -306,7 +306,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg )
       if ( mLocalSearchPattern->matches( msg ) &&
           ( mImapSearchHits.isEmpty() ||
            mImapSearchHits.find( TQString::number(msg->UID() ) ) != mImapSearchHits.end() ) ) {
-        Q_UINT32 serNum = msg->getMsgSerNum();
+        TQ_UINT32 serNum = msg->getMsgSerNum();
         mSearchSerNums.append( serNum );
         matches = true;
       }
@@ -314,7 +314,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg )
       // imap or local search have to match
       if ( mLocalSearchPattern->matches( msg ) ||
           mImapSearchHits.find( TQString::number(msg->UID()) ) != mImapSearchHits.end() ) {
-        Q_UINT32 serNum = msg->getMsgSerNum();
+        TQ_UINT32 serNum = msg->getMsgSerNum();
         mSearchSerNums.append( serNum );
         matches = true;
       }
@@ -352,7 +352,7 @@ void SearchJob::slotSearchResult( KIO::Job *job )
     if ( mSerNum == 0 )
     {
       // folder
-      TQValueList<Q_UINT32> serNums;
+      TQValueList<TQ_UINT32> serNums;
       emit searchDone( serNums, mSearchPattern, true );
     } else {
       // message
@@ -434,7 +434,7 @@ void SearchJob::slotAbortSearch( KPIM::ProgressItem* item )
   if ( item )
     item->setComplete();
   mAccount->killAllJobs();
-  TQValueList<Q_UINT32> serNums;
+  TQValueList<TQ_UINT32> serNums;
   emit searchDone( serNums, mSearchPattern, true );
 }
 
diff --git a/kmail/searchjob.h b/kmail/searchjob.h
index d48d96b6d..0fe6bdf88 100644
--- a/kmail/searchjob.h
+++ b/kmail/searchjob.h
@@ -62,7 +62,7 @@ public:
    * @param serNum if you specify the serNum only this is checked
    */
   SearchJob( KMFolderImap* folder, ImapAccountBase* account,
-             const KMSearchPattern* pattern, Q_UINT32 serNum = 0 );
+             const KMSearchPattern* pattern, TQ_UINT32 serNum = 0 );
 
   virtual ~SearchJob();
 
@@ -107,21 +107,21 @@ protected slots:
 
 signals:
   // emitted when a list of matching serial numbers was found
-  void searchDone( TQValueList<Q_UINT32>, const KMSearchPattern*, bool complete );
+  void searchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool complete );
 
   // emitted when a single message (identified by the serial number) was checked
-  void searchDone( Q_UINT32, const KMSearchPattern*, bool matches );
+  void searchDone( TQ_UINT32, const KMSearchPattern*, bool matches );
 
 protected:
   KMFolderImap* mFolder;
   ImapAccountBase* mAccount;
   const KMSearchPattern* mSearchPattern;
   KMSearchPattern* mLocalSearchPattern;
-  Q_UINT32 mSerNum;
+  TQ_UINT32 mSerNum;
     // saves the results of the imap search
   TQStringList mImapSearchHits;
   // collects the serial numbers from imap and local search
-  TQValueList<Q_UINT32> mSearchSerNums;
+  TQValueList<TQ_UINT32> mSearchSerNums;
   // the remaining messages that have to be downloaded for local search
   uint mRemainingMsgs;
   // progress item for local searches
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index b32dd96e0..2f4b3565d 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -466,7 +466,7 @@ void SearchWindow::activateFolder(KMFolder *curFolder)
 //-----------------------------------------------------------------------------
 void SearchWindow::slotSearch()
 {
-    mLastFocus = focusWidget();
+    mLastFocus = tqfocusWidget();
     mBtnSearch->setFocus();     // set focus so we don't miss key event
 
     mStopped = false;
@@ -509,12 +509,12 @@ void SearchWindow::slotSearch()
     mFolder->stopSearch();
     disconnect(mFolder, TQT_SIGNAL(msgAdded(int)),
             this, TQT_SLOT(slotAddMsg(int)));
-    disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(slotRemoveMsg(KMFolder*, Q_UINT32)));
+    disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
     connect(mFolder, TQT_SIGNAL(msgAdded(int)),
             this, TQT_SLOT(slotAddMsg(int)));
-    connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(slotRemoveMsg(KMFolder*, Q_UINT32)));
+    connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
     mSearchFolderEdt->setEnabled(false);
     KMSearch *search = new KMSearch();
     connect(search, TQT_SIGNAL(finished(bool)),
@@ -563,7 +563,7 @@ void SearchWindow::slotAddMsg(int idx)
     KMMessage *msg = mFolder->getMsg(idx);
     TQString from, fName;
     KMFolder *pFolder = msg->parent();
-    if (!mFolders.contains(pFolder)) {
+    if (!mFolders.tqcontains(pFolder)) {
         mFolders.append(pFolder);
         pFolder->open("searchwindow");
     }
@@ -584,7 +584,7 @@ void SearchWindow::slotAddMsg(int idx)
         mFolder->unGetMsg(idx);
 }
 
-void SearchWindow::slotRemoveMsg(KMFolder *, Q_UINT32 serNum)
+void SearchWindow::slotRemoveMsg(KMFolder *, TQ_UINT32 serNum)
 {
     if (!mFolder)
         return;
@@ -948,13 +948,13 @@ void SearchWindow::slotPrintMsg()
 
 void SearchWindow::slotCopyMsgs()
 {
-  TQValueList<Q_UINT32> list = MessageCopyHelper::serNumListFromMsgList( selectedMessages() );
+  TQValueList<TQ_UINT32> list = MessageCopyHelper::serNumListFromMsgList( selectedMessages() );
   mKMMainWidget->headers()->setCopiedMessages( list, false );
 }
 
 void SearchWindow::slotCutMsgs()
 {
-  TQValueList<Q_UINT32> list = MessageCopyHelper::serNumListFromMsgList( selectedMessages() );
+  TQValueList<TQ_UINT32> list = MessageCopyHelper::serNumListFromMsgList( selectedMessages() );
   mKMMainWidget->headers()->setCopiedMessages( list, true );
 }
 
diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h
index 836553ae8..c3c8cf854 100644
--- a/kmail/searchwindow.h
+++ b/kmail/searchwindow.h
@@ -139,7 +139,7 @@ protected slots:
   /** GUI cleanup after search */
   virtual void searchDone();
   virtual void slotAddMsg(int idx);
-  virtual void slotRemoveMsg(KMFolder *, Q_UINT32 serNum);
+  virtual void slotRemoveMsg(KMFolder *, TQ_UINT32 serNum);
   void enableGUI();
 
   void setEnabledSearchButton(bool);
diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index 0ce073d93..fa32dea6e 100644
--- a/kmail/sievejob.cpp
+++ b/kmail/sievejob.cpp
@@ -149,7 +149,7 @@ namespace KMail {
     // Convert mScript into UTF-8:
     data = mScript.utf8();
 
-    // "data" contains a trailing NUL, remove:
+    // "data" tqcontains a trailing NUL, remove:
     if ( data.size() > 0 && data[(int)data.size() - 1] == '\0' )
       data.resize( data.size() - 1 );
 
diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp
index 606d460de..c566da007 100644
--- a/kmail/signatureconfigurator.cpp
+++ b/kmail/signatureconfigurator.cpp
@@ -52,7 +52,7 @@ namespace KMail {
     TQVBoxLayout * vlay;
     TQVBoxLayout * page_vlay;
 
-    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" );
+    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" );
 
     // "enable signatue" checkbox:
     mEnableCheck = new TQCheckBox( i18n("&Enable signature"), this );
@@ -119,7 +119,7 @@ namespace KMail {
     hlay = new TQHBoxLayout( page_vlay ); // inherits spacing
     mFileRequester = new KURLRequester( page );
     TQWhatsThis::add(mFileRequester,
-        i18n("Use this requester to specify a text file that contains your "
+        i18n("Use this requester to specify a text file that tqcontains your "
              "signature. It will be read every time you create a new mail or "
              "append a new signature."));
     hlay->addWidget( new TQLabel( mFileRequester,
@@ -260,7 +260,7 @@ namespace KMail {
     // slotEnableEditButton should prevent this assert from being hit:
     assert( !url.isEmpty() );
 
-    (void)KRun::runURL( KURL( url ), TQString::fromLatin1("text/plain") );
+    (void)KRun::runURL( KURL( url ), TQString::tqfromLatin1("text/plain") );
   }
 
 } // namespace KMail
diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp
index 4be67e6e4..4d42f4d43 100644
--- a/kmail/simplestringlisteditor.cpp
+++ b/kmail/simplestringlisteditor.cpp
@@ -166,7 +166,7 @@ TQStringList SimpleStringListEditor::stringList() const {
   return result;
 }
 
-bool SimpleStringListEditor::containsString( const TQString & str ) {
+bool SimpleStringListEditor::tqcontainsString( const TQString & str ) {
   for ( TQListBoxItem * item = mListBox->firstItem() ;
 	item ; item = item->next() ) {
     if ( item->text() == str )
@@ -193,7 +193,7 @@ void SimpleStringListEditor::setButtonText( ButtonCode button,
   case Up:
   case Down:
     kdDebug(5006) << "SimpleStringListEditor: Cannot change text of "
-      "Up and Down buttons: they don't contains text!" << endl;
+      "Up and Down buttons: they don't tqcontains text!" << endl;
     return;
   default:
     if ( button & All )
@@ -216,7 +216,7 @@ void SimpleStringListEditor::slotAdd() {
 					    &ok, this );
   // let the user verify the string before adding
   emit aboutToAdd( newEntry );
-  if ( ok && !newEntry.isEmpty() && !containsString( newEntry )) {
+  if ( ok && !newEntry.isEmpty() && !tqcontainsString( newEntry )) {
       mListBox->insertItem( newEntry );
       emit changed();
   }
diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h
index 115a9a05e..afa8593c3 100644
--- a/kmail/simplestringlisteditor.h
+++ b/kmail/simplestringlisteditor.h
@@ -91,7 +91,7 @@ protected slots:
   void slotSelectionChanged();
 
 protected:
-  bool containsString( const TQString & str );
+  bool tqcontainsString( const TQString & str );
   TQListBox      *mListBox;
   TQPushButton   *mAddButton;
   TQPushButton   *mRemoveButton;
diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui
index c1f2ca40e..d82d06a30 100644
--- a/kmail/smimeconfiguration.ui
+++ b/kmail/smimeconfiguration.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SMimeConfiguration</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -54,7 +54,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -80,7 +80,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -109,7 +109,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>150</width>
                                     <height>20</height>
@@ -202,7 +202,7 @@
                         </property>
                         <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -253,7 +253,7 @@
                                 <string>Ignore HTTP CRL distribution point of certificates</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>When looking for the location of a CRL, the to-be-tested certificate usually contains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the HTTP scheme are ignored when looking for a suitable DP.</string>
+                                <string>When looking for the location of a CRL, the to-be-tested certificate usually tqcontains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the HTTP scheme are ignored when looking for a suitable DP.</string>
                             </property>
                         </widget>
                     </grid>
@@ -307,12 +307,12 @@
                                 <string>Ignore LDAP CRL distribution point of certificates</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>When looking for the location of a CRL, the to-be-tested certificate usually contains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the LDAP scheme are ignored when looking for a suitable DP.</string>
+                                <string>When looking for the location of a CRL, the to-be-tested certificate usually tqcontains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the LDAP scheme are ignored when looking for a suitable DP.</string>
                             </property>
                         </widget>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>73</height>
@@ -409,5 +409,5 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP
         <slot>setDisabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp
index 93478d13f..5e26319ff 100644
--- a/kmail/snippetdlg.cpp
+++ b/kmail/snippetdlg.cpp
@@ -49,8 +49,8 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam
     connect( snippetName, TQT_SIGNAL(returnPressed()),
              this, TQT_SLOT(slotReturnPressed()) );
 
-    layout3->addWidget( textLabel3, 7, 0 );
-    layout3->addWidget( keyButton, 7, 1 );
+    tqlayout3->addWidget( textLabel3, 7, 0 );
+    tqlayout3->addWidget( keyButton, 7, 1 );
 
     // tab order
     setTabOrder( snippetText, keyButton );
diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui
index a5a28a72a..0df0e226f 100644
--- a/kmail/snippetdlgbase.ui
+++ b/kmail/snippetdlgbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SnippetDlgBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -21,7 +21,7 @@
         </property>
         <widget class="QLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -37,7 +37,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -64,7 +64,7 @@
         </widget>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -85,7 +85,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>80</height>
@@ -110,7 +110,7 @@
                     <property name="text">
                         <string>&amp;Snippet:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -169,7 +169,7 @@
     <tabstop>btnAdd</tabstop>
     <tabstop>btnCancel</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui
index 9c5461fe0..62ca4a483 100644
--- a/kmail/snippetsettingsbase.ui
+++ b/kmail/snippetsettingsbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SnippetSettingsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -56,7 +56,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>70</height>
@@ -123,7 +123,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -144,7 +144,7 @@
                             <property name="name">
                                 <cstring>leDelimiter</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>40</width>
                                     <height>32767</height>
@@ -164,7 +164,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -177,7 +177,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index 800a98e55..ef0e07930 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -146,7 +146,7 @@ SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name,
 {
     SnippetItem * item = new SnippetItem(parent, name, text);
     const TQString actionName = i18n("Snippet %1").arg(name);
-    const TQString normalizedName = TQString(actionName).replace(" ", "_");
+    const TQString normalizedName = TQString(actionName).tqreplace(" ", "_");
     if ( !mActionCollection->action(normalizedName.utf8() ) ) {
         KAction * action = new KAction( actionName, shortcut, item,
                                         TQT_SLOT( slotExecute() ), mActionCollection,
@@ -521,7 +521,7 @@ void SnippetWidget::maybeTip( const TQPoint & p )
 	if (!item)
 	  return;
 
-	TQRect r = itemRect( item );
+	TQRect r = tqitemRect( item );
 
 	if (r.isValid() &&
         _SnippetConfig.useToolTips() )
@@ -562,7 +562,7 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int
 //  fn SnippetWidget::parseText(TQString text, TQString del)
 /*!
     This function is used to parse the given TQString for variables. If found the user will be prompted
-    for a replacement value. It returns the string text with all replacements made
+    for a tqreplacement value. It returns the string text with all tqreplacements made
  */
 TQString SnippetWidget::parseText(TQString text, TQString del)
 {
@@ -597,11 +597,11 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
           strNew = ""; //for inputmode "multi" just reset new valaue
         }
       } else {
-        strNew = del; //if double-delimiter -> replace by single character
+        strNew = del; //if double-delimiter -> tqreplace by single character
       }
 
       if (iInMeth == 0) {  //if input-method "single" is selected
-        str.replace(strName, strNew);
+        str.tqreplace(strName, strNew);
       }
 
       mapVar[strName] = strNew;
@@ -615,8 +615,8 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
     oh = rMulti.top();
     if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) {  //generate and show the dialog
       TQMap<TQString, TQString>::Iterator it;
-      for ( it = mapVar.begin(); it != mapVar.end(); ++it ) {  //walk through the map and do the replacement
-        str.replace(it.key(), it.data());
+      for ( it = mapVar.begin(); it != mapVar.end(); ++it ) {  //walk through the map and do the tqreplacement
+        str.tqreplace(it.key(), it.data());
       }
     } else {
       return "";
@@ -637,7 +637,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
 
 //  fn SnippetWidget::showMultiVarDialog()
 /*!
-    This function constructs a dialog which contains a label and a linedit for every
+    This function constructs a dialog which tqcontains a label and a linedit for every
     variable that is stored in the given map except the double-delimiter entry
     It return true if everything was ok and false if the user hit cancel
  */
@@ -660,35 +660,35 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   TQDialog dlg(this);
   dlg.setCaption(i18n("Enter Values for Variables"));
 
-  TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
-  TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
-  TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
-  TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
+  TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
+  TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop");
+  TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar");
+  TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutBtn");
 
   KTextEdit *te = NULL;
   TQLabel * labTop = NULL;
   TQCheckBox * cb = NULL;
 
   labTop = new TQLabel( &dlg, "label" );
-  labTop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  labTop->tqsetSizePolicy( 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);
-  layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+  labTop->setText(i18n("Enter the tqreplacement values for these variables:"));
+  tqlayoutTop->addWidget(labTop, 0, 0);
+  tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
 
 
   int i = 0;                                           //walk through the variable map and add
-  for ( it = map->begin(); it != map->end(); ++it ) {  //a checkbox, a lable and a lineedit to the main layout
+  for ( it = map->begin(); it != map->end(); ++it ) {  //a checkbox, a lable and a lineedit to the main tqlayout
     if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter())
       continue;
 
     cb = new TQCheckBox( &dlg, "cbVar" );
     cb->setChecked( FALSE );
     cb->setText(it.key());
-    layoutVar->addWidget( cb, i ,0, Qt::AlignTop );
+    tqlayoutVar->addWidget( cb, i ,0, Qt::AlignTop );
 
     te = new KTextEdit( &dlg, "teVar" );
-    layoutVar->addWidget( te, i, 1, Qt::AlignTop );
+    tqlayoutVar->addWidget( te, i, 1, Qt::AlignTop );
 
     if ((*mapSave)[it.key()].length() > 0) {
       cb->setChecked( TRUE );
@@ -705,20 +705,20 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
 
     i++;
   }
-  layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" );
-  btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn1->sizePolicy().hasHeightForWidth() ) );
-  layoutBtn->addWidget( btn1, 0, 0 );
+  tqlayoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
   btn2->setDefault( TRUE );
-  btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn2->sizePolicy().hasHeightForWidth() ) );
-  layoutBtn->addWidget( btn2, 0, 1 );
+  tqlayoutBtn->addWidget( btn2, 0, 1 );
 
-  layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
   // --END-- building a dynamic dialog
 
   //connect the buttons to the TQDialog default slots
@@ -729,7 +729,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   bool bReturn = false;
   //resize the textedits
   if (iWidth > 1) {
-    TQRect r = dlg.geometry();
+    TQRect r = dlg.tqgeometry();
     r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count());
     r.setWidth(iWidth);
     dlg.setGeometry(r);
@@ -750,9 +750,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
     }
     bReturn = true;
 
-    iBasicHeight = dlg.geometry().height() - layoutVar->geometry().height();
-    iOneHeight = layoutVar->geometry().height() / mapVar2Te.count();
-    iWidth = dlg.geometry().width();
+    iBasicHeight = dlg.tqgeometry().height() - tqlayoutVar->tqgeometry().height();
+    iOneHeight = tqlayoutVar->tqgeometry().height() / mapVar2Te.count();
+    iWidth = dlg.tqgeometry().width();
   }
 
   //do some cleanup
@@ -764,10 +764,10 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   for (it2 = mapVar2Cb.begin(); it2 != mapVar2Cb.end(); ++it2)
     delete it2.data();
   mapVar2Cb.clear();
-  delete layoutTop;
-  delete layoutVar;
-  delete layoutBtn;
-  delete layout;
+  delete tqlayoutTop;
+  delete tqlayoutVar;
+  delete tqlayoutBtn;
+  delete tqlayout;
 
   if (i==0) //if nothing happened this means, that there are no variables to translate
     return true; //.. so just return OK
@@ -779,7 +779,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
 
 //  fn SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave)
 /*!
-    This function constructs a dialog which contains a label and a linedit for the given variable
+    This function constructs a dialog which tqcontains a label and a linedit for the given variable
     It return either the entered value or an empty string if the user hit cancel
  */
 TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave, TQRect & dlgSize)
@@ -788,19 +788,19 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   TQDialog dlg(this);
   dlg.setCaption(i18n("Enter Values for Variables"));
 
-  TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
-  TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
-  TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
-  TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
+  TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
+  TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop");
+  TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar");
+  TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "tqlayoutBtn");
 
   KTextEdit *te = NULL;
   TQLabel * labTop = NULL;
   TQCheckBox * cb = NULL;
 
   labTop = new TQLabel( &dlg, "label" );
-  layoutTop->addWidget(labTop, 0, 0);
-  labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
-  layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+  tqlayoutTop->addWidget(labTop, 0, 0);
+  labTop->setText(i18n("Enter the tqreplacement values for %1:").arg( var ));
+  tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
 
 
   cb = new TQCheckBox( &dlg, "cbVar" );
@@ -808,8 +808,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   cb->setText(i18n( "Make value &default" ));
 
   te = new KTextEdit( &dlg, "teVar" );
-  layoutVar->addWidget( te, 0, 1, Qt::AlignTop);
-  layoutVar->addWidget( cb, 1, 1, Qt::AlignTop);
+  tqlayoutVar->addWidget( te, 0, 1, Qt::AlignTop);
+  tqlayoutVar->addWidget( cb, 1, 1, Qt::AlignTop);
   if ((*mapSave)[var].length() > 0) {
     cb->setChecked( TRUE );
     te->setText((*mapSave)[var]);
@@ -820,16 +820,16 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
                             "If you use the same variable later, even in another snippet, the value entered to the right "
                             "will be the default value for that variable.") );
 
-  layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" );
-  layoutBtn->addWidget( btn1, 0, 0 );
+  tqlayoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
   btn2->setDefault( TRUE );
-  layoutBtn->addWidget( btn2, 0, 1 );
+  tqlayoutBtn->addWidget( btn2, 0, 1 );
 
-  layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
   te->setFocus();
   // --END-- building a dynamic dialog
 
@@ -849,7 +849,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
 
     strReturn = te->text();    //copy the entered values back the the given map
 
-    dlgSize = dlg.geometry();
+    dlgSize = dlg.tqgeometry();
   }
 
   //do some cleanup
@@ -858,10 +858,10 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   delete labTop;
   delete btn1;
   delete btn2;
-  delete layoutTop;
-  delete layoutVar;
-  delete layoutBtn;
-  delete layout;
+  delete tqlayoutTop;
+  delete tqlayoutVar;
+  delete tqlayoutBtn;
+  delete tqlayout;
 
   return strReturn;
 }
@@ -912,7 +912,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *)
     group = dynamic_cast<SnippetGroup *>(item2->parent());
 
   TQCString dropped;
-  TQByteArray data = e->encodedData("text/plain");
+  TQByteArray data = e->tqencodedData("text/plain");
   if ( e->provides("text/plain") && data.size()>0 ) {
     //get the data from the event...
     TQString encData(data.data());
diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h
index 79dd258dd..cd7d09d39 100644
--- a/kmail/snippetwidget.h
+++ b/kmail/snippetwidget.h
@@ -39,7 +39,7 @@ class KActionCollection;
 /**
 This is the widget which gets added to the right TreeToolView.
 It inherits KListView and TQToolTip which is needed for showing the
-tooltips which contains the text of the snippet
+tooltips which tqcontains the text of the snippet
 @author Robert Gruber
 */
 class SnippetWidget : public KListView, public QToolTip
diff --git a/kmail/stringutil.cpp b/kmail/stringutil.cpp
index 907c5e1fb..e3a2243c8 100644
--- a/kmail/stringutil.cpp
+++ b/kmail/stringutil.cpp
@@ -29,7 +29,7 @@ namespace StringUtil
 TQString encodeMailtoUrl( const TQString& str )
 {
   TQString result;
-  result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str,
+  result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str,
                                 "utf-8" ) );
   result = KURL::encode_string( result );
   return result;
diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp
index 58d00b24a..bb9c5c6c9 100644
--- a/kmail/subscriptiondialog.cpp
+++ b/kmail/subscriptiondialog.cpp
@@ -414,7 +414,7 @@ void SubscriptionDialog::processItems()
   uint done = 0;
   for (uint i = mCount; i < mFolderNames.count(); ++i)
   {
-    // give the dialog a chance to repaint
+    // give the dialog a chance to tqrepaint
     if (done == 1000)
     {
       emit listChanged();
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 79df85094..26355ac5b 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::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         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::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         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::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         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::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         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::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         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::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         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::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         TQString str = KGlobal::locale()->formatTime( date.time(), false );
         body.append( str );
 
@@ -963,7 +963,7 @@ void TemplateParser::addProcessedBodyToMessage( const TQString &body )
 
           // Converting to a string here, since DwMediaType does not have a HasParameter() function
           TQString ctStr = ct.AsString().c_str();
-          if ( !ctStr.lower().contains( "name=" ) && !ctStr.lower().contains( "filename=" ) ) {
+          if ( !ctStr.lower().tqcontains( "name=" ) && !ctStr.lower().tqcontains( "filename=" ) ) {
             DwParameter *nameParameter = new DwParameter;
             nameParameter->SetAttribute( "name" );
             nameParameter->SetValue( Util::dwString( KMMsgBase::encodeRFC2231StringAutoDetectCharset(
diff --git a/kmail/templateparser.h b/kmail/templateparser.h
index 3cb53ac11..48bdbf578 100644
--- a/kmail/templateparser.h
+++ b/kmail/templateparser.h
@@ -32,11 +32,11 @@ class KProcess;
 /**
  * The TemplateParser transforms a message with a given template.
  *
- * A template contains text and commands, such as %QUOTE or %ODATE, which will be
- * replaced with the real values in process().
+ * A template tqcontains text and commands, such as %QUOTE or %ODATE, which will be
+ * tqreplaced with the real values in process().
  *
  * The message given in the constructor is the message that is being transformed.
- * The message text will be replaced by the processed text of the template, but other
+ * The message text will be tqreplaced by the processed text of the template, but other
  * properties, such as the attachments or the subject, are preserved.
  *
  * There are two different kind of commands: Those that work on the message that is
@@ -147,7 +147,7 @@ class TemplateParser : public TQObject
      *
      * In append mode, this will simply append the text to the body.
      *
-     * Otherwise, the content of the old message is deleted and replaced with @p body.
+     * Otherwise, the content of the old message is deleted and tqreplaced with @p body.
      * Attachments of the original message are also added back to the new message. 
      */
     void addProcessedBodyToMessage( const TQString &body );
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 8b4f37e8f..70dd926b6 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 );
 
-  setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
-  sizeHint();
+  tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+  tqsizeHint();
 
   connect( textEdit_new, TQT_SIGNAL( textChanged() ),
            this, TQT_SLOT( slotTextChanged( void ) ) );
diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui
index 20345e575..69c451b42 100644
--- a/kmail/templatesconfiguration_base.ui
+++ b/kmail/templatesconfiguration_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>TemplatesConfigurationBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -20,7 +20,7 @@
             <verstretch>3</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>400</width>
             <height>300</height>
@@ -45,7 +45,7 @@
                     <verstretch>3</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -86,7 +86,7 @@
                                 <verstretch>3</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>0</width>
                                 <height>0</height>
@@ -258,7 +258,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -284,7 +284,7 @@
                     <property name="text">
                         <string>&amp;Quote indicator:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -324,7 +324,7 @@
         <data format="PNG" length="807">89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000002ee49444154388d7d93cd6b5c6514c67fe7bdef9d8f24d349c66412a203b1b4282d21140918824816418a0b454d75e1a28ab8c8dfe1c25d70e34e0812ea4644d13610c43a1121b5d84cab6943486227499d869ae6633e32f7de79ef71d58644f0593dabdf39cf7938a2aa4c4f4f9b300c0b954ae56ca55249876128aa2a9c90738eadadada0542afd954ea7cb636363a19d9f9f4755cff6f4a53e4d67ed78f7b37ebb8b05e3810818017d0a68f1dcc36463a7ea8a4b8bdb9fcccdcdddf6eaf5bae4f3f9f7bb7a773faee94fed81b983a6d6d9ab6eb2f5f73affec6de1a536c9e4d7497696c9f63cf237d66b85b5e570cf3977c7aeaeae9a42a130d03d506bdbaddda3d1805faec6dc5a68e2a208e30124187a39c9ebefa6c8f544f84949a9ea69e75cd60641c0e1e1a1b8b849142ac51f226ece1f32fc4a86f31732f86db076178ad70e20765cfae8142207009eaafac639270022c2fd15a1b470c8f81b59defed0637024c44596c269cb3b1fe4585c68f2c76f0e23064000639e5c5804caab2d8c24187ed5c3265adc5bf4b9f2f91e377eae73fe254b6fbfc7ea7283588f9a314756089b31ed5925dd61b87b2bc5d75fd4a91d843c7fa68d5caf23fb4c8246fdc9f01300e3412e9f60f7313c285b6edf0c696bf338f3620773df3de2ea15d8de0ce92f2448f8472bd8a700515e18146e5c3714afd5197f3343ae3b463ce1cbcf94efbf7a48b6cb303462595c3801505514280c182ebed5ce37333bec3f8e387721859f80da7e8c114714097b3be65804eb799e562a95e641358e4d47cb8cbc66c9f5f6f1eb8f55967eafa140bedfe7e27b7dac2c4588a7ec6cb7622004629b4c2629954a7fda6c6b3f5f08baac1f61bd2683c3867a358931865339c8e69a9c1b323cb87fc0fa72d81091351189646262426667677b620e2fabea25942e504144fef34d80735a752daeab9a6f7ddf5f9162b1c8e4e4a45f2e974f0541d0a3aa19c03f16f4b862a061adddc96432bba2aaccccccc8d4d494b7b1b1910c8220a1aae6ff00d6da56676767303a3a1afd0b29d2596f22d0b7b20000000049454e44ae426082</data>
     </image>
 </images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>templatesinsertcommand.h</includehint>
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index 45bd81fca..c2f794dd0 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -325,7 +325,7 @@ TemplatesInsertCommand::~TemplatesInsertCommand()
 
 void TemplatesInsertCommand::slotClicked()
 {
-  TQSize ps = mMenu->popupMenu()->sizeHint();
+  TQSize ps = mMenu->popupMenu()->tqsizeHint();
   mMenu->popup( mapToGlobal( TQPoint( 0, -(ps.height()) ) ) );
 }
 
diff --git a/kmail/tests/messagedicttests.cpp b/kmail/tests/messagedicttests.cpp
index cdb24f6d8..e6b4b899b 100644
--- a/kmail/tests/messagedicttests.cpp
+++ b/kmail/tests/messagedicttests.cpp
@@ -65,12 +65,12 @@ void MessageDictTester::testKMDictClear()
 
 void MessageDictTester::testKMDictReplace()
 {
-  p("Check replace: ");
+  p("Check tqreplace: ");
   m_dict->init( 31 );
   KMDictItem *oldItem = new KMDictItem();
   KMDictItem *newItem = new KMDictItem();
   m_dict->insert( 12345, oldItem );
-  m_dict->replace( 12345, newItem );
+  m_dict->tqreplace( 12345, newItem );
   KMDictItem *found = m_dict->find( 12345 );
   CHECK( found, newItem );
 }
diff --git a/kmail/tests/mimelibtests.cpp b/kmail/tests/mimelibtests.cpp
index b152fdcf6..34a4f4692 100644
--- a/kmail/tests/mimelibtests.cpp
+++ b/kmail/tests/mimelibtests.cpp
@@ -39,8 +39,8 @@ KUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );
 static TQString makePrintable( const TQCString& str )
 {
   TQString a = str;
-  a = a.replace( '\r', "\\r" );
-  a = a.replace( '\n', "\\n" );
+  a = a.tqreplace( '\r', "\\r" );
+  a = a.tqreplace( '\n', "\\n" );
   return a;
 }
 #endif
@@ -48,8 +48,8 @@ static TQString makePrintable( const TQCString& str )
 static TQString makePrintable( const DwString& str )
 {
   TQString a = KMail::Util::CString( str ); // ## we assume latin1
-  a = a.replace( '\r', "\\r" );
-  a = a.replace( '\n', "\\n" );
+  a = a.tqreplace( '\r', "\\r" );
+  a = a.tqreplace( '\n', "\\n" );
   return a;
 }
 
diff --git a/kmail/tests/utiltests.cpp b/kmail/tests/utiltests.cpp
index 22c141669..195758b87 100644
--- a/kmail/tests/utiltests.cpp
+++ b/kmail/tests/utiltests.cpp
@@ -30,8 +30,8 @@ void UtilTester::tearDown()
 static TQString makePrintable( const TQCString& str )
 {
   TQString a = str;
-  a = a.replace( '\r', "\\r" );
-  a = a.replace( '\n', "\\n" );
+  a = a.tqreplace( '\r', "\\r" );
+  a = a.tqreplace( '\n', "\\n" );
   return a;
 }
 static TQString makePrintable( const TQByteArray& arr )
diff --git a/kmail/textsource.cpp b/kmail/textsource.cpp
index ab31dc422..6649565a9 100644
--- a/kmail/textsource.cpp
+++ b/kmail/textsource.cpp
@@ -44,7 +44,7 @@ KMTextSource::~KMTextSource() {
 }
 
 
-TQCString KMTextSource::text(Q_UINT32 serialNumber) const {
+TQCString KMTextSource::text(TQ_UINT32 serialNumber) const {
     TQCString rc;
     KMFolder *folder = 0;
     int idx;
diff --git a/kmail/textsource.h b/kmail/textsource.h
index 8251a09cc..e02509202 100644
--- a/kmail/textsource.h
+++ b/kmail/textsource.h
@@ -40,7 +40,7 @@ public:
     KMTextSource();
     ~KMTextSource();
 
-    TQCString text(Q_UINT32 serialNumber) const;
+    TQCString text(TQ_UINT32 serialNumber) const;
 };
 
 #endif
diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp
index 19aff3155..74afe85ba 100644
--- a/kmail/treebase.cpp
+++ b/kmail/treebase.cpp
@@ -73,7 +73,7 @@ void TreeBase::addChildFolder()
 
       const KMFolder *fld = folder();
       if ( fld ) {
-         mFolderTree->addChildFolder( (KMFolder *) fld, parentWidget() );
+         mFolderTree->addChildFolder( (KMFolder *) fld, tqparentWidget() );
 	reload( mLastMustBeReadWrite, mLastShowOutbox, mLastShowImapFolders );
 	setFolder( (KMFolder *) fld );
       }
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index 8ab2a25fc..d788add0f 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -732,7 +732,7 @@ namespace {
     Q_UNUSED( window );
     Q_UNUSED( url );
     const TQString kmailImagePath = locate( "data", "kmail/pics/" );
-    if ( imagePath.contains( kmailImagePath ) ) {
+    if ( imagePath.tqcontains( kmailImagePath ) ) {
       // Do nothing, don't start a drag
       return true;
     }
@@ -745,7 +745,7 @@ namespace {
     Q_UNUSED( window );
     Q_UNUSED( url );
     const TQString kmailImagePath = locate( "data", "kmail/pics/" );
-    return imagePath.contains( kmailImagePath );
+    return imagePath.tqcontains( kmailImagePath );
   }
 }
 
diff --git a/kmail/util.cpp b/kmail/util.cpp
index 5d7173d2c..ca1b54b6e 100644
--- a/kmail/util.cpp
+++ b/kmail/util.cpp
@@ -60,7 +60,7 @@ size_t KMail::Util::crlf2lf( char* str, const size_t strLen )
         return strLen;
     }
 
-    // replace all occurrences of "\r\n" with "\n" (in place)
+    // tqreplace all occurrences of "\r\n" with "\n" (in place)
     char* target = const_cast<char*>( source ); // target points to '\r'
     ++source; // source points to '\n'
     for ( ; source < sourceEnd; ++source ) {
@@ -156,7 +156,7 @@ void KMail::Util::append( TQByteArray& that, const char* str )
     return; // nothing to append
   that.detach();
   uint len1 = that.size();
-  uint len2 = qstrlen(str);
+  uint len2 = tqstrlen(str);
   if ( that.resize( len1 + len2, TQByteArray::SpeedOptim ) )
     memcpy( that.data() + len1, str, len2 );
 }
@@ -173,7 +173,7 @@ void KMail::Util::append( TQByteArray& that, const TQCString& str )
 // Code taken from TQCString::insert, but trailing nul removed
 void KMail::Util::insert( TQByteArray& that, uint index, const char* s )
 {
-  int len = qstrlen(s);
+  int len = tqstrlen(s);
   if ( len == 0 )
     return;
   uint olen = that.size();
diff --git a/kmail/util.h b/kmail/util.h
index d0e378219..341f65df9 100644
--- a/kmail/util.h
+++ b/kmail/util.h
@@ -54,7 +54,7 @@ class TQWidget;
 namespace KMail
 {
     /**
-     * The Util namespace contains a collection of helper functions use in
+     * The Util namespace tqcontains a collection of helper functions use in
      * various places.
      */
 namespace Util {
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index 0b9222f48..e706243cf 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -212,7 +212,7 @@ namespace {
   static const GenericInformationExtractor::StateNode spamNodes[] = {
     { 0, GIE::CommandStart, "if",  1, 0, 0 },              // 0
     { 0,   GIE::TestStart, "header", 2, 0, 0 },            // 1
-    { 0,     GIE::TaggedArgument, "contains", 3, 0, 0 },   // 2
+    { 0,     GIE::TaggedArgument, "tqcontains", 3, 0, 0 },   // 2
 
     // accept both string and string-list:
     { 0,     GIE::StringArgument, "x-spam-flag", 9, 4, "x-spam-flag" },    // 3
@@ -259,16 +259,16 @@ namespace {
 
   // to understand this table, study the output of
   // libksieve/tests/parsertest
-  //   'if not address :domain :contains ["from"] ["mydomain.org"] { keep; stop; }'
+  //   'if not address :domain :tqcontains ["from"] ["mydomain.org"] { keep; stop; }'
   static const GenericInformationExtractor::StateNode domainNodes[] = {
     { 0, GIE::CommandStart, "if", 1, 0, 0 },       // 0
     { 0,   GIE::TestStart, "not", 2, 0, 0, },      // 1
     { 0,     GIE::TestStart, "address", 3, 0, 0 }, // 2
 
-    // :domain and :contains in arbitrary order:
+    // :domain and :tqcontains in arbitrary order:
     { 0,       GIE::TaggedArgument, "domain", 4, 5, 0 },     // 3
-    { 0,       GIE::TaggedArgument, "contains", 7, 0, 0 },   // 4
-    { 0,       GIE::TaggedArgument, "contains", 6, 0, 0 },   // 5
+    { 0,       GIE::TaggedArgument, "tqcontains", 7, 0, 0 },   // 4
+    { 0,       GIE::TaggedArgument, "tqcontains", 6, 0, 0 },   // 5
     { 0,       GIE::TaggedArgument, "domain", 7, 0, 0 },     // 6
 
     // accept both string and string-list:
@@ -448,9 +448,9 @@ namespace KMail {
 
   static inline TQString dotstuff( TQString s ) {
     if ( s.startsWith( "." ) )
-      return '.' + s.replace( "\n.", "\n.." );
+      return '.' + s.tqreplace( "\n.", "\n.." );
     else
-      return s.replace( "\n.", "\n.." );
+      return s.tqreplace( "\n.", "\n.." );
   }
 
   TQString Vacation::composeScript( const TQString & messageText,
@@ -464,26 +464,26 @@ namespace KMail {
       addressesArgument += ":addresses [ ";
       TQStringList sl;
       for ( AddrSpecList::const_iterator it = addrSpecs.begin() ; it != addrSpecs.end() ; ++it ) {
-	sl.push_back( '"' + (*it).asString().replace( '\\', "\\\\" ).replace( '"', "\\\"" ) + '"' );
+	sl.push_back( '"' + (*it).asString().tqreplace( '\\', "\\\\" ).tqreplace( '"', "\\\"" ) + '"' );
 	aliases.push_back( (*it).asString() );
       }
       addressesArgument += sl.join( ", " ) + " ] ";
     }
-    TQString script = TQString::fromLatin1("require \"vacation\";\n\n" );
+    TQString script = TQString::tqfromLatin1("require \"vacation\";\n\n" );
     if ( !sendForSpam )
-      script += TQString::fromLatin1( "if header :contains \"X-Spam-Flag\" \"YES\""
+      script += TQString::tqfromLatin1( "if header :tqcontains \"X-Spam-Flag\" \"YES\""
                                      " { keep; stop; }\n" ); // FIXME?
 
     if ( !domain.isEmpty() ) // FIXME
-      script += TQString::fromLatin1( "if not address :domain :contains \"from\" \"%1\" { keep; stop; }\n" ).arg( domain );
+      script += TQString::tqfromLatin1( "if not address :domain :tqcontains \"from\" \"%1\" { keep; stop; }\n" ).arg( domain );
 
     script += "vacation ";
     script += addressesArgument;
     if ( notificationInterval > 0 )
-      script += TQString::fromLatin1(":days %1 ").arg( notificationInterval );
-    script += TQString::fromLatin1("text:\n");
+      script += TQString::tqfromLatin1(":days %1 ").arg( notificationInterval );
+    script += TQString::tqfromLatin1("text:\n");
     script += dotstuff( messageText.isEmpty() ? defaultMessageText() : messageText );
-    script += TQString::fromLatin1( "\n.\n;\n" );
+    script += TQString::tqfromLatin1( "\n.\n;\n" );
     return script;
   }
 
@@ -565,15 +565,15 @@ namespace KMail {
   TQString Vacation::defaultMessageText() {
     return i18n("I am out of office till %1.\n"
 		"\n"
-		"In urgent cases, please contact Mrs. <vacation replacement>\n"
+		"In urgent cases, please contact Mrs. <vacation tqreplacement>\n"
 		"\n"
-		"email: <email address of vacation replacement>\n"
+		"email: <email address of vacation tqreplacement>\n"
 		"phone: +49 711 1111 11\n"
 		"fax.:  +49 711 1111 12\n"
 		"\n"
 		"Yours sincerely,\n"
 		"-- <enter your name and email address here>\n")
-      .arg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) );
+      .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate().addDays( 1 ) ) );
   }
 
   int Vacation::defaultNotificationInterval() {
@@ -608,7 +608,7 @@ namespace KMail {
     mSieveJob = 0; // job deletes itself after returning from this slot!
 
     if ( !mCheckOnly && mUrl.protocol() == "sieve" && !job->sieveCapabilities().isEmpty() &&
-	 !job->sieveCapabilities().contains("vacation") ) {
+	 !job->sieveCapabilities().tqcontains("vacation") ) {
       KMessageBox::sorry( 0, i18n("Your server did not list \"vacation\" in "
 				  "its list of supported Sieve extensions;\n"
 				  "without it, KMail cannot install out-of-"
diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui
index 7ed3ec927..c2a4deb04 100644
--- a/kmail/warningconfiguration.ui
+++ b/kmail/warningconfiguration.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>WarningConfiguration</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -103,7 +103,7 @@ It is recommended to leave this option turned on for maximum security.
                     <property name="text">
                         <string>For signing</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -114,7 +114,7 @@ It is recommended to leave this option turned on for maximum security.
                     <property name="text">
                         <string>For encryption</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -329,7 +329,7 @@ The recommended SPHINX setting is 14 days.
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
@@ -357,7 +357,7 @@ The recommended SPHINX setting is 14 days.
         </spacer>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -373,7 +373,7 @@ The recommended SPHINX setting is 14 days.
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -404,5 +404,5 @@ The recommended SPHINX setting is 14 days.
     <tabstop>mWarnEncrRootCertExpiresSB</tabstop>
     <tabstop>enableAllWarningsPB</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index f88a3cd74..fee9b269f 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -84,7 +84,7 @@ namespace KMail {
     TQPushButton * mFromFileBtn;
     TQPushButton * mFromAddrbkBtn;
 
-    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" );
+    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" );
     hlay = new TQHBoxLayout( vlay );
 
     // "enable X-Face" checkbox:
@@ -147,7 +147,7 @@ namespace KMail {
     mFromFileBtn = new TQPushButton( i18n("Select File..."), page );
     TQWhatsThis::add( mFromFileBtn,
                      i18n("Use this to select an image file to create the picture from. "
-                         "The image should be of high contrast and nearly quadratic shape. "
+                         "The image should be of high contrast and nearly quadratic tqshape. "
                          "A light background helps improve the result." ) );
     mFromFileBtn->setAutoDefault( false );
     page_vlay->addWidget( mFromFileBtn, 1 );
@@ -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->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+    label1->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
     page_vlay->addWidget( label1 );
 
     widgetStack->raiseWidget( 0 ); // since mSourceCombo->currentItem() == 0
author	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-02-16 20:17:18 +0000
committer	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-02-16 20:17:18 +0000
commit	f4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
tree	d8c5d93232235cd635f3310b4d95490df181ba2d /kmail
parent	125c0a08265b75a133644d3b55f47e37c919f45d (diff)
download	tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip