Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 23 insertions, 23 deletions

diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index b919f88ed..93616ac8f 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -23,7 +23,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqradiobutton.h>
 #include <tqvalidator.h>
@@ -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.replace(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( TQt::AlignTop );
+  group->tqlayout()->setSpacing( 0 );
+  group->tqlayout()->setMargin( 0 );
+  TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() );
+  groupLayout->tqsetAlignment( TQt::AlignTop );
   groupLayout->setSpacing( 6 );
   groupLayout->setMargin( 11 );
 
@@ -905,7 +905,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   // button to reload
   TQToolButton* button = new TQToolButton( box );
   button->setAutoRaise(true);
-  button->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()));
@@ -1191,7 +1191,7 @@ void AccountDialog::setupSettings()
     mPop.loginEdit->setText( ap.login() );
     mPop.passwordEdit->setText( ap.passwd());
     mPop.hostEdit->setText( ap.host() );
-    mPop.portEdit->setText( TQString("%1").arg( ap.port() ) );
+    mPop.portEdit->setText( TQString("%1").tqarg( ap.port() ) );
     mPop.usePipeliningCheck->setChecked( ap.usePipelining() );
     mPop.storePasswordCheck->setChecked( ap.storePasswd() );
     mPop.leaveOnServerCheck->setChecked( ap.leaveOnServer() );
@@ -1256,7 +1256,7 @@ void AccountDialog::setupSettings()
     mImap.loginEdit->setText( ai.login() );
     mImap.passwordEdit->setText( ai.passwd());
     mImap.hostEdit->setText( ai.host() );
-    mImap.portEdit->setText( TQString("%1").arg( ai.port() ) );
+    mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) );
     mImap.autoExpungeCheck->setChecked( ai.autoExpunge() );
     mImap.hiddenFoldersCheck->setChecked( ai.hiddenFolders() );
     mImap.subscribedFoldersCheck->setChecked( ai.onlySubscribedFolders() );
@@ -1309,7 +1309,7 @@ void AccountDialog::setupSettings()
     mImap.loginEdit->setText( ai.login() );
     mImap.passwordEdit->setText( ai.passwd());
     mImap.hostEdit->setText( ai.host() );
-    mImap.portEdit->setText( TQString("%1").arg( ai.port() ) );
+    mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) );
 #if 0
     mImap.resourceCheck->setChecked( ai.resource() );
 #endif
@@ -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 "
@@ -2293,7 +2293,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
   } else {
     ns = i18n("Shared");
   }
-  setCaption( i18n("Edit Namespace '%1'").arg(ns) );
+  setCaption( i18n("Edit Namespace '%1'").tqarg(ns) );
   TQGrid* grid = new TQGrid( 2, page );
 
   mBg = new TQButtonGroup( 0 );
@@ -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;
   }