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/configguigpe.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
index a5783120..118aed14 100644
--- a/kitchensync/src/configguigpe.cpp
+++ b/kitchensync/src/configguigpe.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 #include <tqdom.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 
 #include <kcombobox.h>
@@ -68,11 +68,11 @@ TQString ConfigGuiGpe::save() const
 {
   TQString config = "<config>";
 
-  config += TQString( "<use_local>%1</use_local>" ).arg( mConnectionMode->currentItem() == 0 );
-  config += TQString( "<use_ssh>%1</use_ssh>" ).arg( mConnectionMode->currentItem() == 1 );
-  config += TQString( "<handheld_ip>%1</handheld_ip>" ).arg( mIP->text() );
-  config += TQString( "<handheld_port>%1</handheld_port>" ).arg( mPort->value() );
-  config += TQString( "<handheld_user>%1</handheld_user>" ).arg( mUser->text() );
+  config += TQString( "<use_local>%1</use_local>" ).tqarg( mConnectionMode->currentItem() == 0 );
+  config += TQString( "<use_ssh>%1</use_ssh>" ).tqarg( mConnectionMode->currentItem() == 1 );
+  config += TQString( "<handheld_ip>%1</handheld_ip>" ).tqarg( mIP->text() );
+  config += TQString( "<handheld_port>%1</handheld_port>" ).tqarg( mPort->value() );
+  config += TQString( "<handheld_user>%1</handheld_user>" ).tqarg( mUser->text() );
 
   config += "</config>";
 
@@ -81,23 +81,23 @@ TQString ConfigGuiGpe::save() const
 
 void ConfigGuiGpe::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
   mConnectionMode = new KComboBox( this );
-  layout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
+  tqlayout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
 
-  layout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
   mIP = new KLineEdit( this );
   mIP->setInputMask( "000.000.000.000" );
-  layout->addWidget( mIP, 1, 1 );
+  tqlayout->addWidget( mIP, 1, 1 );
 
-  layout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight );
+  tqlayout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight );
   mPort = new TQSpinBox( 1, 65536, 1, this );
-  layout->addWidget( mPort, 1, 3 );
+  tqlayout->addWidget( mPort, 1, 3 );
 
-  layout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
   mUser = new KLineEdit( this );
-  layout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
+  tqlayout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
 }
-- 
cgit v1.2.3