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

This reverts commit 238d438877620ed73915f2360d820cfc0c9131cc.
---
 src/kcm/configdialog.cpp | 14 +++++++-------
 src/kcm/configdlg.ui     | 32 ++++++++++++++++----------------
 2 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'src/kcm')

diff --git a/src/kcm/configdialog.cpp b/src/kcm/configdialog.cpp
index 1a2c1c7..70950db 100644
--- a/src/kcm/configdialog.cpp
+++ b/src/kcm/configdialog.cpp
@@ -20,7 +20,7 @@
 #include <tqfile.h>
 #include <tqdict.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcstring.h>
 #include <tqlistbox.h>
 #include <tqcheckbox.h>
@@ -314,11 +314,11 @@ void ConfigDialog::load()
             {
                 TQString entry;
                 InterfaceCommand cmd;
-                entry = TQString( "RunAsRoot%1" ).arg( i + 1 );
+                entry = TQString( "RunAsRoot%1" ).tqarg( i + 1 );
                 cmd.runAsRoot = config->readBoolEntry( entry );
-                entry = TQString( "Command%1" ).arg( i + 1 );
+                entry = TQString( "Command%1" ).tqarg( i + 1 );
                 cmd.command = config->readEntry( entry );
-                entry = TQString( "MenuText%1" ).arg( i + 1 );
+                entry = TQString( "MenuText%1" ).tqarg( i + 1 );
                 cmd.menuText = config->readEntry( entry );
                 settings->commands.append( cmd );
             }
@@ -384,11 +384,11 @@ void ConfigDialog::save()
         for ( uint i = 0; i < settings->commands.size(); i++ )
         {
             TQString entry;
-            entry = TQString( "RunAsRoot%1" ).arg( i + 1 );
+            entry = TQString( "RunAsRoot%1" ).tqarg( i + 1 );
             config->writeEntry( entry, settings->commands[i].runAsRoot );
-            entry = TQString( "Command%1" ).arg( i + 1 );
+            entry = TQString( "Command%1" ).tqarg( i + 1 );
             config->writeEntry( entry, settings->commands[i].command );
-            entry = TQString( "MenuText%1" ).arg( i + 1 );
+            entry = TQString( "MenuText%1" ).tqarg( i + 1 );
             config->writeEntry( entry, settings->commands[i].menuText );
         }
     }
diff --git a/src/kcm/configdlg.ui b/src/kcm/configdlg.ui
index 0a76e2d..1cb9c07 100644
--- a/src/kcm/configdlg.ui
+++ b/src/kcm/configdlg.ui
@@ -41,7 +41,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
                         <property name="name">
-                            <cstring>layout4</cstring>
+                            <cstring>tqlayout4</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -146,7 +146,7 @@ for example 'eth0', 'wlan0' or 'ppp0'.</string>
                             </widget>
                             <widget class="TQLayoutWidget" row="1" column="1">
                                 <property name="name">
-                                    <cstring>layout6</cstring>
+                                    <cstring>tqlayout6</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -196,7 +196,7 @@ for example 'eth0', 'wlan0' or 'ppp0'.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>41</width>
                                                 <height>61</height>
@@ -242,7 +242,7 @@ for example 'eth0', 'wlan0' or 'ppp0'.</string>
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout5</cstring>
+                                    <cstring>tqlayout5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -284,7 +284,7 @@ When reconnected the icon will be shown again.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout3</cstring>
+                                    <cstring>tqlayout3</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -300,7 +300,7 @@ When reconnected the icon will be shown again.</string>
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>21</height>
@@ -334,7 +334,7 @@ of bluetooth adaptors.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout7_2</cstring>
+                                    <cstring>tqlayout7_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -371,7 +371,7 @@ of bluetooth adaptors.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout7</cstring>
+                                    <cstring>tqlayout7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -479,7 +479,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>70</width>
                                 <height>129</height>
@@ -507,7 +507,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>70</width>
                                 <height>130</height>
@@ -636,7 +636,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>60</width>
                                         <height>21</height>
@@ -709,7 +709,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>131</width>
                                         <height>21</height>
@@ -763,7 +763,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
                                 <property name="text">
                                     <string>Description:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -774,7 +774,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
                                 <property name="text">
                                     <string></string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
@@ -793,7 +793,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>100</width>
                                         <height>21</height>
@@ -812,7 +812,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>31</width>
                                 <height>30</height>
-- 
cgit v1.2.1