From fae91e75ec01c3d14a70db71e113bcb088862a32 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 21 Dec 2011 14:03:54 -0600
Subject: Rename obsolete tq methods to standard names

---
 kcm_gtk/emacsdetails.ui |  2 +-
 kcm_gtk/kcmgtk.cpp      |  8 ++++----
 kcm_gtk/kcmgtkwidget.ui | 26 +++++++++++++-------------
 kcm_gtk/searchpaths.ui  |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'kcm_gtk')

diff --git a/kcm_gtk/emacsdetails.ui b/kcm_gtk/emacsdetails.ui
index 27c3dc2..f74ba42 100644
--- a/kcm_gtk/emacsdetails.ui
+++ b/kcm_gtk/emacsdetails.ui
@@ -186,7 +186,7 @@ When enabled, they will override the standard keyboard shortcuts in GTK applicat
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp
index 79029a0..4cec91e 100644
--- a/kcm_gtk/kcmgtk.cpp
+++ b/kcm_gtk/kcmgtk.cpp
@@ -175,7 +175,7 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&)
 	gtkSearchPaths = config->readListEntry("gtkSearchPaths", gtkSearchPathsDefault);
 
 	
-	// Add the widget to our tqlayout
+	// Add the widget to our layout
 	TQBoxLayout* l = new TQVBoxLayout(this);
 	widget = new KcmGtkWidget(this);
 	l->addWidget(widget);
@@ -554,7 +554,7 @@ TQString KcmGtk::scrollBarCSS()
 	sbar.setValue(1);
 	sbar.resize(200,25);
 	
-	TQRect rect = tqApp->tqstyle().querySubControlMetrics(TQStyle::CC_ScrollBar, &sbar, TQStyle::SC_ScrollBarGroove);
+	TQRect rect = tqApp->style().querySubControlMetrics(TQStyle::CC_ScrollBar, &sbar, TQStyle::SC_ScrollBarGroove);
 	
 	bool back1 = false;
 	bool forward1 = false;
@@ -564,7 +564,7 @@ TQString KcmGtk::scrollBarCSS()
 	TQStyle::SubControl sc = TQStyle::SC_None;
 	for (TQPoint pos(0,7) ; pos.x()<rect.x() ; pos.setX(pos.x()+1))
 	{
-		TQStyle::SubControl sc2 = tqApp->tqstyle().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos);
+		TQStyle::SubControl sc2 = tqApp->style().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos);
 		if (sc != sc2)
 		{
 			if (sc2 == TQStyle::SC_ScrollBarAddLine) forward1 = true;
@@ -575,7 +575,7 @@ TQString KcmGtk::scrollBarCSS()
 	sc = TQStyle::SC_None;
 	for (TQPoint pos(rect.x()+rect.width(),7) ; pos.x()<200 ; pos.setX(pos.x()+1))
 	{
-		TQStyle::SubControl sc2 = tqApp->tqstyle().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos);
+		TQStyle::SubControl sc2 = tqApp->style().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos);
 		if (sc != sc2)
 		{
 			if (sc2 == TQStyle::SC_ScrollBarAddLine) forward2 = true;
diff --git a/kcm_gtk/kcmgtkwidget.ui b/kcm_gtk/kcmgtkwidget.ui
index feb5eae..bfb781d 100644
--- a/kcm_gtk/kcmgtkwidget.ui
+++ b/kcm_gtk/kcmgtkwidget.ui
@@ -43,7 +43,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -78,7 +78,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout17</cstring>
+                        <cstring>layout17</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -103,7 +103,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
                             <property name="name">
-                                <cstring>tqlayout16</cstring>
+                                <cstring>layout16</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -215,7 +215,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7_2</cstring>
+                        <cstring>layout7_2</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -250,7 +250,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout14</cstring>
+                        <cstring>layout14</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -291,7 +291,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
                             <property name="name">
-                                <cstring>tqlayout10</cstring>
+                                <cstring>layout10</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -337,7 +337,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
                             <property name="name">
-                                <cstring>tqlayout13</cstring>
+                                <cstring>layout13</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -390,7 +390,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -425,7 +425,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -444,7 +444,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout11</cstring>
+                                <cstring>layout11</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -502,7 +502,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7_2_2</cstring>
+                        <cstring>layout7_2_2</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -537,7 +537,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -556,7 +556,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout11</cstring>
+                                <cstring>layout11</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/kcm_gtk/searchpaths.ui b/kcm_gtk/searchpaths.ui
index c94a3b6..ac87cec 100644
--- a/kcm_gtk/searchpaths.ui
+++ b/kcm_gtk/searchpaths.ui
@@ -37,7 +37,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout31</cstring>
+                <cstring>layout31</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -91,7 +91,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout33</cstring>
+                <cstring>layout33</cstring>
             </property>
             <hbox>
                 <property name="name">
-- 
cgit v1.2.1