From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:50 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 kitchensync/src/configguignokii.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'kitchensync/src/configguignokii.cpp')

diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp
index dd2697f06..84db02752 100644
--- a/kitchensync/src/configguignokii.cpp
+++ b/kitchensync/src/configguignokii.cpp
@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
@@ -37,14 +37,14 @@
 ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
 
   // Model
   TQLabel *label = new TQLabel( i18n("Model:"), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mModel = new KComboBox( true, this );
-  layout->addWidget( mModel, 0, 1 );
+  tqlayout->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 );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mConnection = new TQComboBox( this );
-  layout->addWidget( mConnection, 1, 1 );
+  tqlayout->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();
 
-  layout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
 
   // Port
   mPortLabel = new TQLabel( i18n("Port:"), this );
-  layout->addWidget( mPortLabel, 2, 0 );
+  tqlayout->addWidget( mPortLabel, 2, 0 );
   mPortLabel->hide();
 
   mPort = new KComboBox( true, this );
-  layout->addWidget( mPort, 2, 1 );
+  tqlayout->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" );
 
-  layout->setColStretch( 1, 1 );
+  tqlayout->setColStretch( 1, 1 );
 
   topLayout()->addStretch( 1 );
 }
-- 
cgit v1.2.1