From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 04:10:07 +0000
Subject: Revert automated changes Sorry guys, they are just not ready for
 prime time Work will continue as always

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kcontrol/dnssd/configdialog.ui | 20 ++++++++++----------
 kcontrol/dnssd/kcmdnssd.cpp    | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'kcontrol/dnssd')

diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index 611629fad..848457a44 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ConfigDialog</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -73,7 +73,7 @@
                             <property name="enabled">
                                 <bool>true</bool>
                             </property>
-                            <property name="tqgeometry">
+                            <property name="geometry">
                                 <rect>
                                     <x>11</x>
                                     <y>51</y>
@@ -95,7 +95,7 @@
                             <property name="name">
                                 <cstring>LANButtor</cstring>
                             </property>
-                            <property name="tqgeometry">
+                            <property name="geometry">
                                 <rect>
                                     <x>11</x>
                                     <y>23</y>
@@ -180,7 +180,7 @@ is configured with 'Browse local network' option above.</string>
                     </property>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout7</cstring>
+                            <cstring>layout7</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -204,7 +204,7 @@ is configured with 'Browse local network' option above.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>130</width>
                                         <height>21</height>
@@ -264,7 +264,7 @@ is configured with 'Browse local network' option above.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <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="tqsizeHint">
+                                <property name="sizeHint">
                                     <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="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>50</width>
                                 <height>110</height>
@@ -318,7 +318,7 @@ is configured with 'Browse local network' option above.</string>
 <includes>
     <include location="global" impldecl="in declaration">kcmodule.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcmodule.h</includehint>
     <includehint>keditlistbox.h</includehint>
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index f2d9907dc..97b532b54 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::tqfromLatin1( KDE_CONFDIR "/kdnssdrc" ));
+	domain = new KSimpleConfig( TQString::fromLatin1( 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 avahitqStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahitqStatus");
-	avahitqStatus.start();
-	while (avahitqStatus.isRunning()) {
+	TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus");
+	avahiStatus.start();
+	while (avahiStatus.isRunning()) {
 	  kapp->processEvents();
 	}
-	int exitStatus = avahitqStatus.exitStatus();
+	int exitStatus = avahiStatus.exitStatus();
 	if (exitStatus == 0) { // disabled
 	  enableZeroconf->setChecked(false);
 	} else if (exitStatus == 1) { // enabled 
-- 
cgit v1.2.1