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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

11 files changed, 42 insertions, 42 deletions

diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp
index 6279596d1..444e2d453 100644
--- a/wizards/egroupwarewizard.cpp
+++ b/wizards/egroupwarewizard.cpp
@@ -36,7 +36,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 
 
@@ -347,7 +347,7 @@ EGroupwareWizard::EGroupwareWizard() : KConfigWizard( new EGroupwarePropagator )
   setupRulesPage();
   setupChangesPage();
 
-  resize( sizeHint() );
+  resize( tqsizeHint() );
 }
 
 EGroupwareWizard::~EGroupwareWizard()
diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp
index 3705b107e..84c2a13d1 100644
--- a/wizards/exchangewizard.cpp
+++ b/wizards/exchangewizard.cpp
@@ -30,7 +30,7 @@
 #include <klineedit.h>
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp
index 592ffa759..ef8a2b514 100644
--- a/wizards/groupwarewizard.cpp
+++ b/wizards/groupwarewizard.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 
@@ -33,11 +33,11 @@ GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name )
 {
   setCaption( i18n( "KDE Groupware Wizard" ) );
 
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   mOverViewPage = new OverViewPage( this );
 
-  layout->addWidget( mOverViewPage );
+  tqlayout->addWidget( mOverViewPage );
 
   connect( mOverViewPage, TQT_SIGNAL( cancel() ),
            tqApp, TQT_SLOT( quit() ) );
diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp
index 3009e93a1..b28095bce 100644
--- a/wizards/groupwisewizard.cpp
+++ b/wizards/groupwisewizard.cpp
@@ -36,7 +36,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 #include <tqgroupbox.h>
 
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index 191ea8436..160b63eae 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -176,7 +176,7 @@ void CreateDisconnectedImapAccount::apply()
     transportId = mExistingTransportId;
   }
 
-  c.setGroup( TQString("Account %1").arg( accountId ) );
+  c.setGroup( TQString("Account %1").tqarg( accountId ) );
   int uid;
   if ( mExistingAccountId < 0 ) {
     uid = kapp->random();
@@ -240,7 +240,7 @@ void CreateDisconnectedImapAccount::apply()
   }
 
 
-  c.setGroup( TQString("Folder-%1").arg( uid ) );
+  c.setGroup( TQString("Folder-%1").tqarg( uid ) );
   c.writeEntry( "isOpen", true );
 
   c.setGroup(  "AccountWizard"  );
@@ -249,7 +249,7 @@ void CreateDisconnectedImapAccount::apply()
   c.setGroup( "Composer" );
   c.writeEntry( "default-transport", mAccountName );
 
-  c.setGroup( TQString("Transport %1").arg( transportId ) );
+  c.setGroup( TQString("Transport %1").tqarg( transportId ) );
   c.writeEntry( "name", mAccountName );
   c.writeEntry( "host", mServer );
   c.writeEntry( "type", "smtp" );
@@ -318,7 +318,7 @@ void CreateOnlineImapAccount::apply()
   uint accCnt = c.readNumEntry( "accounts", 0 );
   c.writeEntry( "accounts", accCnt+1 );
 
-  c.setGroup( TQString("Account %1").arg(accCnt+1) );
+  c.setGroup( TQString("Account %1").tqarg(accCnt+1) );
   int uid = kapp->random();
   c.writeEntry( "Folder", uid );
   c.writeEntry( "Id", uid );
@@ -354,12 +354,12 @@ void CreateOnlineImapAccount::apply()
   // locally unsubscribe the default folders
   c.writeEntry( "locally-subscribed-folders", true );
   TQString groupwareFolders = TQString("/INBOX/%1/,/INBOX/%2/,/INBOX/%3/,/INBOX/%4/,/INBOX/%5/")
-      .arg( i18n(s_folderContentsType[0]) ).arg( i18n(s_folderContentsType[1]) )
-      .arg( i18n(s_folderContentsType[2]) ).arg( i18n(s_folderContentsType[3]) )
-      .arg( i18n(s_folderContentsType[4]) );
+      .tqarg( i18n(s_folderContentsType[0]) ).tqarg( i18n(s_folderContentsType[1]) )
+      .tqarg( i18n(s_folderContentsType[2]) ).tqarg( i18n(s_folderContentsType[3]) )
+      .tqarg( i18n(s_folderContentsType[4]) );
   c.writeEntry( "locallyUnsubscribedFolders", groupwareFolders );
 
-  c.setGroup( TQString("Folder-%1").arg( uid ) );
+  c.setGroup( TQString("Folder-%1").tqarg( uid ) );
   c.writeEntry( "isOpen", true );
 
 
diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp
index a77de3037..8f66e5b33 100644
--- a/wizards/kolabkmailchanges.cpp
+++ b/wizards/kolabkmailchanges.cpp
@@ -34,7 +34,7 @@ class KolabCustomWriter : public CreateDisconnectedImapAccount::CustomWriter
   {
     c.setGroup( "IMAP Resource" );
     c.writeEntry( "TheIMAPResourceAccount", id );
-    c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").arg( id ) );
+    c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").tqarg( id ) );
   }
   void writeIds( int, int ) {}
 };
diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp
index 37feb3291..36e99bfba 100644
--- a/wizards/kolabwizard.cpp
+++ b/wizards/kolabwizard.cpp
@@ -38,7 +38,7 @@
 #include <tqcheckbox.h>
 #include <tqhbuttongroup.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqwhatsthis.h>
 
@@ -81,13 +81,13 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
       bool hasMyServer = false;
       uint selHosts = c.readNumEntry("NumSelectedHosts", 0);
       for ( uint i = 0 ; i < selHosts && !hasMyServer; ++i )
-        if ( c.readEntry( TQString("SelectedHost%1").arg(i) ) == host )
+        if ( c.readEntry( TQString("SelectedHost%1").tqarg(i) ) == host )
           hasMyServer = true;
       if ( !hasMyServer ) {
         c.writeEntry( "NumSelectedHosts", selHosts + 1 );
-        c.writeEntry( TQString("SelectedHost%1").arg(selHosts), host);
-        c.writeEntry( TQString("SelectedBase%1").arg(selHosts), basedn);
-        c.writeEntry( TQString("SelectedPort%1").arg(selHosts), "389");
+        c.writeEntry( TQString("SelectedHost%1").tqarg(selHosts), host);
+        c.writeEntry( TQString("SelectedBase%1").tqarg(selHosts), basedn);
+        c.writeEntry( TQString("SelectedPort%1").tqarg(selHosts), "389");
       }
     }
 
diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp
index 4ed6c4acf..15df0246f 100644
--- a/wizards/overviewpage.cpp
+++ b/wizards/overviewpage.cpp
@@ -21,7 +21,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 
 #include <kaccelmanager.h>
@@ -43,29 +43,29 @@
 OverViewPage::OverViewPage( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 7, 4, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 7, 4, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   const TQString msg = i18n( "KDE Groupware Wizard" );
   TQLabel *label = new TQLabel( "<qt><b><u><h2>" + msg + "</h2></u></b></qt>" , this );
-  layout->addMultiCellWidget( label, 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( label, 0, 0, 0, 2 );
 
   label = new TQLabel( this );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "network", KIcon::Desktop ) );
-  layout->addWidget( label, 0, 3 );
+  tqlayout->addWidget( label, 0, 3 );
 
   label = new TQLabel( "", this );
-  layout->addWidget( label, 1, 0 );
-  layout->setRowSpacing( 1, 20 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->setRowSpacing( 1, 20 );
 
   label = new TQLabel( i18n( "Select the type of server you want connect your KDE to:" ), this );
-  layout->addMultiCellWidget( label, 2, 2, 0, 3 );
+  tqlayout->addMultiCellWidget( label, 2, 2, 0, 3 );
 
   TQPushButton *button;
 
 #ifdef WITH_EGROUPWARE
   button = new TQPushButton( i18n("eGroupware"), this );
-  layout->addMultiCellWidget( button, 3, 3, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 3, 3, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardEGroupware() ) );
 #endif
 
@@ -73,33 +73,33 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name )
 
 #ifdef WITH_KOLAB
   button = new TQPushButton( i18n("Kolab"), this );
-  layout->addMultiCellWidget( button, 4, 4, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 4, 4, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardKolab() ) );
 #endif
 
 #ifdef WITH_SLOX
   button = new TQPushButton( i18n("SUSE Linux Openexchange (SLOX)"), this );
-  layout->addMultiCellWidget( button, 5, 5, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 5, 5, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardSlox() ) );
 #endif
 
 #ifdef WITH_NEWEXCHANGE
   button = new TQPushButton( i18n("Microsoft Exchange"), this );
   button->hide(); // not quite ready yet
-  layout->addMultiCellWidget( button, 6, 6, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 6, 6, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardExchange() ) );
 #endif
 
   TQFrame *frame = new TQFrame( this );
   frame->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  layout->addMultiCellWidget( frame, 7, 7, 0, 3 );
+  tqlayout->addMultiCellWidget( frame, 7, 7, 0, 3 );
 
   TQPushButton *cancelButton = new KPushButton( KStdGuiItem::close(), this );
-  layout->addWidget( cancelButton, 8, 3 );
+  tqlayout->addWidget( cancelButton, 8, 3 );
 
   connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancel() ) );
 
-  layout->setRowStretch( 7, 1 );
+  tqlayout->setRowStretch( 7, 1 );
 
   KAcceleratorManager::manage( this );
 }
diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp
index 56c18afe9..221e53d61 100644
--- a/wizards/scalixkmailchanges.cpp
+++ b/wizards/scalixkmailchanges.cpp
@@ -34,7 +34,7 @@ class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter
   {
     c.setGroup( "IMAP Resource" );
     c.writeEntry( "TheIMAPResourceAccount", id );
-    c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").arg( id ) );
+    c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").tqarg( id ) );
     c.writeEntry( "HideGroupwareFolders", false );
   }
   void writeIds( int, int ) {}
diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp
index e1e1954c1..b9ecfa10f 100644
--- a/wizards/scalixwizard.cpp
+++ b/wizards/scalixwizard.cpp
@@ -43,7 +43,7 @@
 #include <tqcheckbox.h>
 #include <tqhbuttongroup.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 
 #include <unistd.h>
@@ -74,13 +74,13 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
       bool hasMyServer = false;
       uint selHosts = c.readNumEntry("NumSelectedHosts", 0);
       for ( uint i = 0 ; i < selHosts && !hasMyServer; ++i )
-        if ( c.readEntry( TQString("SelectedHost%1").arg(i) ) == host )
+        if ( c.readEntry( TQString("SelectedHost%1").tqarg(i) ) == host )
           hasMyServer = true;
       if ( !hasMyServer ) {
         c.writeEntry( "NumSelectedHosts", selHosts + 1 );
-        c.writeEntry( TQString("SelectedHost%1").arg(selHosts), host);
-        c.writeEntry( TQString("SelectedBase%1").arg(selHosts), basedn);
-        c.writeEntry( TQString("SelectedPort%1").arg(selHosts), "389");
+        c.writeEntry( TQString("SelectedHost%1").tqarg(selHosts), host);
+        c.writeEntry( TQString("SelectedBase%1").tqarg(selHosts), basedn);
+        c.writeEntry( TQString("SelectedPort%1").tqarg(selHosts), "389");
       }
     }
 
diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp
index b65e519c9..5d5481b94 100644
--- a/wizards/sloxwizard.cpp
+++ b/wizards/sloxwizard.cpp
@@ -31,7 +31,7 @@
 #include <klineedit.h>
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>