Housekeeping

CMakeLists.txt

@@ -1,10 +1,11 @@
 project(androidshine)
+cmake_minimum_required(VERSION 2.6)
 
 find_package(KDE4 REQUIRED)
 
 include(KDE4Defaults)
 include_directories(${KDE4_INCLUDES})
 
-add_subdirectory(src)
-
+add_subdirectory(daemon)
+add_subdirectory(kcm)
 add_subdirectory(test)

daemon/CMakeLists.txt

@@ -1,15 +1,20 @@
 set(kded_androidshine_SRCS
-    fakeannouncer.cpp
-    echodevicelink.cpp
-    udpdevicelink.cpp
-    avahiannouncer.cpp
-    pausemusicpackagereceiver.cpp
-    notificationpackagereceiver.cpp
+
+    announcers/announcer.cpp
+    announcers/fakeannouncer.cpp
+    announcers/avahiannouncer.cpp
+
+    devicelinks/echodevicelink.cpp
+    devicelinks/udpdevicelink.cpp
+    devicelinks/devicelink.cpp
+
+    packagereceivers/packagereceiver.cpp
+    packagereceivers/pausemusicpackagereceiver.cpp
+    packagereceivers/notificationpackagereceiver.cpp
+
     networkpackage.cpp
     daemon.cpp
-    devicelink.cpp
-    announcer.cpp
-    packagereceiver.cpp
+
 )
 
 kde4_add_plugin(kded_androidshine ${kded_androidshine_SRCS})

daemon/announcers/announcer.h

@@ -24,7 +24,7 @@
 #include <qvector.h>
 #include <QObject>
 
-#include "devicelink.h"
+#include "devicelinks/devicelink.h"
 #include "device.h"
 
 class Announcer

daemon/announcers/avahiannouncer.cpp

@@ -20,7 +20,7 @@
 
 #include "avahiannouncer.h"
 
-#include "udpdevicelink.h"
+#include "devicelinks/udpdevicelink.h"
 
 AvahiAnnouncer::AvahiAnnouncer()
 {

daemon/announcers/fakeannouncer.cpp

@@ -19,7 +19,7 @@
  */
 
 #include "fakeannouncer.h"
-#include "echodevicelink.h"
+#include "devicelinks/echodevicelink.h"
 
 FakeAnnouncer::FakeAnnouncer()
 {

daemon/daemon.cpp

@@ -20,10 +20,10 @@
 
 #include "daemon.h"
 #include "networkpackage.h"
-#include "notificationpackagereceiver.h"
-#include "pausemusicpackagereceiver.h"
-#include "avahiannouncer.h"
-#include "fakeannouncer.h"
+#include "packagereceivers/notificationpackagereceiver.h"
+#include "packagereceivers/pausemusicpackagereceiver.h"
+#include "announcers/avahiannouncer.h"
+#include "announcers/fakeannouncer.h"
 
 #include <QtNetwork/QUdpSocket>
 #include <QFile>

daemon/daemon.h

@@ -37,9 +37,9 @@
 #include <QSet>
 
 #include "device.h"
-#include "packagereceiver.h"
-#include "devicelink.h"
-#include "announcer.h"
+#include "packagereceivers/packagereceiver.h"
+#include "devicelinks/devicelink.h"
+#include "announcers/announcer.h"
 
 class QUdpSocket;
 

test/CMakeLists.txt

@@ -8,6 +8,7 @@ target_link_libraries(kded_androidshine_tests
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KDEUI_LIBS}
     kdnssd
+    ${QT_QTTEST_LIBRARY}
     ${QT_QTNETWORK_LIBRARY}
 )