diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:36:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:36:20 -0600 |
| commit | f21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch) | |
| tree | 78ccb5117063da3e08e3277e11054b912a9f2ae7 /kdnssd | |
| parent | c48e769eb275917717e2b55eb869f7e559293ac8 (diff) | |
| download | tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.tar.gz tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kdnssd')
| -rw-r--r-- | kdnssd/ioslave/dnssd.cpp | 6 | ||||
| -rw-r--r-- | kdnssd/ioslave/dnssd.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kdnssd/ioslave/dnssd.cpp b/kdnssd/ioslave/dnssd.cpp index e94b7303..ba510be0 100644 --- a/kdnssd/ioslave/dnssd.cpp +++ b/kdnssd/ioslave/dnssd.cpp @@ -130,11 +130,11 @@ bool ZeroConfProtocol::dnssdOK() { switch(ServiceBrowser::isAvailable()) { case ServiceBrowser::Stopped: - error(KIO::ERR_UNSUPPORTED_ACTION, + error(TDEIO::ERR_UNSUPPORTED_ACTION, i18n("The Zeroconf daemon (mdnsd) is not running.")); return false; case ServiceBrowser::Unsupported: - error(KIO::ERR_UNSUPPORTED_ACTION, + error(TDEIO::ERR_UNSUPPORTED_ACTION, i18n("TDE has been built without Zeroconf support.")); return false; default: @@ -229,7 +229,7 @@ bool ZeroConfProtocol::setConfig(const TQString& type) else return true; } - configData = new KConfig("zeroconf/"+type,false,false,"data"); + configData = new TDEConfig("zeroconf/"+type,false,false,"data"); return (configData->readEntry("Type")==type); } diff --git a/kdnssd/ioslave/dnssd.h b/kdnssd/ioslave/dnssd.h index 423a0710..f06b0427 100644 --- a/kdnssd/ioslave/dnssd.h +++ b/kdnssd/ioslave/dnssd.h @@ -34,12 +34,12 @@ class TQCString; -using namespace KIO; +using namespace TDEIO; using namespace DNSSD; enum UrlType { RootDir, ServiceDir, Service, HelperProtocol, Invalid }; -class ZeroConfProtocol : public TQObject, public KIO::SlaveBase +class ZeroConfProtocol : public TQObject, public TDEIO::SlaveBase { Q_OBJECT @@ -75,7 +75,7 @@ private: // last resolved or still being resolved services - acts as one-entry cache RemoteService *toResolve; // Config file for service - also acts as one-entry cache - KConfig *configData; + TDEConfig *configData; // listDir for all domains (zeroconf:/) or one specified (zeroconf://domain/) bool allDomains; private slots: |