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

List:       kde-commits
Subject:    KDE/kdelibs/dnssd
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2009-01-02 18:31:01
Message-ID: 1230921061.063894.15838.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 904654 by alexmerry:

* Remove all the references to QtGui/kdeui we can without breaking BC.
* Change KShared to QSharedData (KShared is a typdef for QSharedData,
  kept for ease of porting)
* Add reference to kdeui in api docs settings to satisfy the one
  remaining (and unnecessary, but changing it is BIC) class referenced
  from that library
* Add KDE5 todos about removing the unnecessary kdeui dependency



 M  +1 -0      CMakeLists.txt  
 M  +2 -1      Mainpage.dox  
 M  +1 -1      avahi-remoteservice.cpp  
 M  +3 -3      mdnsd-remoteservice.cpp  
 M  +1 -1      mdnsd-sdevent.h  
 M  +1 -1      servicebase.h  
 M  +1 -0      settings.kcfgc  


--- trunk/KDE/kdelibs/dnssd/CMakeLists.txt #904653:904654
@@ -56,6 +56,7 @@
 
 kde4_add_library(kdnssd SHARED ${kdnssd_LIB_SRCS})
 
+# KDE 5: don't link against KDEUI_LIBS (when settings.kfgc is changed)
 if (HAVE_DNSSD)
   target_link_libraries(kdnssd ${KDE4_KDEUI_LIBS} ${DNSSD_LIBRARIES} ${QT_QTNETWORK_LIBRARY})
 else (HAVE_DNSSD)
--- trunk/KDE/kdelibs/dnssd/Mainpage.dox #904653:904654
@@ -33,7 +33,8 @@
 
 */
 
-// DOXYGEN_REFERENCES = kdecore
+// KDE5: get rid of kdeui reference when settings.kcfgc is changed
+// DOXYGEN_REFERENCES = kdecore kdeui
 // DOXYGEN_SET_PROJECT_NAME = DNSSD
 // DOXYGEN_SET_EXCLUDE_PATTERNS = */dnssd/avahi* */dnssd/mdnsd*
 // vim:ts=4:sw=4:expandtab:filetype=doxygen
--- trunk/KDE/kdelibs/dnssd/avahi-remoteservice.cpp #904653:904654
@@ -21,7 +21,7 @@
 #include "avahi-remoteservice_p.h"
 #include <netinet/in.h>
 #include <QtCore/QEventLoop>
-#include <QtGui/QApplication>
+#include <QtCore/QCoreApplication>
 #include <kdebug.h>
 #include "remoteservice.h"
 #include "avahi_server_interface.h"
--- trunk/KDE/kdelibs/dnssd/mdnsd-remoteservice.cpp #904653:904654
@@ -20,7 +20,7 @@
 
 #include <netinet/in.h>
 #include <QtCore/QEventLoop>
-#include <QtGui/QApplication>
+#include <QtCore/QCoreApplication>
 #include <kdebug.h>
 #include "remoteservice.h"
 #include "servicebase_p.h"
@@ -129,7 +129,7 @@
 	QObject *obj = reinterpret_cast<QObject*>(context);
 	if (errorCode != kDNSServiceErr_NoError) {
 		ErrorEvent err;
-		QApplication::sendEvent(obj, &err);	
+		QCoreApplication::sendEvent(obj, &err);	
 		return;
 	}
 	char key[256];
@@ -145,7 +145,7 @@
 			else map[QString::fromUtf8(key)].clear();
         }
 	ResolveEvent rev(DNSToDomain(hosttarget),ntohs(port),map);
-	QApplication::sendEvent(obj, &rev);
+	QCoreApplication::sendEvent(obj, &rev);
 }
 
 
--- trunk/KDE/kdelibs/dnssd/mdnsd-sdevent.h #904653:904654
@@ -21,7 +21,7 @@
 #ifndef MDNSD_SDEVENT_H
 #define MDNSD_SDEVENT_H
 
-#include <QtGui/QKeyEvent>
+#include <QtCore/QEvent>
 #include <QtCore/QString>
 #include <QtCore/QMap>
 
--- trunk/KDE/kdelibs/dnssd/servicebase.h #904653:904654
@@ -48,7 +48,7 @@
  *
  * @see PublicService
  */
-class KDNSSD_EXPORT ServiceBase : public KShared //krazy:exclude=dpointer (protected)
+class KDNSSD_EXPORT ServiceBase : public QSharedData //krazy:exclude=dpointer (protected)
 {
 public:
 	typedef KSharedPtr<ServiceBase> Ptr;
--- trunk/KDE/kdelibs/dnssd/settings.kcfgc #904653:904654
@@ -1,6 +1,7 @@
 ClassName=Configuration
 File=kcm_kdnssd.kcfg
 GlobalEnums=false
+#KDE5: inherit KCoreConfigSkeleton
 Inherits=KConfigSkeleton
 ItemAccessors=false
 MemberVariables=private
[prev in list] [next in list] [prev in thread] [next in thread]