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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

8 files changed, 42 insertions, 42 deletions

diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp
index 3b24f2d4c..d0a9644e8 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.cpp
+++ b/kresources/scalix/scalixadmin/delegatedialog.cpp
@@ -20,7 +20,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqtoolbutton.h>
 
@@ -35,18 +35,18 @@ DelegateDialog::DelegateDialog( TQWidget *parent )
   : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
 {
   TQWidget *page = new TQWidget( this );
-  TQGridLayout *layout = new TQGridLayout( page, 5, 3, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 11, 6 );
 
   TQLabel *label = new TQLabel( i18n( "User:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mEmail = new TQLineEdit( page );
-  layout->addWidget( mEmail, 0, 1 );
+  tqlayout->addWidget( mEmail, 0, 1 );
 
   TQToolButton *emailSelector = new TQToolButton( page );
   emailSelector->setUsesTextLabel( true );
   emailSelector->setTextLabel( i18n( "..." ) );
-  layout->addWidget( emailSelector, 0, 2 );
+  tqlayout->addWidget( emailSelector, 0, 2 );
 
   TQValueList<Scalix::DelegateTypes> types;
   types << Scalix::SendOnBehalfOf;
@@ -57,7 +57,7 @@ DelegateDialog::DelegateDialog( TQWidget *parent )
   int row = 1;
   for ( uint i = 0; i < types.count(); ++i ) {
     TQCheckBox *box = new TQCheckBox( Scalix::Delegate::rightsAsString( types[ i ] ), page );
-    layout->addMultiCellWidget( box, row, row, 1, 2 );
+    tqlayout->addMultiCellWidget( box, row, row, 1, 2 );
 
     mRights.insert( types[ i ], box );
     row++;
diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp
index d1610d232..32b29d465 100644
--- a/kresources/scalix/scalixadmin/delegatepage.cpp
+++ b/kresources/scalix/scalixadmin/delegatepage.cpp
@@ -18,7 +18,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <kinputdialog.h>
@@ -37,21 +37,21 @@
 DelegatePage::DelegatePage( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
 
   mView = new DelegateView( &mManager, this );
-  layout->addMultiCellWidget( mView, 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( mView, 0, 0, 0, 2 );
 
   mAddButton = new TQPushButton( i18n( "Add Delegate..." ), this );
-  layout->addWidget( mAddButton, 1, 0 );
+  tqlayout->addWidget( mAddButton, 1, 0 );
 
   mEditButton = new TQPushButton( i18n( "Edit Delegate..." ), this );
   mEditButton->setEnabled( false );
-  layout->addWidget( mEditButton, 1, 1 );
+  tqlayout->addWidget( mEditButton, 1, 1 );
 
   mRemoveButton = new TQPushButton( i18n( "Remove Delegate" ), this );
   mRemoveButton->setEnabled( false );
-  layout->addWidget( mRemoveButton, 1, 2 );
+  tqlayout->addWidget( mRemoveButton, 1, 2 );
 
   connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addDelegate() ) );
diff --git a/kresources/scalix/scalixadmin/jobs.cpp b/kresources/scalix/scalixadmin/jobs.cpp
index f1bce9f2c..2d6823918 100644
--- a/kresources/scalix/scalixadmin/jobs.cpp
+++ b/kresources/scalix/scalixadmin/jobs.cpp
@@ -73,7 +73,7 @@ SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url,
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'X' << (int)'N'
-         << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).arg( oldPassword ).arg( newPassword );
+         << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).tqarg( oldPassword ).tqarg( newPassword );
 
   SetPasswordJob* job = new SetPasswordJob( url, packedArgs, false );
   KIO::Scheduler::assignJobToSlave( slave, job );
@@ -95,7 +95,7 @@ SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const T
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'X' << (int)'N'
-         << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).arg( email ).arg( types.join( " " ) );
+         << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).tqarg( email ).tqarg( types.join( " " ) );
 
   SetDelegateJob* job = new SetDelegateJob( url, packedArgs, false );
   KIO::Scheduler::assignJobToSlave( slave, job );
@@ -164,9 +164,9 @@ GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url )
 SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg )
 {
   const TQString argument = msg;
-  const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).arg( enabled ? "ENABLED" : "DISABLED" )
-                                                .arg( "UTF-8" )
-                                                .arg( msg.utf8().length() );
+  const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).tqarg( enabled ? "ENABLED" : "DISABLED" )
+                                                .tqarg( "UTF-8" )
+                                                .tqarg( msg.utf8().length() );
 
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/kresources/scalix/scalixadmin/ldapview.cpp
index adf2fe3fa..b52c0aad9 100644
--- a/kresources/scalix/scalixadmin/ldapview.cpp
+++ b/kresources/scalix/scalixadmin/ldapview.cpp
@@ -85,8 +85,8 @@ void LdapView::setQuery( const TQString &query )
 
 void LdapView::entryAdded( const KABC::LdapObject &obj )
 {
-  const TQString text = TQString( "%1 (%2)" ).arg( TQString(obj.attrs[ "surname" ].first()) )
-                                           .arg( TQString(obj.attrs[ "mail" ].first()) );
+  const TQString text = TQString( "%1 (%2)" ).tqarg( TQString(obj.attrs[ "surname" ].first()) )
+                                           .tqarg( TQString(obj.attrs[ "mail" ].first()) );
 
   new LdapItem( this, text, obj.attrs[ "mail" ].first() );
 }
diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp
index daec37f2d..ab5a417a9 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.cpp
+++ b/kresources/scalix/scalixadmin/otheruserpage.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <dcopref.h>
@@ -40,17 +40,17 @@
 OtherUserPage::OtherUserPage( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 2, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, 11, 6 );
 
   mView = new OtherUserView( &mManager, this );
-  layout->addMultiCellWidget( mView, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( mView, 0, 0, 0, 1 );
 
   mAddButton = new TQPushButton( i18n( "Add Account..." ), this );
-  layout->addWidget( mAddButton, 1, 0 );
+  tqlayout->addWidget( mAddButton, 1, 0 );
 
   mDeleteButton = new TQPushButton( i18n( "Remove Account" ), this );
   mDeleteButton->setEnabled( false );
-  layout->addWidget( mDeleteButton, 1, 1 );
+  tqlayout->addWidget( mDeleteButton, 1, 1 );
 
   connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) );
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index deb01a7d6..401d4de18 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -20,10 +20,10 @@
 
 #include <tqbuttongroup.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -36,7 +36,7 @@
 OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
 
   TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this );
 
@@ -48,10 +48,10 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
   mMessage = new TQTextEdit( this );
   mSaveButton = new TQPushButton( i18n( "Save" ), this );
 
-  layout->addMultiCellWidget( group, 0, 0, 0, 1 );
-  layout->addMultiCellWidget( mLabel, 1, 1, 0, 1 );
-  layout->addMultiCellWidget( mMessage, 2, 2, 0, 1 );
-  layout->addWidget( mSaveButton, 3, 1 );
+  tqlayout->addMultiCellWidget( group, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( mLabel, 1, 1, 0, 1 );
+  tqlayout->addMultiCellWidget( mMessage, 2, 2, 0, 1 );
+  tqlayout->addWidget( mSaveButton, 3, 1 );
 
   statusChanged();
 
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index ba7f25a07..51b11f6ff 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -20,7 +20,7 @@
 
 #include <tqapplication.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 
@@ -38,29 +38,29 @@
 PasswordPage::PasswordPage( TQWidget *parent )
   : TQWidget( parent ), mJob( 0 )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
 
   TQLabel *label = new TQLabel( i18n( "New password:" ), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mPassword = new TQLineEdit( this );
   mPassword->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPassword );
-  layout->addWidget( mPassword, 0, 1 );
+  tqlayout->addWidget( mPassword, 0, 1 );
 
   label = new TQLabel( i18n( "Retype new password:" ), this );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mPasswordRetype = new TQLineEdit( this );
   mPasswordRetype->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPasswordRetype );
-  layout->addWidget( mPasswordRetype, 1, 1 );
+  tqlayout->addWidget( mPasswordRetype, 1, 1 );
 
   mButton = new TQPushButton( i18n( "Change" ), this );
   mButton->setEnabled( false );
-  layout->addWidget( mButton, 2, 1 );
+  tqlayout->addWidget( mButton, 2, 1 );
 
-  layout->setRowSpacing( 3, 1 );
+  tqlayout->setRowSpacing( 3, 1 );
 
   connect( mPassword, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) );
   connect( mPasswordRetype, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) );
@@ -179,7 +179,7 @@ void PasswordPage::finished( KIO::Job* job )
         group.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
       }
 
-      KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) );
+      KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).tqarg( group.readNumEntry( "Folder" ) ) );
       fileGroup.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
     }
   }
diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp
index 52f72296f..d5c5cdb1c 100644
--- a/kresources/scalix/scalixadmin/settings.cpp
+++ b/kresources/scalix/scalixadmin/settings.cpp
@@ -92,8 +92,8 @@ TQString Settings::rulesWizardUrl() const
   TQString url = group.readEntry( "rulesWizardUrl" );
   if ( url.isEmpty() ) {
     KConfigGroup group( &config, "Account" );
-    url = TQString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) )
-                                                       .arg( group.readEntry( "user" ) );
+    url = TQString( "http://%1/Scalix/rw/?username=%2" ).tqarg( group.readEntry( "host" ) )
+                                                       .tqarg( group.readEntry( "user" ) );
   }
 
   return url;