diff options
Diffstat (limited to 'kcontrol/dnssd')
| -rw-r--r-- | kcontrol/dnssd/configdialog.ui | 4 | ||||
| -rw-r--r-- | kcontrol/dnssd/kcmdnssd.cpp | 22 | ||||
| -rw-r--r-- | kcontrol/dnssd/kcmdnssd.h | 6 |
3 files changed, 16 insertions, 16 deletions
diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui index b2d9eb8b0..ce03182e0 100644 --- a/kcontrol/dnssd/configdialog.ui +++ b/kcontrol/dnssd/configdialog.ui @@ -300,9 +300,9 @@ is configured with 'Browse local network' option above.</string> </widget> </grid> </widget> -<Q_SLOTS> +<slots> <slot>radioButton2_2_toggled(bool)</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in declaration">tdecmodule.h</include> <include location="global" impldecl="in implementation">keditlistbox.h</include> diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index d1fe3269c..0bad0dfa7 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -35,10 +35,10 @@ #include <tdelocale.h> #include <tdeglobal.h> #include <tdeparts/genericfactory.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klineedit.h> #include <kpassdlg.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeapplication.h> #include <tdemessagebox.h> @@ -65,13 +65,13 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&) else if (getenv("TDESU_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 "/tdednssdrc" )); + domain = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" )); domain->setGroup("publishing"); load(); - connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); - connect(secretedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); - connect(domainedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); - connect(enableZeroconf,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableZeroconfChanged(bool))); + connect(hostedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged())); + connect(secretedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged())); + connect(domainedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged())); + connect(enableZeroconf,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableZeroconfChanged(bool))); m_enableZeroconfChanged=false; if (DNSSD::Configuration::self()->publishDomain().isEmpty()) WANButton->setEnabled(false); kcfg_PublishType->hide(); //unused with Avahi @@ -84,7 +84,7 @@ KCMDnssd::~KCMDnssd() void KCMDnssd::save() { - setCursor(TQCursor(Qt::BusyCursor)); + setCursor(TQCursor(TQt::BusyCursor)); TDECModule::save(); if (geteuid()==0 && m_wdchanged) saveMdnsd(); domain->setFileWriteMode(0644); // this should be readable for everyone @@ -112,17 +112,17 @@ void KCMDnssd::save() proc->start(TDEProcess::Block); } } - setCursor(TQCursor(Qt::ArrowCursor)); + setCursor(TQCursor(TQt::ArrowCursor)); } void KCMDnssd::load() { if (geteuid()==0) loadMdnsd(); enableZeroconf->setChecked(false); - TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), TQT_TQOBJECT(this), "avahiStatus"); + TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus"); avahiStatus.start(); while (avahiStatus.isRunning()) { - kapp->processEvents(); + tdeApp->processEvents(); } int exitStatus = avahiStatus.exitStatus(); if (exitStatus == 0) { // disabled diff --git a/kcontrol/dnssd/kcmdnssd.h b/kcontrol/dnssd/kcmdnssd.h index b408ca3f6..ebc26530d 100644 --- a/kcontrol/dnssd/kcmdnssd.h +++ b/kcontrol/dnssd/kcmdnssd.h @@ -26,10 +26,10 @@ #include <configdialog.h> #include <tdeaboutdata.h> -class KSimpleConfig; +class TDESimpleConfig; class KCMDnssd: public ConfigDialog { - Q_OBJECT + TQ_OBJECT public: KCMDnssd( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); @@ -45,7 +45,7 @@ private: bool saveMdnsd(); TQMap<TQString,TQString> mdnsdLines; bool m_wdchanged; - KSimpleConfig* domain; + TDESimpleConfig* domain; bool m_enableZeroconfChanged; }; |