1 files changed, 23 insertions, 23 deletions

diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp
index bb25c271d..e1a0b9101 100644
--- a/kitchensync/src/connectionwidgets.cpp
+++ b/kitchensync/src/connectionwidgets.cpp
@@ -31,7 +31,7 @@
 #include <tqapplication.h>
 #include <tqeventloop.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 #include <tqtabwidget.h>
@@ -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 )