Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 17 insertions, 17 deletions

diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index 41ddfe8e3..e78a70af2 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -65,8 +65,8 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
 {
 
   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-  config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
-  systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
+  config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" ));
+  systemconfig = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
 
   KAboutData *about =
   new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("KDE ICC Profile Control Module"),
@@ -136,7 +136,7 @@ void KICCConfig::deleteProfile () {
 
 	// Contract the profile memory
 	numberOfProfiles--;
-	iccFileArrayNew = new QString[numberOfProfiles*numberOfScreens];
+	iccFileArrayNew = new TQString[numberOfProfiles*numberOfScreens];
 	for (i=0;i<(numberOfProfiles*numberOfScreens);i++) {
 		iccFileArrayNew[i] = iccFileArray[i];
 	}
@@ -206,7 +206,7 @@ void KICCConfig::addProfile () {
 
 	// Expand the profile memory
 	numberOfProfiles++;
-	iccFileArrayNew = new QString[numberOfProfiles*numberOfScreens];
+	iccFileArrayNew = new TQString[numberOfProfiles*numberOfScreens];
 	for (i=0;i<((numberOfProfiles-1)*numberOfScreens);i++) {
 		iccFileArrayNew[i] = iccFileArray[i];
 	}
@@ -327,7 +327,7 @@ void KICCConfig::load(bool useDefaults )
   }
 
   // Load all profiles into memory
-  iccFileArray = new QString[numberOfProfiles*numberOfScreens];
+  iccFileArray = new TQString[numberOfProfiles*numberOfScreens];
   for (i=0;i<(base->iccProfileList->count());i++) {
       config->setGroup(base->iccProfileList->text(i));
       for (j=0;j<(base->randrScreenList->count());j++) {
diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui
index c9be0818f..98b985229 100644
--- a/kcontrol/iccconfig/iccconfigbase.ui
+++ b/kcontrol/iccconfig/iccconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>ICCConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
 	    <cstring>ICCConfigBase</cstring>
     </property>
@@ -16,14 +16,14 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>TabWidget2</cstring>
             </property>
             <property name="enabled">
                 <bool>true</bool>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -34,7 +34,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-		    <widget class="QGroupBox" row="0" column="0">
+		    <widget class="TQGroupBox" row="0" column="0">
 			    <property name="name">
 				    <cstring>groupSystemSettings</cstring>
 			    </property>
@@ -45,7 +45,7 @@
 				<property name="name">
 					    <cstring>unnamed</cstring>
 				</property>
-				<widget class="QCheckBox" row="0" column="0" colspan="2">
+				<widget class="TQCheckBox" row="0" column="0" colspan="2">
 					<property name="name">
 						<cstring>systemEnableSupport</cstring>
 					</property>
@@ -61,7 +61,7 @@
 						<string>*.icc</string>
 					</property>
 				</widget>
-				<widget class="QLabel" row="1" column="0">
+				<widget class="TQLabel" row="1" column="0">
 					<property name="name">
 						<cstring>textLabel4_2</cstring>
 					</property>
@@ -71,7 +71,7 @@
 				</widget>
 			    </grid>
 		    </widget>
-		    <widget class="QGroupBox" row="1" column="0">
+		    <widget class="TQGroupBox" row="1" column="0">
 			    <property name="name">
 				    <cstring>groupUserSettings</cstring>
 			    </property>
@@ -82,7 +82,7 @@
 				<property name="name">
 					<cstring>unnamed</cstring>
 				</property>
-				<widget class="QCheckBox" row="0" column="0" colspan="2">
+				<widget class="TQCheckBox" row="0" column="0" colspan="2">
 					<property name="name">
 						<cstring>enableSupport</cstring>
 					</property>
@@ -95,7 +95,7 @@
 						<cstring>iccProfileList</cstring>
 					</property>
 				</widget>
-				<widget class="QLabel" row="1" column="0">
+				<widget class="TQLabel" row="1" column="0">
 					<property name="name">
 						<cstring>textLabel2_9</cstring>
 					</property>
@@ -132,7 +132,7 @@
 						<cstring>randrScreenList</cstring>
 					</property>
 				</widget>
-				<widget class="QLabel" row="2" column="0">
+				<widget class="TQLabel" row="2" column="0">
 					<property name="name">
 						<cstring>textLabel2_8</cstring>
 					</property>
@@ -148,7 +148,7 @@
 						<string>*.icc</string>
 					</property>
 				</widget>
-				<widget class="QLabel" row="3" column="0">
+				<widget class="TQLabel" row="3" column="0">
 					<property name="name">
 						<cstring>textLabel2_2</cstring>
 					</property>
@@ -168,7 +168,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>