summaryrefslogtreecommitdiffstats
path: root/kdnssd/ioslave/dnssd.cpp
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/dnssd.cpp
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/dnssd.cpp')
-rw-r--r--kdnssd/ioslave/dnssd.cpp6
1 files changed, 3 insertions, 3 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);
}