Renamed daemon -> kded

2013-09-02 03:23:34 +02:00 · 2013-09-02 03:23:34 +02:00 · 36e5d41811
commit 36e5d41811
parent f59ab45644
73 changed files with 8 additions and 10 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -12,7 +12,7 @@ include(KDE4Defaults)
 include_directories(${KDE4_INCLUDES})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

-add_subdirectory(daemon)
+add_subdirectory(kded)
 add_subdirectory(libkdeconnect)
 add_subdirectory(kcm)
 #add_subdirectory(kioslave)
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
--- a/daemon/daemon.cpp
+++ b/daemon/daemon.cpp
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
--- a/daemon/default_args.h
+++ b/daemon/default_args.h
--- a/daemon/device.cpp
+++ b/daemon/device.cpp
--- a/daemon/device.h
+++ b/daemon/device.h
--- a/daemon/devicelinks/devicelink.cpp
+++ b/daemon/devicelinks/devicelink.cpp
--- a/daemon/devicelinks/devicelink.h
+++ b/daemon/devicelinks/devicelink.h
--- a/daemon/devicelinks/landevicelink.cpp
+++ b/daemon/devicelinks/landevicelink.cpp
--- a/daemon/devicelinks/landevicelink.h
+++ b/daemon/devicelinks/landevicelink.h
--- a/daemon/devicelinks/loopbackdevicelink.cpp
+++ b/daemon/devicelinks/loopbackdevicelink.cpp
--- a/daemon/devicelinks/loopbackdevicelink.h
+++ b/daemon/devicelinks/loopbackdevicelink.h
--- a/daemon/kdeconnect.desktop
+++ b/daemon/kdeconnect.desktop
--- a/daemon/kdeconnect.notifyrc
+++ b/daemon/kdeconnect.notifyrc
--- a/daemon/linkproviders/lanlinkprovider.cpp
+++ b/daemon/linkproviders/lanlinkprovider.cpp
--- a/daemon/linkproviders/lanlinkprovider.h
+++ b/daemon/linkproviders/lanlinkprovider.h
--- a/daemon/linkproviders/linkprovider.cpp
+++ b/daemon/linkproviders/linkprovider.cpp
--- a/daemon/linkproviders/linkprovider.h
+++ b/daemon/linkproviders/linkprovider.h
--- a/daemon/linkproviders/loopbacklinkprovider.cpp
+++ b/daemon/linkproviders/loopbacklinkprovider.cpp
--- a/daemon/linkproviders/loopbacklinkprovider.h
+++ b/daemon/linkproviders/loopbacklinkprovider.h
--- a/daemon/netaddress.h
+++ b/daemon/netaddress.h
--- a/daemon/networkpackage.cpp
+++ b/daemon/networkpackage.cpp
--- a/daemon/networkpackage.h
+++ b/daemon/networkpackage.h
--- a/daemon/networkpackagetypes.h
+++ b/daemon/networkpackagetypes.h
--- a/daemon/plugins/CMakeLists.txt
+++ b/daemon/plugins/CMakeLists.txt
--- a/daemon/plugins/battery/CMakeLists.txt
+++ b/daemon/plugins/battery/CMakeLists.txt
--- a/daemon/plugins/battery/batterydbusinterface.cpp
+++ b/daemon/plugins/battery/batterydbusinterface.cpp
--- a/daemon/plugins/battery/batterydbusinterface.h
+++ b/daemon/plugins/battery/batterydbusinterface.h
--- a/daemon/plugins/battery/batteryplugin.cpp
+++ b/daemon/plugins/battery/batteryplugin.cpp
--- a/daemon/plugins/battery/batteryplugin.h
+++ b/daemon/plugins/battery/batteryplugin.h
--- a/daemon/plugins/battery/kdeconnect_battery.desktop
+++ b/daemon/plugins/battery/kdeconnect_battery.desktop
--- a/daemon/plugins/clipboard/CMakeLists.txt
+++ b/daemon/plugins/clipboard/CMakeLists.txt
--- a/daemon/plugins/clipboard/clipboardplugin.cpp
+++ b/daemon/plugins/clipboard/clipboardplugin.cpp
--- a/daemon/plugins/clipboard/clipboardplugin.h
+++ b/daemon/plugins/clipboard/clipboardplugin.h
--- a/daemon/plugins/clipboard/kdeconnect_clipboard.desktop
+++ b/daemon/plugins/clipboard/kdeconnect_clipboard.desktop
--- a/daemon/plugins/filetransfer/CMakeLists.txt
+++ b/daemon/plugins/filetransfer/CMakeLists.txt
--- a/daemon/plugins/filetransfer/filetransferplugin.cpp
+++ b/daemon/plugins/filetransfer/filetransferplugin.cpp
--- a/daemon/plugins/filetransfer/filetransferplugin.h
+++ b/daemon/plugins/filetransfer/filetransferplugin.h
--- a/daemon/plugins/filetransfer/kdeconnect_filetransfer.desktop
+++ b/daemon/plugins/filetransfer/kdeconnect_filetransfer.desktop
--- a/daemon/plugins/kdeconnect_plugin.desktop
+++ b/daemon/plugins/kdeconnect_plugin.desktop
--- a/daemon/plugins/kdeconnectplugin.cpp
+++ b/daemon/plugins/kdeconnectplugin.cpp
--- a/daemon/plugins/kdeconnectplugin.h
+++ b/daemon/plugins/kdeconnectplugin.h
--- a/daemon/plugins/mpriscontrol/CMakeLists.txt
+++ b/daemon/plugins/mpriscontrol/CMakeLists.txt
--- a/daemon/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop
+++ b/daemon/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop
--- a/daemon/plugins/mpriscontrol/mpriscontrolplugin.cpp
+++ b/daemon/plugins/mpriscontrol/mpriscontrolplugin.cpp
--- a/daemon/plugins/mpriscontrol/mpriscontrolplugin.h
+++ b/daemon/plugins/mpriscontrol/mpriscontrolplugin.h
--- a/daemon/plugins/mpriscontrol/mprisdbusinterface.xml
+++ b/daemon/plugins/mpriscontrol/mprisdbusinterface.xml
--- a/daemon/plugins/mpriscontrol/propertiesInterface.xml
+++ b/daemon/plugins/mpriscontrol/propertiesInterface.xml
--- a/daemon/plugins/notifications/CMakeLists.txt
+++ b/daemon/plugins/notifications/CMakeLists.txt
--- a/daemon/plugins/notifications/kdeconnect_notifications.desktop
+++ b/daemon/plugins/notifications/kdeconnect_notifications.desktop
--- a/daemon/plugins/notifications/notification.cpp
+++ b/daemon/plugins/notifications/notification.cpp
--- a/daemon/plugins/notifications/notification.h
+++ b/daemon/plugins/notifications/notification.h
--- a/daemon/plugins/notifications/notificationsdbusinterface.cpp
+++ b/daemon/plugins/notifications/notificationsdbusinterface.cpp
--- a/daemon/plugins/notifications/notificationsdbusinterface.h
+++ b/daemon/plugins/notifications/notificationsdbusinterface.h
--- a/daemon/plugins/notifications/notificationsplugin.cpp
+++ b/daemon/plugins/notifications/notificationsplugin.cpp
--- a/daemon/plugins/notifications/notificationsplugin.h
+++ b/daemon/plugins/notifications/notificationsplugin.h
--- a/daemon/plugins/pausemusic/CMakeLists.txt
+++ b/daemon/plugins/pausemusic/CMakeLists.txt
--- a/daemon/plugins/pausemusic/kdeconnect_pausemusic.desktop
+++ b/daemon/plugins/pausemusic/kdeconnect_pausemusic.desktop
--- a/daemon/plugins/pausemusic/pausemusicplugin.cpp
+++ b/daemon/plugins/pausemusic/pausemusicplugin.cpp
--- a/daemon/plugins/pausemusic/pausemusicplugin.h
+++ b/daemon/plugins/pausemusic/pausemusicplugin.h
--- a/daemon/plugins/ping/CMakeLists.txt
+++ b/daemon/plugins/ping/CMakeLists.txt
--- a/daemon/plugins/ping/kdeconnect_ping.desktop
+++ b/daemon/plugins/ping/kdeconnect_ping.desktop
--- a/daemon/plugins/ping/pingplugin.cpp
+++ b/daemon/plugins/ping/pingplugin.cpp
--- a/daemon/plugins/ping/pingplugin.h
+++ b/daemon/plugins/ping/pingplugin.h
--- a/daemon/plugins/pluginloader.cpp
+++ b/daemon/plugins/pluginloader.cpp
--- a/daemon/plugins/pluginloader.h
+++ b/daemon/plugins/pluginloader.h
--- a/daemon/plugins/telephony/CMakeLists.txt
+++ b/daemon/plugins/telephony/CMakeLists.txt
--- a/daemon/plugins/telephony/kdeconnect_telephony.desktop
+++ b/daemon/plugins/telephony/kdeconnect_telephony.desktop
--- a/daemon/plugins/telephony/telephonyplugin.cpp
+++ b/daemon/plugins/telephony/telephonyplugin.cpp
--- a/daemon/plugins/telephony/telephonyplugin.h
+++ b/daemon/plugins/telephony/telephonyplugin.h
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -8,14 +8,7 @@ include_directories(
    ${QCA2_INCLUDE_DIR}
 )

-set(kdeconnect_tests_SRCS
-    ../daemon/networkpackage.cpp
-    networkpackagetests.cpp
-)
-
-kde4_add_unit_test(kdeconnect_tests ${kdeconnect_tests_SRCS})
-
-target_link_libraries(kdeconnect_tests
+set(kdeconnect_libraries
    ${KDE4_KDECORE_LIBS}
    ${KDE4_KDEUI_LIBS}
    ${QJSON_LIBRARIES}
@ -23,3 +16,8 @@ target_link_libraries(kdeconnect_tests
    ${QT_QTTEST_LIBRARY}
    ${QT_QTNETWORK_LIBRARY}
 )
+
+#NetworkPackage
+kde4_add_unit_test(kdeconnect_tests ../kded/networkpackage.cpp networkpackagetests.cpp)
+target_link_libraries(kdeconnect_tests ${kdeconnect_libraries})
+
--- a/tests/networkpackagetests.cpp
+++ b/tests/networkpackagetests.cpp
@ -20,7 +20,7 @@

 #include "networkpackagetests.h"

-#include "../daemon/networkpackage.h"
+#include "../kded/networkpackage.h"

 #include <qtest_kde.h>
 #include <QtTest>