[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kdnssd
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2009-01-30 22:10:30
Message-ID: 1233353430.340335.7353.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 918879 by kossebau:

some string handling improvements

 M  +6 -6      ioslave/dnssd.cpp  
 M  +2 -2      kdedmodule/dnssdwatcher.cpp  


--- trunk/KDE/kdenetwork/kdnssd/ioslave/dnssd.cpp #918878:918879
@@ -69,8 +69,8 @@
 {
 	// FIXME: encode domain name into url to support many services with the same name on 
 	// different domains
-	type = url.path().section("/",1,1);
-	name = url.path().section("/",2,-1);
+	type = url.path().section('/',1,1);
+	name = url.path().section('/',2,-1);
 
 }
 
@@ -98,7 +98,7 @@
 	switch (t) {
 	case RootDir:
 	case ServiceDir:
-		buildDirEntry(entry,"");
+		buildDirEntry(entry,QString());
 		statEntry(entry);
 		finished();
 		break;
@@ -119,7 +119,7 @@
 		toResolve = 0;
 	}
 	if (toResolve==0) {
-		toResolve = new RemoteService(name,type,"");
+		toResolve = new RemoteService(name,type,QString());
 		if (!toResolve->resolve()) error(ERR_DOES_NOT_EXIST,name);
 	}
 	KUrl destUrl;
@@ -143,7 +143,7 @@
 	entry.insert(UDSEntry::UDS_ACCESS,0555);
 	entry.insert(UDSEntry::UDS_SIZE,0);
 	entry.insert(UDSEntry::UDS_FILE_TYPE,S_IFDIR);
-	entry.insert(UDSEntry::UDS_MIME_TYPE,QString::fromUtf8("inode/directory"));
+	entry.insert(UDSEntry::UDS_MIME_TYPE,"inode/directory");
 	if (!type.isNull())
 			entry.insert(UDSEntry::UDS_URL,"zeroconf:/"+type+'/');
 }
@@ -164,7 +164,7 @@
 		enterLoop();
 		return;
 	case ServiceDir:
-		browser = new ServiceBrowser(url.path(KUrl::RemoveTrailingSlash).section("/",1,-1));
+		browser = new ServiceBrowser(url.path(KUrl::RemoveTrailingSlash).section('/',1,-1));
 		connect(browser,SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),
 			this,SLOT(newService(DNSSD::RemoteService::Ptr)));
 		connect(browser,SIGNAL(finished()),this,SLOT(allReported()));
--- trunk/KDE/kdenetwork/kdnssd/kdedmodule/dnssdwatcher.cpp #918878:918879
@@ -50,8 +50,8 @@
 // from ioslave
 void DNSSDWatcher::dissect(const KUrl& url,QString& name,QString& type)
 {
-	type = url.path().section("/",1,1);
-	name = url.path().section("/",2,-1);
+	type = url.path().section('/',1,1);
+	name = url.path().section('/',2,-1);
 }
 
 
[prev in list] [next in list] [prev in thread] [next in thread]