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

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

diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
index da17454e3..e461a808f 100644
--- a/kitchensync/src/configguimoto.cpp
+++ b/kitchensync/src/configguimoto.cpp
@@ -23,7 +23,7 @@
 
 #include <tqdom.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 #include <kdialog.h>
@@ -43,7 +43,7 @@ void ConfigGuiMoto::load( const TQString &xml )
   TQDomNode node;
   for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
     TQDomElement element = node.toElement();
-    if ( element.tagName() == "device" ) {
+    if ( element.tagName() == "tqdevice" ) {
       mDeviceString->setText( element.text() );
     }
   }
@@ -53,7 +53,7 @@ TQString ConfigGuiMoto::save() const
 {
   TQString config = "<config>\n";
 
-  config += TQString( "<device>%1</device>\n" ).arg( mDeviceString->text() );
+  config += TQString( "<tqdevice>%1</tqdevice>\n" ).tqarg( mDeviceString->text() );
 
   config += "</config>";
 
@@ -62,10 +62,10 @@ TQString ConfigGuiMoto::save() const
 
 void ConfigGuiMoto::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
   mDeviceString = new KLineEdit( this );
-  layout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
 }
-- 
cgit v1.2.1