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

List:       kde-commits
Subject:    [kdelibs/frameworks] tier2/dnssd: Fix Build of KDNSSD with DNSSD Backend
From:       David E. Narvaez <david.narvaez () computer ! org>
Date:       2013-11-13 22:26:14
Message-ID: E1Vgit4-0006T3-6g () scm ! kde ! org
[Download RAW message or body]

Git commit f79e0f903e0d3aee44ddddc23c1d64b297fb6d31 by David E. Narvaez.
Committed on 13/11/2013 at 20:53.
Pushed by narvaez into branch 'frameworks'.

Fix Build of KDNSSD with DNSSD Backend

Adjusting the code to changes in Qt5.

REVIEW: 113792

M  +1    -3    tier2/dnssd/CMakeLists.txt
M  +3    -3    tier2/dnssd/src/CMakeLists.txt
M  +4    -4    tier2/dnssd/src/mdnsd-domainbrowser.cpp
M  +2    -2    tier2/dnssd/src/mdnsd-publicservice.cpp
M  +2    -2    tier2/dnssd/src/mdnsd-servicebrowser.cpp

http://commits.kde.org/kdelibs/f79e0f903e0d3aee44ddddc23c1d64b297fb6d31

diff --git a/tier2/dnssd/CMakeLists.txt b/tier2/dnssd/CMakeLists.txt
index 13497d1..8e28e9e 100644
--- a/tier2/dnssd/CMakeLists.txt
+++ b/tier2/dnssd/CMakeLists.txt
@@ -36,9 +36,7 @@ set_package_properties(Avahi PROPERTIES DESCRIPTION "Facilities for \
service disc  TYPE OPTIONAL
                        PURPOSE "Either Avahi or DNSSD is required for KDE \
applications to make use of multicast DNS/DNS-SD service discovery"  )
-if(AVAHI_FOUND)
-	find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus)
-endif()
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus)
 
 if(NOT AVAHI_FOUND)
     find_package(DNSSD)
diff --git a/tier2/dnssd/src/CMakeLists.txt b/tier2/dnssd/src/CMakeLists.txt
index c71ade2..ec20b9d 100644
--- a/tier2/dnssd/src/CMakeLists.txt
+++ b/tier2/dnssd/src/CMakeLists.txt
@@ -61,9 +61,9 @@ generate_export_header(KDNSSD
 )
 
 target_link_libraries(KDNSSD PUBLIC Qt5::Network)
-if(AVAHI_FOUND)
-  target_link_libraries(KDNSSD PRIVATE Qt5::DBus)
-elseif (DNSSD_FOUND)
+target_link_libraries(KDNSSD PRIVATE Qt5::DBus)
+
+if (DNSSD_FOUND)
   target_link_libraries(KDNSSD PRIVATE ${DNSSD_LIBRARIES}
                                             KF5::KConfigCore # settings.kcfgc
                        )
diff --git a/tier2/dnssd/src/mdnsd-domainbrowser.cpp \
b/tier2/dnssd/src/mdnsd-domainbrowser.cpp index 21c359e..c3c2032 100644
--- a/tier2/dnssd/src/mdnsd-domainbrowser.cpp
+++ b/tier2/dnssd/src/mdnsd-domainbrowser.cpp
@@ -54,8 +54,8 @@ DomainBrowser::~DomainBrowser()
 
 void DomainBrowser::startBrowse()
 {
-	QStringList::const_iterator itEnd = d->m_domains.end();
-	for (QStringList::const_iterator it=d->m_domains.begin(); it!=itEnd; ++it ) emit \
domainAdded(*it); +	QStringList::const_iterator itEnd = d->m_domains.cend();
+	for (QStringList::const_iterator it=d->m_domains.cbegin(); it!=itEnd; ++it ) emit \
domainAdded(*it);  if (d->isRunning()) return;
 	DNSServiceRef ref;
 	if (DNSServiceEnumerateDomains(&ref,(d->m_type==Browsing) ? \
kDNSServiceFlagsBrowseDomains:kDNSServiceFlagsBrowseDomains, @@ -85,8 +85,8 @@ void \
DomainBrowserPrivate::domainListChanged()  bool was_running = m_running;
 	m_running = false;
 	if (was_running) {
-		QStringList::const_iterator itEnd = m_domains.end();
-		for (QStringList::const_iterator it=m_domains.begin(); it!=itEnd; ++it )
+		QStringList::const_iterator itEnd = m_domains.cend();
+		for (QStringList::const_iterator it=m_domains.cbegin(); it!=itEnd; ++it )
 			emit m_parent->domainRemoved(*it);
 	}
 	m_domains.clear();
diff --git a/tier2/dnssd/src/mdnsd-publicservice.cpp \
b/tier2/dnssd/src/mdnsd-publicservice.cpp index 5da6f97..96f8db2 100644
--- a/tier2/dnssd/src/mdnsd-publicservice.cpp
+++ b/tier2/dnssd/src/mdnsd-publicservice.cpp
@@ -153,8 +153,8 @@ void PublicService::publishAsync()
 	if (d->isRunning()) stop();
 	TXTRecordRef txt;
 	TXTRecordCreate(&txt,0,0);
-	QMap<QString,QByteArray>::ConstIterator itEnd = d->m_textData.end();
-	for (QMap<QString,QByteArray>::ConstIterator it = d->m_textData.begin(); it!=itEnd \
; ++it) { +	QMap<QString,QByteArray>::ConstIterator itEnd = d->m_textData.cend();
+	for (QMap<QString,QByteArray>::ConstIterator it = d->m_textData.cbegin(); it!=itEnd \
; ++it) {  if (TXTRecordSetValue(&txt,it.key().toUtf8(),it.value().length(),it.value())!=kDNSServiceErr_NoError) \
{  TXTRecordDeallocate(&txt);
 			emit published(false);
diff --git a/tier2/dnssd/src/mdnsd-servicebrowser.cpp \
b/tier2/dnssd/src/mdnsd-servicebrowser.cpp index 37449db..a17694a 100644
--- a/tier2/dnssd/src/mdnsd-servicebrowser.cpp
+++ b/tier2/dnssd/src/mdnsd-servicebrowser.cpp
@@ -148,10 +148,10 @@ void ServiceBrowserPrivate::customEvent(QEvent* event)
 		else {
 
                 	RemoteService::Ptr found=find(svr, m_duringResolve);
-                	if (!found.isNull()) m_duringResolve.removeAll(found);
+                	if (found) m_duringResolve.removeAll(found);
                 	else {
                         	found=find(svr, m_services);
-                        	if (!found.isNull()) {
+                        	if (found) {
 	                        	emit m_parent->serviceRemoved(found);
                         	        m_services.removeAll(found);
                         	}


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