Rename obsolete tq methods to standard names

15 files changed, 137 insertions, 137 deletions

diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index 723f2974..6d884f9f 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -51,7 +51,7 @@ static TQString readFile( const TQString &fileName )
 AboutPage::AboutPage( TQWidget *parent )
   : TQWidget( parent, "AboutPage" )
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
 
   TQString location = locate( "data", "kitchensync/about/main.html" );
   TQString content = readFile( location );
@@ -62,7 +62,7 @@ AboutPage::AboutPage( TQWidget *parent )
     content = content.arg( "" );
 
   KHTMLPart *part = new KHTMLPart( this );
-  tqlayout->addWidget( part->view() );
+  layout->addWidget( part->view() );
 
   part->begin( KURL( location ) );
 
diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp
index 716bce78..c313ce3a 100644
--- a/kitchensync/src/configguievo2.cpp
+++ b/kitchensync/src/configguievo2.cpp
@@ -71,21 +71,21 @@ TQString ConfigGuiEvo2::save() const
 
 void ConfigGuiEvo2::initGUI()
 {
-  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  tqlayout->setMargin( KDialog::marginHint() );
+  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  layout->setMargin( KDialog::marginHint() );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 );
+  layout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 );
   mAddressPath = new KURLRequester( this );
   mAddressPath->setMode( KFile::Directory );
-  tqlayout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 );
+  layout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 );
+  layout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 );
   mCalendarPath = new KURLRequester( this );
   mCalendarPath->setMode( KFile::Directory );
-  tqlayout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 );
+  layout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 );
+  layout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 );
   mTasksPath = new KURLRequester( this );
   mTasksPath->setMode( KFile::Directory );
-  tqlayout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 );
+  layout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 );
 }
diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp
index 84db0275..38f2fbf3 100644
--- a/kitchensync/src/configguignokii.cpp
+++ b/kitchensync/src/configguignokii.cpp
@@ -37,14 +37,14 @@
 ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
+  TQGridLayout *layout = new TQGridLayout( topLayout() );
 
   // Model
   TQLabel *label = new TQLabel( i18n("Model:"), this );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
 
   mModel = new KComboBox( true, this );
-  tqlayout->addWidget( mModel, 0, 1 );
+  layout->addWidget( mModel, 0, 1 );
   mModel->insertItem( "2110" ); 
   mModel->insertItem( "3110" ); 
   mModel->insertItem( "6110" ); 
@@ -67,10 +67,10 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
 
   // Connection
   label = new TQLabel( i18n("Connection:"), this );
-  tqlayout->addWidget( label, 1, 0 );
+  layout->addWidget( label, 1, 0 );
 
   mConnection = new TQComboBox( this );
-  tqlayout->addWidget( mConnection, 1, 1 );
+  layout->addWidget( mConnection, 1, 1 );
 
   connect( mConnection, TQT_SIGNAL (activated( int ) ),
       	    this, TQT_SLOT( slotConnectionChanged ( int ) ) );
@@ -100,15 +100,15 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
   mBluetooth = new BluetoothWidget( connectionWidget ); 
   mBluetooth->hide();
 
-  tqlayout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
+  layout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
 
   // Port
   mPortLabel = new TQLabel( i18n("Port:"), this );
-  tqlayout->addWidget( mPortLabel, 2, 0 );
+  layout->addWidget( mPortLabel, 2, 0 );
   mPortLabel->hide();
 
   mPort = new KComboBox( true, this );
-  tqlayout->addWidget( mPort, 2, 1 );
+  layout->addWidget( mPort, 2, 1 );
   mPort->hide();
 
   mPort->insertItem( "/dev/ircomm0" );
@@ -118,7 +118,7 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
   mPort->insertItem( "/dev/ttyUSB0" );
   mPort->insertItem( "/dev/ttyUSB1" );
 
-  tqlayout->setColStretch( 1, 1 );
+  layout->setColStretch( 1, 1 );
 
   topLayout()->addStretch( 1 );
 }
diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
index c6e6627f..1a5cdb14 100644
--- a/kitchensync/src/configguigpe.cpp
+++ b/kitchensync/src/configguigpe.cpp
@@ -81,23 +81,23 @@ TQString ConfigGuiGpe::save() const
 
 void ConfigGuiGpe::initGUI()
 {
-  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
-  tqlayout->setMargin( KDialog::marginHint() );
+  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
+  layout->setMargin( KDialog::marginHint() );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
+  layout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
   mConnectionMode = new KComboBox( this );
-  tqlayout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
+  layout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
 
-  tqlayout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
+  layout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
   mIP = new KLineEdit( this );
   mIP->setInputMask( "000.000.000.000" );
-  tqlayout->addWidget( mIP, 1, 1 );
+  layout->addWidget( mIP, 1, 1 );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight );
+  layout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight );
   mPort = new TQSpinBox( 1, 65536, 1, this );
-  tqlayout->addWidget( mPort, 1, 3 );
+  layout->addWidget( mPort, 1, 3 );
 
-  tqlayout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
+  layout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
   mUser = new KLineEdit( this );
-  tqlayout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
+  layout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
 }
diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp
index 158eb225..2b37ad42 100644
--- a/kitchensync/src/configguijescs.cpp
+++ b/kitchensync/src/configguijescs.cpp
@@ -76,23 +76,23 @@ TQString ConfigGuiJescs::save() const
 
 void ConfigGuiJescs::initGUI()
 {
-  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  tqlayout->setMargin( KDialog::marginHint() );
+  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  layout->setMargin( KDialog::marginHint() );
 
-  tqlayout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 );
+  layout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 );
   mUrl = new KLineEdit( this );
-  tqlayout->addMultiCellWidget( mUrl, 0, 0, 1, 2 );
+  layout->addMultiCellWidget( mUrl, 0, 0, 1, 2 );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 );
+  layout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 );
   mUsername = new KLineEdit( this );
-  tqlayout->addMultiCellWidget( mUsername, 1, 1, 1, 2 );
+  layout->addMultiCellWidget( mUsername, 1, 1, 1, 2 );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 );
+  layout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 );
   mPassword = new KLineEdit( this );
   mPassword->setEchoMode( KLineEdit::Password );
-  tqlayout->addMultiCellWidget( mPassword, 2, 2, 1, 2 );
+  layout->addMultiCellWidget( mPassword, 2, 2, 1, 2 );
 
   mDelNotify = new TQCheckBox( this );
   mDelNotify->setText( "Notify attendees about event/task deletion" );
-  tqlayout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 );
+  layout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 );
 }
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index 417e58d0..3ef451c3 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -121,8 +121,8 @@ TQString ConfigGuiLdap::save() const
 
 void ConfigGuiLdap::initGUI()
 {
-  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
-  tqlayout->setMargin( KDialog::marginHint() );
+  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
+  layout->setMargin( KDialog::marginHint() );
 
   mLdapWidget = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_HOST |
                                             KABC::LdapConfigWidget::W_PORT |
@@ -139,14 +139,14 @@ void ConfigGuiLdap::initGUI()
   mReadLdap = new TQCheckBox( i18n( "Load data from LDAP" ), this );
   mWriteLdap = new TQCheckBox( i18n( "Save data to LDAP" ), this );
 
-  tqlayout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
-  tqlayout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
-  tqlayout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
-  tqlayout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
-  tqlayout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
-  tqlayout->addWidget( mEncryption, 12, 0 );
-  tqlayout->addWidget( mReadLdap, 13, 0 );
-  tqlayout->addWidget( mWriteLdap, 13, 3 );
+  layout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
+  layout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
+  layout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
+  layout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
+  layout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
+  layout->addWidget( mEncryption, 12, 0 );
+  layout->addWidget( mReadLdap, 13, 0 );
+  layout->addWidget( mWriteLdap, 13, 3 );
 
 }
 
diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
index c44a2b40..a310692f 100644
--- a/kitchensync/src/configguimoto.cpp
+++ b/kitchensync/src/configguimoto.cpp
@@ -62,10 +62,10 @@ TQString ConfigGuiMoto::save() const
 
 void ConfigGuiMoto::initGUI()
 {
-  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  tqlayout->setMargin( KDialog::marginHint() );
+  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  layout->setMargin( KDialog::marginHint() );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
+  layout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
   mDeviceString = new KLineEdit( this );
-  tqlayout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
+  layout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
 }
diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp
index 64bd816f..39a7ea77 100644
--- a/kitchensync/src/configguiopie.cpp
+++ b/kitchensync/src/configguiopie.cpp
@@ -33,52 +33,52 @@
 ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
+  TQGridLayout *layout = new TQGridLayout( topLayout() );
 
   TQLabel *label = new TQLabel( i18n("Device IP:"), this );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
 
   mDeviceIP = new TQLineEdit( this );
   mDeviceIP->setInputMask( "000.000.000.000" );
   label->setBuddy( mDeviceIP );
-  tqlayout->addWidget( mDeviceIP, 0, 1 );
+  layout->addWidget( mDeviceIP, 0, 1 );
 
   label = new TQLabel( i18n("Device Type:"), this );
-  tqlayout->addWidget( label, 1, 0 );
+  layout->addWidget( label, 1, 0 );
 
   mDeviceType = new TQComboBox( this );
   label->setBuddy( mDeviceType );
-  tqlayout->addWidget( mDeviceType, 1, 1 );
+  layout->addWidget( mDeviceType, 1, 1 );
 
   label = new TQLabel( i18n("Username:"), this );
-  tqlayout->addWidget( label, 2, 0 );
+  layout->addWidget( label, 2, 0 );
 
   mUserName = new TQLineEdit( this );
   label->setBuddy( mUserName );
-  tqlayout->addWidget( mUserName, 2, 1 );
+  layout->addWidget( mUserName, 2, 1 );
 
   label = new TQLabel( i18n("Password:"), this );
-  tqlayout->addWidget( label, 3, 0 );
+  layout->addWidget( label, 3, 0 );
 
   mPassword = new TQLineEdit( this );
   mPassword->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPassword );
-  tqlayout->addWidget( mPassword, 3, 1 );
+  layout->addWidget( mPassword, 3, 1 );
 
   label = new TQLabel( i18n("Protocol:"), this );
-  tqlayout->addWidget( label, 4, 0 );
+  layout->addWidget( label, 4, 0 );
 
   mConnectionType = new TQComboBox( this );
   label->setBuddy( mConnectionType );
-  tqlayout->addWidget( mConnectionType, 4, 1 );
+  layout->addWidget( mConnectionType, 4, 1 );
 
   label = new TQLabel( i18n("Port:"), this );
-  tqlayout->addWidget( label, 5, 0 );
+  layout->addWidget( label, 5, 0 );
 
   mPort = new TQSpinBox( this );
   mPort->setRange( 0, 65335 );
   label->setBuddy( mPort );
-  tqlayout->addWidget( mPort, 5, 1 );
+  layout->addWidget( mPort, 5, 1 );
 
   mDeviceType->insertItem( i18n("Opie/OpenZaurus") );
   mDeviceType->insertItem( i18n("TQtopia2") );
diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp
index b83e8568..6e521bee 100644
--- a/kitchensync/src/configguisynce.cpp
+++ b/kitchensync/src/configguisynce.cpp
@@ -72,22 +72,22 @@ TQString ConfigGuiSynce::save() const
 
 void ConfigGuiSynce::initGUI()
 {
-  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() );
-  tqlayout->setMargin( KDialog::marginHint() );
+  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() );
+  layout->setMargin( KDialog::marginHint() );
 
   mContacts = new TQCheckBox( this );
   mContacts->setText( "Sync Contacts" );
-  tqlayout->addMultiCellWidget( mContacts, 0, 0, 0, 1 );
+  layout->addMultiCellWidget( mContacts, 0, 0, 0, 1 );
 
   mTodos = new TQCheckBox( this );
   mTodos->setText( "Sync \'Todo\' items" );
-  tqlayout->addMultiCellWidget( mTodos, 1, 1, 0, 1 );
+  layout->addMultiCellWidget( mTodos, 1, 1, 0, 1 );
 
   mCalendar = new TQCheckBox( this );
   mCalendar->setText( "Sync Calendar" );
-  tqlayout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 );
+  layout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 );
 
-  tqlayout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 );
+  layout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 );
   mFile = new KLineEdit( this );
-  tqlayout->addWidget( mFile, 3, 1 );
+  layout->addWidget( mFile, 3, 1 );
 }
diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp
index bb25c271..ac5277fb 100644
--- a/kitchensync/src/connectionwidgets.cpp
+++ b/kitchensync/src/connectionwidgets.cpp
@@ -43,24 +43,24 @@
 BluetoothWidget::BluetoothWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this );
+  TQGridLayout *layout = new TQGridLayout( this );
 
   mAddress = new KLineEdit( this );
   mAddress->setInputMask( ">NN:NN:NN:NN:NN:NN;" );
-  tqlayout->addWidget( mAddress, 1, 0 );
+  layout->addWidget( mAddress, 1, 0 );
 
   TQLabel *label = new TQLabel( i18n( "Bluetooth address:" ), this );
   label->setBuddy( mAddress );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
 
   mChannel = new KLineEdit( this );
-  tqlayout->addWidget( mChannel, 1, 1 );
+  layout->addWidget( mChannel, 1, 1 );
 
   mChannelLabel = new TQLabel( i18n( "Channel:" ), this );
   mChannelLabel->setBuddy( mChannel );
-  tqlayout->addWidget( mChannelLabel, 0, 1 );
+  layout->addWidget( mChannelLabel, 0, 1 );
 
-  tqlayout->setRowStretch( 2, 1 );
+  layout->setRowStretch( 2, 1 );
 }
 
 void BluetoothWidget::hideChannel()
@@ -103,23 +103,23 @@ TQString BluetoothWidget::channel() const
 IRWidget::IRWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, 11, 3 );
+  TQGridLayout *layout = new TQGridLayout( this, 3, 3, 11, 3 );
 
   mDevice = new KLineEdit( this );
   mSerialNumber = new KLineEdit( this );
 
-  tqlayout->addWidget( mDevice, 1, 0 );
-  tqlayout->addWidget( mSerialNumber, 1, 1 );
+  layout->addWidget( mDevice, 1, 0 );
+  layout->addWidget( mSerialNumber, 1, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Device Name:" ), this );
   label->setBuddy( mDevice );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
 
   label = new TQLabel( i18n( "Serial Number:" ), this );
   label->setBuddy( mSerialNumber );
-  tqlayout->addWidget( label, 0, 1 );
+  layout->addWidget( label, 0, 1 );
 
-  tqlayout->setRowStretch( 2, 1 );
+  layout->setRowStretch( 2, 1 );
 }
 
 void IRWidget::load( const TQDomElement &parent )
@@ -149,23 +149,23 @@ void IRWidget::save( TQDomDocument &doc, TQDomElement &parent )
 CableWidget::CableWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3 );
+  TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3 );
 
   mManufacturer = new KComboBox( this );
   mDevice = new KComboBox( true, this );
 
-  tqlayout->addWidget( mManufacturer, 0, 1 );
-  tqlayout->addWidget( mDevice, 1, 1 );
+  layout->addWidget( mManufacturer, 0, 1 );
+  layout->addWidget( mDevice, 1, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Device Manufacturer:" ), this );
   label->setBuddy( mManufacturer );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
 
   label = new TQLabel( i18n( "Device:" ), this );
   label->setBuddy( mDevice );
-  tqlayout->addWidget( label, 1, 0 );
+  layout->addWidget( label, 1, 0 );
 
-  tqlayout->setRowStretch( 2, 1 );
+  layout->setRowStretch( 2, 1 );
 
   mManufacturer->insertItem( i18n( "SonyEricsson/Ericsson" ) );
   mManufacturer->insertItem( i18n( "Siemens" ) );
@@ -202,16 +202,16 @@ void CableWidget::save( TQDomDocument &doc, TQDomElement &parent )
 UsbWidget::UsbWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3);
+  TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3);
 
   mInterface = new TQSpinBox( this );
-  tqlayout->addWidget( mInterface, 0, 1 );
+  layout->addWidget( mInterface, 0, 1 );
 
   TQLabel *label = new TQLabel( i18n( "USB Interface:" ), this );
   label->setBuddy( mInterface );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
 
-  tqlayout->setRowStretch( 2, 1 );
+  layout->setRowStretch( 2, 1 );
 }
 
 void UsbWidget::setInterface( int interface )
diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
index 5a0cf49d..b418af56 100644
--- a/kitchensync/src/groupconfigcommon.cpp
+++ b/kitchensync/src/groupconfigcommon.cpp
@@ -41,8 +41,8 @@
 ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this );
-  tqlayout->setMargin( 0 );
+  TQGridLayout *layout = new TQGridLayout( this );
+  layout->setMargin( 0 );
 
   const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion();
 
@@ -78,7 +78,7 @@ ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
       continue;
 
     TQCheckBox *objectCheckBox = new TQCheckBox( objectTypeMap[ objectType ], this );
-    tqlayout->addWidget( objectCheckBox, row, col );
+    layout->addWidget( objectCheckBox, row, col );
     mObjectTypeChecks.insert( objectType, objectCheckBox );
 
     col++;
@@ -128,19 +128,19 @@ void ObjectTypeSelector::save( QSync::Group group )
 GroupConfigCommon::GroupConfigCommon( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
+  layout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
 
   mGroupName = new KLineEdit( this );
-  tqlayout->addWidget( mGroupName, 0, 1 );
+  layout->addWidget( mGroupName, 0, 1 );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, TQt::AlignTop );
+  layout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, TQt::AlignTop );
 
   mObjectTypeSelector = new ObjectTypeSelector( this );
-  tqlayout->addWidget( mObjectTypeSelector, 1, 1 );
+  layout->addWidget( mObjectTypeSelector, 1, 1 );
 
-  tqlayout->setRowStretch( 2, 1 );
+  layout->setRowStretch( 2, 1 );
 }
 
 void GroupConfigCommon::setSyncProcess( SyncProcess *syncProcess )
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index 5409fc17..08b12625 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -50,7 +50,7 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
   boldFont.setBold( true );
   boldFont.setPointSize( boldFont.pointSize() + 2 );
 
-  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() );
 
   mBox = new TQVBox( this );
   mBox->setMargin( 5 );
@@ -93,16 +93,16 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
   hbox->setPaletteBackgroundColor( colorGroup().mid() );
   hbox->setMaximumHeight( hbox->minimumSizeHint().height() );
 
-  tqlayout->addMultiCellWidget( hbox, 0, 0, 0, 3 );
-  tqlayout->addMultiCellWidget( mBox, 1, 1, 0, 3 );
-  tqlayout->addWidget( mTime, 2, 0 );
-  tqlayout->addWidget( mSyncAction, 2, 1 );
-  tqlayout->addWidget( mConfigureAction, 2, 2 );
-  tqlayout->addWidget( mProgressBar, 2, 3 );
-  tqlayout->setColStretch( 0, 1 );
-  tqlayout->setRowStretch( 3, 1 );
+  layout->addMultiCellWidget( hbox, 0, 0, 0, 3 );
+  layout->addMultiCellWidget( mBox, 1, 1, 0, 3 );
+  layout->addWidget( mTime, 2, 0 );
+  layout->addWidget( mSyncAction, 2, 1 );
+  layout->addWidget( mConfigureAction, 2, 2 );
+  layout->addWidget( mProgressBar, 2, 3 );
+  layout->setColStretch( 0, 1 );
+  layout->setRowStretch( 3, 1 );
 
-  setPaletteBackgroundColor( kapp->tqpalette().active().base() );
+  setPaletteBackgroundColor( kapp->palette().active().base() );
 
   connect( mCallbackHandler, TQT_SIGNAL( conflict( QSync::SyncMapping ) ),
            this, TQT_SLOT( conflict( QSync::SyncMapping ) ) );
@@ -358,12 +358,12 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
 
   QSync::Plugin plugin = member.plugin();
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
 
   TQHBox* box = new TQHBox( this );
   box->setMargin( 5 );
   box->setSpacing( 6 );
-  tqlayout->addWidget( box );
+  layout->addWidget( box );
 
   mIcon = new TQLabel( box );
   mIcon->setPixmap( icon );
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index e7c03761..7d7805c4 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -37,10 +37,10 @@ class ChangeItem : public KWidgetListItem
       : KWidgetListItem( parent ),
         mChange( change )
     {
-      TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
+      TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
 
       MemberInfo mi( change.member() );
-      tqlayout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
+      layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
 
       TQString type;
       switch ( change.changeType() ) {
@@ -62,7 +62,7 @@ class ChangeItem : public KWidgetListItem
           break;
       }
 
-      tqlayout->addWidget( new TQLabel( type, this ), 1, 0 );
+      layout->addWidget( new TQLabel( type, this ), 1, 0 );
     }
 
     QSync::SyncChange change() const { return mChange; }
@@ -118,24 +118,24 @@ void MultiConflictDialog::ignoreChange()
 
 void MultiConflictDialog::initGUI()
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
 
-  tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
+  layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
 
   mWidgetList = new KWidgetList( this );
-  tqlayout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
+  layout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
 
   TQPushButton *button = new TQPushButton( i18n( "Use Selected Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSelectedChange() ) );
-  tqlayout->addWidget( button, 2, 0 );
+  layout->addWidget( button, 2, 0 );
 
   button = new TQPushButton( i18n( "Duplicate Items" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
-  tqlayout->addWidget( button, 2, 1 );
+  layout->addWidget( button, 2, 1 );
 
   button = new TQPushButton( i18n( "Ignore Conflict" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
-  tqlayout->addWidget( button, 2, 2 );
+  layout->addWidget( button, 2, 2 );
 }
 
 #include "multiconflictdialog.moc"
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index 64355e56..d981599b 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -38,7 +38,7 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
   : KWidgetListItem( list ), mPlugin( plugin )
 {
   TQString iconName = MemberInfo::pluginIconName( mPlugin.name() );
-  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
   TQLabel *icon = new TQLabel( this );
   icon->setPixmap( KGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) );
@@ -51,19 +51,19 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
   font.setBold( true );
   name->setFont( font );
 
-  tqlayout->addWidget( icon, 0, 0 );
-  tqlayout->addWidget( name, 0, 1 );
-  tqlayout->addWidget( description, 1, 1 );
+  layout->addWidget( icon, 0, 0 );
+  layout->addWidget( name, 0, 1 );
+  layout->addWidget( description, 1, 1 );
 }
 
 
 PluginPicker::PluginPicker( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQBoxLayout *layout = new TQVBoxLayout( this );
 
   mPluginList = new KWidgetList( this );
-  tqlayout->addWidget( mPluginList );
+  layout->addWidget( mPluginList );
 
   connect( mPluginList, TQT_SIGNAL( doubleClicked( KWidgetListItem* ) ),
            TQT_SIGNAL( selected() ) );
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
index f9228e17..8975b6f9 100644
--- a/kitchensync/src/singleconflictdialog.cpp
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -96,28 +96,28 @@ void SingleConflictDialog::ignoreChange()
 
 void SingleConflictDialog::initGUI()
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
 
-  tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
+  layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
   mDiffAlgoDisplay = new KSync::HTMLDiffAlgoDisplay( this );
 
-  tqlayout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
+  layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
 
   TQPushButton *button = new TQPushButton( i18n( "Use Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useFirstChange() ) );
-  tqlayout->addWidget( button, 2, 0 );
+  layout->addWidget( button, 2, 0 );
 
   button = new TQPushButton( i18n( "Duplicate Items" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
-  tqlayout->addWidget( button, 2, 1 );
+  layout->addWidget( button, 2, 1 );
 
   button = new TQPushButton( i18n( "Ignore Conflict" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
-  tqlayout->addWidget( button, 2, 2 );
+  layout->addWidget( button, 2, 2 );
 
   button = new TQPushButton( i18n( "Use Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSecondChange() ) );
-  tqlayout->addWidget( button, 2, 3 );
+  layout->addWidget( button, 2, 3 );
 }
 
 #include "singleconflictdialog.moc"