diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 20:16:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 20:16:47 +0000 |
commit | 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch) | |
tree | daabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kcontrol/dnssd | |
parent | 50001f1757f97510e80cb1990e2f2d5b00144c2a (diff) | |
download | tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/dnssd')
-rw-r--r-- | kcontrol/dnssd/configdialog.ui | 20 | ||||
-rw-r--r-- | kcontrol/dnssd/kcmdnssd.cpp | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui index 848457a44..611629fad 100644 --- a/kcontrol/dnssd/configdialog.ui +++ b/kcontrol/dnssd/configdialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ConfigDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -73,7 +73,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>51</y> @@ -95,7 +95,7 @@ <property name="name"> <cstring>LANButtor</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <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>layout7</cstring> + <cstring>tqlayout7</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="sizeHint"> + <property name="tqsizeHint"> <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="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> @@ -318,7 +318,7 @@ is configured with 'Browse local network' option above.</string> <includes> <include location="global" impldecl="in declaration">kcmodule.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults 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 97b532b54..f2d9907dc 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"); - avahiStatus.start(); - while (avahiStatus.isRunning()) { + TQProcess avahitqStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahitqStatus"); + avahitqStatus.start(); + while (avahitqStatus.isRunning()) { kapp->processEvents(); } - int exitStatus = avahiStatus.exitStatus(); + int exitStatus = avahitqStatus.exitStatus(); if (exitStatus == 0) { // disabled enableZeroconf->setChecked(false); } else if (exitStatus == 1) { // enabled |