summaryrefslogtreecommitdiffstats
path: root/kdnssd/ioslave
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kdnssd/ioslave
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdnssd/ioslave')
-rw-r--r--kdnssd/ioslave/dnssd.cpp6
-rw-r--r--kdnssd/ioslave/dnssd.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/kdnssd/ioslave/dnssd.cpp b/kdnssd/ioslave/dnssd.cpp
index 6508a13a..5358a49d 100644
--- a/kdnssd/ioslave/dnssd.cpp
+++ b/kdnssd/ioslave/dnssd.cpp
@@ -173,7 +173,7 @@ void ZeroConfProtocol::stat(const KURL& url)
TQString ZeroConfProtocol::getAttribute(const TQString& name)
{
TQString entry = configData->readEntry(name);
- return (entry.isNull()) ? TQString::null : toResolve->textData()[entry];
+ return (entry.isNull()) ? TQString() : toResolve->textData()[entry];
}
void ZeroConfProtocol::resolveAndRedirect(const KURL& url, bool useKRun)
@@ -327,14 +327,14 @@ void ZeroConfProtocol::allReported()
}
void ZeroConfProtocol::newType(DNSSD::RemoteService::Ptr srv)
{
- if (mergedtypes.contains(srv->type())>0) return;
+ if (mergedtypes.tqcontains(srv->type())>0) return;
mergedtypes << srv->type();
UDSEntry entry;
kdDebug() << "Got new entry " << srv->type() << endl;
if (!setConfig(srv->type())) return;
TQString name = configData->readEntry("Name");
if (!name.isNull()) {
- buildDirEntry(entry,name,srv->type(), (allDomains) ? TQString::null :
+ buildDirEntry(entry,name,srv->type(), (allDomains) ? TQString() :
browser->browsedDomains()->domains()[0]);
listEntry(entry,false);
}
diff --git a/kdnssd/ioslave/dnssd.h b/kdnssd/ioslave/dnssd.h
index 9e957ed9..764c5a27 100644
--- a/kdnssd/ioslave/dnssd.h
+++ b/kdnssd/ioslave/dnssd.h
@@ -42,6 +42,7 @@ enum UrlType { RootDir, ServiceDir, Service, HelperProtocol, Invalid };
class ZeroConfProtocol : public TQObject, public KIO::SlaveBase
{
Q_OBJECT
+ TQ_OBJECT
public:
ZeroConfProtocol(const TQCString& protocol, const TQCString &pool_socket, const TQCString &app_socket);
~ZeroConfProtocol();
@@ -51,8 +52,8 @@ public:
virtual void listDir(const KURL& url );
private:
// Create UDSEntry for zeroconf:/ or zeroconf:/type/ paths
- void buildDirEntry(UDSEntry& entry,const TQString& name,const TQString& type=TQString::null,
- const TQString& host=TQString::null);
+ void buildDirEntry(UDSEntry& entry,const TQString& name,const TQString& type=TQString(),
+ const TQString& host=TQString());
// Create UDSEntry for single services: dnssd:/type/service
void buildServiceEntry(UDSEntry& entry,const TQString& name,const TQString& type,
const TQString& domain);