[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-03-12 20:41:19
Message-ID: 1205354479.696361.5759.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 784942 by qbast:

QAction with submenu containing all found service.



 M  +2 -2      CMakeLists.txt  
 M  +1 -1      mdnsd-servicebrowser.cpp  
 M  +3 -0      remoteservice.h  
 A             servicesaction.cpp   [License: LGPL (v2+)]
 A             servicesaction.h   [License: LGPL (v2+)]


--- trunk/KDE/kdelibs/dnssd/CMakeLists.txt #784941:784942
@@ -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  servicesaction.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 servicesaction.h \
${CMAKE_CURRENT_BINARY_DIR}/settings.h  DESTINATION  ${INCLUDE_INSTALL_DIR}/dnssd \
COMPONENT Devel)  
 
--- trunk/KDE/kdelibs/dnssd/mdnsd-servicebrowser.cpp #784941:784942
@@ -134,7 +134,7 @@
 			connect(svr.data(),SIGNAL(resolved(bool )),this,SLOT(serviceResolved(bool )));
 			m_duringResolve+=svr;
 			svr->resolveAsync();
-		    } else	{
+		    } else {
 			m_services+=svr;
 			emit m_parent->serviceAdded(svr);
 		    }
--- trunk/KDE/kdelibs/dnssd/remoteservice.h #784941:784942
@@ -22,6 +22,7 @@
 #define DNSSDREMOTESERVICE_H
 
 #include <QtCore/QObject>
+#include <QtCore/QMetaType>
 #include <dnssd/servicebase.h>
 
 namespace DNSSD
@@ -88,4 +89,6 @@
 
 }
 
+Q_DECLARE_METATYPE(DNSSD::RemoteService::Ptr)
+
 #endif


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