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

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
---
 kcontrol/konsole/kcmkonsole.cpp      |  2 +-
 kcontrol/konsole/kcmkonsoledialog.ui |  6 +++---
 kcontrol/konsole/schemadialog.ui     | 14 +++++++-------
 kcontrol/konsole/schemaeditor.cpp    |  4 ++--
 kcontrol/konsole/sessiondialog.ui    | 10 +++++-----
 kcontrol/konsole/sessioneditor.cpp   |  4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'kcontrol/konsole')

diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 3a03f8072..64ecc45d9 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstringlist.h>
 #include <tqtabwidget.h>
 
diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui
index ed4d47d80..c6b5c04cb 100644
--- a/kcontrol/konsole/kcmkonsoledialog.ui
+++ b/kcontrol/konsole/kcmkonsoledialog.ui
@@ -55,7 +55,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -184,7 +184,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -282,7 +282,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
diff --git a/kcontrol/konsole/schemadialog.ui b/kcontrol/konsole/schemadialog.ui
index 99d560809..d99678904 100644
--- a/kcontrol/konsole/schemadialog.ui
+++ b/kcontrol/konsole/schemadialog.ui
@@ -108,7 +108,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -158,7 +158,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -357,7 +357,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -389,7 +389,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -498,13 +498,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>180</width>
                             <height>120</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>180</width>
                             <height>120</height>
@@ -540,7 +540,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index e870aff33..80b8ef2fa 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -666,7 +666,7 @@ void SchemaEditor::readSchema(int num)
 		    continue;
 		if (!(0 <= bo && bo <= 1))
 		    continue;
-		color[fi] = kapp->palette().active().text();
+		color[fi] = kapp->tqpalette().active().text();
 		transparent[fi] = tr;
 		bold[fi] = bo;
 		type[fi] = 1;
@@ -681,7 +681,7 @@ void SchemaEditor::readSchema(int num)
 		    continue;
 		if (!(0 <= bo && bo <= 1))
 		    continue;
-		color[fi] = kapp->palette().active().base();
+		color[fi] = kapp->tqpalette().active().base();
 		transparent[fi] = tr;
 		bold[fi] = bo;
 		type[fi] = 2;
diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui
index 9322aad42..066c9c69a 100644
--- a/kcontrol/konsole/sessiondialog.ui
+++ b/kcontrol/konsole/sessiondialog.ui
@@ -184,13 +184,13 @@
                             <property name="name">
                                 <cstring>previewIcon</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>100</width>
                                     <height>100</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>100</width>
                                     <height>100</height>
@@ -212,7 +212,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>90</width>
                                     <height>100</height>
@@ -221,7 +221,7 @@
                             <property name="text">
                                 <string>&amp;Icon:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignTop|AlignLeft</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -280,7 +280,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index e93084af1..188b0c910 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -340,8 +340,8 @@ void SessionEditor::saveCurrent()
   else
     co->writeEntry("Font",fontCombo->currentItem()-1);
   co->writeEntry("Term",termLine->text());
-  co->writeEntry("KeyTab",*keytabFilename.at(keytabCombo->currentItem()));
-  co->writeEntry("Schema",*schemaFilename.at(schemaCombo->currentItem()));
+  co->writeEntry("KeyTab",*keytabFilename.tqat(keytabCombo->currentItem()));
+  co->writeEntry("Schema",*schemaFilename.tqat(schemaCombo->currentItem()));
   co->sync();
   delete co;
   sesMod=false;
-- 
cgit v1.2.1