From 73c08b592db45af554b9f21029bc549d70f683ab Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:46:05 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 kcontrol/displayconfig/displayconfig.cpp    | 12 ++++++------
 kcontrol/displayconfig/displayconfigbase.ui | 14 +++++++-------
 kcontrol/displayconfig/monitorworkspace.cpp |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'kcontrol/displayconfig')

diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 2b7e7dde2..22f44fc96 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -20,7 +20,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqtabwidget.h>
@@ -743,7 +743,7 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
 	m_randrsimple = new KRandrSimpleAPI();
 
 	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-	systemconfig = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdisplay/kdisplayconfigrc" ));
+	systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdisplay/kdisplayconfigrc" ));
 	systemconfig->setFileWriteMode(0644);
 
 	KAboutData *about =
@@ -1219,10 +1219,10 @@ void KDisplayConfig::setGammaLabels() {
 	screendata->gamma_blue = floorf(screendata->gamma_blue * 10 + 0.5) / 10;
 
 	// Set the labels
-	base->gammaAllLabel->setText(TQString("%1").tqarg(((float)base->gammaAllSlider->value())/10.0, 0, 'f', 1));
-	base->gammaRedLabel->setText(TQString("%1").tqarg(((float)base->gammaRedSlider->value())/10.0, 0, 'f', 1));
-	base->gammaGreenLabel->setText(TQString("%1").tqarg(((float)base->gammaGreenSlider->value())/10.0, 0, 'f', 1));
-	base->gammaBlueLabel->setText(TQString("%1").tqarg(((float)base->gammaBlueSlider->value())/10.0, 0, 'f', 1));
+	base->gammaAllLabel->setText(TQString("%1").arg(((float)base->gammaAllSlider->value())/10.0, 0, 'f', 1));
+	base->gammaRedLabel->setText(TQString("%1").arg(((float)base->gammaRedSlider->value())/10.0, 0, 'f', 1));
+	base->gammaGreenLabel->setText(TQString("%1").arg(((float)base->gammaGreenSlider->value())/10.0, 0, 'f', 1));
+	base->gammaBlueLabel->setText(TQString("%1").arg(((float)base->gammaBlueSlider->value())/10.0, 0, 'f', 1));
 }
 
 void KDisplayConfig::gammaSetAverageAllSlider() {
diff --git a/kcontrol/displayconfig/displayconfigbase.ui b/kcontrol/displayconfig/displayconfigbase.ui
index 161fb81ff..50d7e9834 100644
--- a/kcontrol/displayconfig/displayconfigbase.ui
+++ b/kcontrol/displayconfig/displayconfigbase.ui
@@ -65,7 +65,7 @@
 				    <property name="sizeType">
 					    <enum>Expanding</enum>
 				    </property>
-				    <property name="tqsizeHint">
+				    <property name="sizeHint">
 					    <size>
 						    <width>20</width>
 						    <height>20</height>
@@ -310,7 +310,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -403,7 +403,7 @@
 									<property name="sizeType">
 										<enum>Expanding</enum>
 									</property>
-									<property name="tqsizeHint">
+									<property name="sizeHint">
 										<size>
 										<width>20</width>
 										<height>20</height>
@@ -420,7 +420,7 @@
 									<property name="sizeType">
 										<enum>Expanding</enum>
 									</property>
-									<property name="tqsizeHint">
+									<property name="sizeHint">
 										<size>
 										<width>20</width>
 										<height>20</height>
@@ -597,7 +597,7 @@
 							    <property name="sizeType">
 								    <enum>Expanding</enum>
 							    </property>
-							    <property name="tqsizeHint">
+							    <property name="sizeHint">
 								    <size>
 									    <width>20</width>
 									    <height>20</height>
@@ -649,7 +649,7 @@
 						    <property name="sizeType">
 							    <enum>Expanding</enum>
 						    </property>
-						    <property name="tqsizeHint">
+						    <property name="sizeHint">
 							    <size>
 								    <width>20</width>
 								    <height>20</height>
@@ -749,7 +749,7 @@
 				    <property name="sizeType">
 					    <enum>Expanding</enum>
 				    </property>
-				    <property name="tqsizeHint">
+				    <property name="sizeHint">
 					    <size>
 						    <width>20</width>
 						    <height>20</height>
diff --git a/kcontrol/displayconfig/monitorworkspace.cpp b/kcontrol/displayconfig/monitorworkspace.cpp
index 2b1c4a6f7..ba864a480 100644
--- a/kcontrol/displayconfig/monitorworkspace.cpp
+++ b/kcontrol/displayconfig/monitorworkspace.cpp
@@ -20,7 +20,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 
-- 
cgit v1.2.1