feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Zeroconf: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: If23da8a3ae819875c627d40375b908eb0ea73e3c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-10 18:27:15 +02:00
committed by Orgad Shaneh
parent 6e7b51f941
commit a95c00f77c
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/zeroconf/servicebrowser.cpp
View File

@@ -663,7 +663,7 @@ extern "C" void DNSSD_API cServiceResolveReply(DNSServiceRef
<< ((size_t)context);
ServiceGatherer *ctxGatherer = reinterpret_cast<ServiceGatherer *>(context);
if (ctxGatherer){
if (ctxGatherer->currentService->fullName() != fullname){
if (ctxGatherer->currentService->fullName() != QString::fromLocal8Bit(fullname)) {
qDebug() << "ServiceBrowser " << ctxGatherer->serviceBrowser->serviceType
<< " for service " << ctxGatherer->currentService->name()
<< " ignoring resolve reply for " << fullname << " vs. "
@@ -1078,7 +1078,7 @@ void ServiceGatherer::serviceResolveReply(DNSServiceFlags fl
}
currentService->m_interfaceNr = interfaceIndex;
currentService->m_port = port;
if (hostName != hosttarget) {
if (hostName != QString::fromUtf8(hosttarget)) {
hostName = QString::fromUtf8(hosttarget);
if (!currentService->host())
currentService->m_host = new QHostInfo();
@@ -1224,7 +1224,7 @@ void ServiceGatherer::addrReply(DNSServiceFlags flags,
serviceBrowser->updateFlowStatusForFlags(flags);
if (!currentService->host())
currentService->m_host = new QHostInfo();
if (currentService->host()->hostName() != hostname) {
if (currentService->host()->hostName() != QString::fromUtf8(hostname)) {
if ((flags & kDNSServiceFlagsAdd) == 1)
currentService->m_host->setHostName(QString::fromUtf8(hostname));
if (currentService->host()->addresses().isEmpty()) {
@@ -1475,9 +1475,9 @@ void ServiceBrowserPrivate::browseReply(DNSServiceFlags flag
QString newServiceName = QString::fromUtf8(serviceName);
QString newType = serviceType;
QString newDomain = domain;
if (serviceType != regtype) // discard? should not happen...
if (serviceType != QString::fromUtf8(regtype)) // discard? should not happen...
newType = QString::fromUtf8(regtype);
if (domain != replyDomain)
if (domain != QString::fromUtf8(replyDomain))
domain = QString::fromUtf8(replyDomain);
QString fullName = toFullNameC(serviceName, regtype, replyDomain);
updateFlowStatusForFlags(flags);