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, 20 insertions, 20 deletions

diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index 848457a44..4e7c2ac77 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -33,11 +33,11 @@
         <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>tabs</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -48,7 +48,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup" row="3" column="0">
+                    <widget class="TQButtonGroup" row="3" column="0">
                         <property name="name">
                             <cstring>kcfg_PublishType</cstring>
                         </property>
@@ -66,7 +66,7 @@
                         <property name="title">
                             <string>Publishing Mode</string>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>WANButton</cstring>
                             </property>
@@ -91,7 +91,7 @@
                                 <string>Advertise services on Internet domain using public IP. To have this option working you need to configure wide area operation in using administrator mode</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>LANButtor</cstring>
                             </property>
@@ -117,7 +117,7 @@
                             </property>
                         </widget>
                     </widget>
-                    <widget class="QCheckBox" row="1" column="0">
+                    <widget class="TQCheckBox" row="1" column="0">
                         <property name="name">
                             <cstring>kcfg_BrowseLocal</cstring>
                         </property>
@@ -131,7 +131,7 @@
                             <string>Browse local network (domain .local) using multicast DNS.</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="0" column="0">
+                    <widget class="TQCheckBox" row="0" column="0">
                         <property name="name">
                             <cstring>enableZeroconf</cstring>
                         </property>
@@ -167,7 +167,7 @@ is configured with 'Browse local network' option above.</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -178,7 +178,7 @@ is configured with 'Browse local network' option above.</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>layout7</cstring>
                         </property>
@@ -186,7 +186,7 @@ is configured with 'Browse local network' option above.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>textLabel2</cstring>
                                 </property>
@@ -204,7 +204,7 @@ is configured with 'Browse local network' option above.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>130</width>
                                         <height>21</height>
@@ -227,7 +227,7 @@ is configured with 'Browse local network' option above.</string>
                                     <string>Optional shared secret used for authorization of DNS dynamic updates.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>domainLabel</cstring>
                                 </property>
@@ -238,7 +238,7 @@ is configured with 'Browse local network' option above.</string>
                                     <string>Domain:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel1</cstring>
                                 </property>
@@ -264,7 +264,7 @@ is configured with 'Browse local network' option above.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>90</width>
                                         <height>20</height>
@@ -281,7 +281,7 @@ is configured with 'Browse local network' option above.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>90</width>
                                         <height>21</height>
@@ -300,7 +300,7 @@ is configured with 'Browse local network' option above.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>50</width>
                                 <height>110</height>
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index 97b532b54..6fae0b216 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
 		else if (getenv("KDESU_USER")!=0) tabs->removePage(tab); 
 	addConfig(DNSSD::Configuration::self(),this);
 	// it is host-wide setting so it has to be in global config file
-	domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" ));
+	domain = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdnssdrc" ));
 	domain->setGroup("publishing");
 	load();
 	connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
@@ -119,12 +119,12 @@ void KCMDnssd::load()
 {
 	if (geteuid()==0) loadMdnsd();
 	enableZeroconf->setChecked(false);
-	TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus");
+	TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), TQT_TQOBJECT(this), "avahiStatus");
 	avahiStatus.start();
 	while (avahiStatus.isRunning()) {
 	  kapp->processEvents();
 	}
-	int exitStatus = avahiStatus.exitStatus();
+	int exitStatus = avahiStatus.exitqStatus();
 	if (exitStatus == 0) { // disabled
 	  enableZeroconf->setChecked(false);
 	} else if (exitStatus == 1) { // enabled