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

List:       kde-commits
Subject:    KDE/kdelibs/dnssd
From:       Jakub Stachowski <qbast () go2 ! pl>
Date:       2008-04-01 21:37:10
Message-ID: 1207085830.943738.6767.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 792706 by qbast:

Models for services and domains



 M  +2 -2      CMakeLists.txt  
 M  +5 -1      avahi-servicebrowser.cpp  
 A             domainmodel.cpp   [License: LGPL (v2+)]
 A             domainmodel.h   [License: LGPL (v2+)]
 M  +5 -0      dummy-servicebrowser.cpp  
 M  +6 -0      mdnsd-servicebrowser.cpp  
 M  +6 -0      servicebrowser.h  
 A             servicemodel.cpp   [License: LGPL (v2+)]
 A             servicemodel.h   [License: LGPL (v2+)]


--- trunk/KDE/kdelibs/dnssd/CMakeLists.txt #792705:792706
@@ -4,7 +4,7 @@
 macro_log_feature(AVAHI_FOUND "Avahi" "For Linux and BSDs: a system which \
facilitates service discovery on a local network, based on the Zeroconf standard" \
"http://avahi.org" FALSE "" "Enables KDE applications access to multicast DNS/DNS-SD \
service discovery.")  
 include_directories( ${KDE4_KDEUI_INCLUDES} )
-set(kdnssd_LIB_SRCS  servicebase.cpp )
+set(kdnssd_LIB_SRCS  servicebase.cpp servicemodel.cpp domainmodel.cpp)
 kde4_add_kcfg_files(kdnssd_LIB_SRCS settings.kcfgc )
 
 if (HAVE_AVAHI) 
@@ -67,7 +67,7 @@
 
 ########### install files ###############
 install( FILES dnssd_export.h domainbrowser.h remoteservice.h servicetypebrowser.h \
                publicservice.h 
-               servicebase.h servicebrowser.h  \
${CMAKE_CURRENT_BINARY_DIR}/settings.h +               servicebase.h servicebrowser.h \
servicemodel.h domainmodel.h ${CMAKE_CURRENT_BINARY_DIR}/settings.h  DESTINATION  \
${INCLUDE_INSTALL_DIR}/dnssd COMPONENT Devel)  
 
--- trunk/KDE/kdelibs/dnssd/avahi-servicebrowser.cpp #792705:792706
@@ -46,11 +46,15 @@
 	QDBusReply<int> rep= s.GetState();
 	return (rep.isValid() && rep.value()==2) ? Working:Stopped;
 }
-ServiceBrowser::~ ServiceBrowser()
+ServiceBrowser::~ServiceBrowser()
 {
     delete d;
 }
 
+bool ServiceBrowser::isAutoResolving()
+{
+    return d->m_autoResolve;
+}
 
 void ServiceBrowser::startBrowse()
 {
--- trunk/KDE/kdelibs/dnssd/dummy-servicebrowser.cpp #792705:792706
@@ -29,7 +29,12 @@
 ServiceBrowser::ServiceBrowser(const QString&,bool,const QString&, const QString&) : \
d(0)  {}
 
+bool ServiceBrowser::isAutoResolving()
+{
+    return false;
+}
 
+
 ServiceBrowser::State ServiceBrowser::isAvailable()
 {
 	return Unsupported;
--- trunk/KDE/kdelibs/dnssd/mdnsd-servicebrowser.cpp #792705:792706
@@ -63,6 +63,12 @@
 	delete d;
 }
 
+bool ServiceBrowser::isAutoResolving()
+{
+    return d->m_autoResolve;
+}
+
+
 void ServiceBrowserPrivate::serviceResolved(bool success)
 {
 	QObject* sender_obj = const_cast<QObject*>(sender());
--- trunk/KDE/kdelibs/dnssd/servicebrowser.h #792705:792706
@@ -120,6 +120,12 @@
 
 	 */
 	static State isAvailable();
+	
+	/**
+	Returns true if newly discovered services are resolved before being reported with \
serviceAdded() +	\since 4.1
+	 */
+	bool isAutoResolving();
 
 Q_SIGNALS:
 	/**


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