From 36e5d41811c7748846ed5f0db55919282b66e285 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 2 Sep 2013 03:23:34 +0200 Subject: [PATCH] Renamed daemon -> kded --- CMakeLists.txt | 2 +- {daemon => kded}/CMakeLists.txt | 0 {daemon => kded}/daemon.cpp | 0 {daemon => kded}/daemon.h | 0 {daemon => kded}/default_args.h | 0 {daemon => kded}/device.cpp | 0 {daemon => kded}/device.h | 0 {daemon => kded}/devicelinks/devicelink.cpp | 0 {daemon => kded}/devicelinks/devicelink.h | 0 {daemon => kded}/devicelinks/landevicelink.cpp | 0 {daemon => kded}/devicelinks/landevicelink.h | 0 .../devicelinks/loopbackdevicelink.cpp | 0 {daemon => kded}/devicelinks/loopbackdevicelink.h | 0 {daemon => kded}/kdeconnect.desktop | 0 {daemon => kded}/kdeconnect.notifyrc | 0 {daemon => kded}/linkproviders/lanlinkprovider.cpp | 0 {daemon => kded}/linkproviders/lanlinkprovider.h | 0 {daemon => kded}/linkproviders/linkprovider.cpp | 0 {daemon => kded}/linkproviders/linkprovider.h | 0 .../linkproviders/loopbacklinkprovider.cpp | 0 .../linkproviders/loopbacklinkprovider.h | 0 {daemon => kded}/netaddress.h | 0 {daemon => kded}/networkpackage.cpp | 0 {daemon => kded}/networkpackage.h | 0 {daemon => kded}/networkpackagetypes.h | 0 {daemon => kded}/plugins/CMakeLists.txt | 0 {daemon => kded}/plugins/battery/CMakeLists.txt | 0 .../plugins/battery/batterydbusinterface.cpp | 0 .../plugins/battery/batterydbusinterface.h | 0 {daemon => kded}/plugins/battery/batteryplugin.cpp | 0 {daemon => kded}/plugins/battery/batteryplugin.h | 0 .../plugins/battery/kdeconnect_battery.desktop | 0 {daemon => kded}/plugins/clipboard/CMakeLists.txt | 0 .../plugins/clipboard/clipboardplugin.cpp | 0 .../plugins/clipboard/clipboardplugin.h | 0 .../plugins/clipboard/kdeconnect_clipboard.desktop | 0 .../plugins/filetransfer/CMakeLists.txt | 0 .../plugins/filetransfer/filetransferplugin.cpp | 0 .../plugins/filetransfer/filetransferplugin.h | 0 .../filetransfer/kdeconnect_filetransfer.desktop | 0 {daemon => kded}/plugins/kdeconnect_plugin.desktop | 0 {daemon => kded}/plugins/kdeconnectplugin.cpp | 0 {daemon => kded}/plugins/kdeconnectplugin.h | 0 .../plugins/mpriscontrol/CMakeLists.txt | 0 .../mpriscontrol/kdeconnect_mpriscontrol.desktop | 0 .../plugins/mpriscontrol/mpriscontrolplugin.cpp | 0 .../plugins/mpriscontrol/mpriscontrolplugin.h | 0 .../plugins/mpriscontrol/mprisdbusinterface.xml | 0 .../plugins/mpriscontrol/propertiesInterface.xml | 0 .../plugins/notifications/CMakeLists.txt | 0 .../notifications/kdeconnect_notifications.desktop | 0 .../plugins/notifications/notification.cpp | 0 .../plugins/notifications/notification.h | 0 .../notifications/notificationsdbusinterface.cpp | 0 .../notifications/notificationsdbusinterface.h | 0 .../plugins/notifications/notificationsplugin.cpp | 0 .../plugins/notifications/notificationsplugin.h | 0 {daemon => kded}/plugins/pausemusic/CMakeLists.txt | 0 .../pausemusic/kdeconnect_pausemusic.desktop | 0 .../plugins/pausemusic/pausemusicplugin.cpp | 0 .../plugins/pausemusic/pausemusicplugin.h | 0 {daemon => kded}/plugins/ping/CMakeLists.txt | 0 .../plugins/ping/kdeconnect_ping.desktop | 0 {daemon => kded}/plugins/ping/pingplugin.cpp | 0 {daemon => kded}/plugins/ping/pingplugin.h | 0 {daemon => kded}/plugins/pluginloader.cpp | 0 {daemon => kded}/plugins/pluginloader.h | 0 {daemon => kded}/plugins/telephony/CMakeLists.txt | 0 .../plugins/telephony/kdeconnect_telephony.desktop | 0 .../plugins/telephony/telephonyplugin.cpp | 0 .../plugins/telephony/telephonyplugin.h | 0 tests/CMakeLists.txt | 14 ++++++-------- tests/networkpackagetests.cpp | 2 +- 73 files changed, 8 insertions(+), 10 deletions(-) rename {daemon => kded}/CMakeLists.txt (100%) rename {daemon => kded}/daemon.cpp (100%) rename {daemon => kded}/daemon.h (100%) rename {daemon => kded}/default_args.h (100%) rename {daemon => kded}/device.cpp (100%) rename {daemon => kded}/device.h (100%) rename {daemon => kded}/devicelinks/devicelink.cpp (100%) rename {daemon => kded}/devicelinks/devicelink.h (100%) rename {daemon => kded}/devicelinks/landevicelink.cpp (100%) rename {daemon => kded}/devicelinks/landevicelink.h (100%) rename {daemon => kded}/devicelinks/loopbackdevicelink.cpp (100%) rename {daemon => kded}/devicelinks/loopbackdevicelink.h (100%) rename {daemon => kded}/kdeconnect.desktop (100%) rename {daemon => kded}/kdeconnect.notifyrc (100%) rename {daemon => kded}/linkproviders/lanlinkprovider.cpp (100%) rename {daemon => kded}/linkproviders/lanlinkprovider.h (100%) rename {daemon => kded}/linkproviders/linkprovider.cpp (100%) rename {daemon => kded}/linkproviders/linkprovider.h (100%) rename {daemon => kded}/linkproviders/loopbacklinkprovider.cpp (100%) rename {daemon => kded}/linkproviders/loopbacklinkprovider.h (100%) rename {daemon => kded}/netaddress.h (100%) rename {daemon => kded}/networkpackage.cpp (100%) rename {daemon => kded}/networkpackage.h (100%) rename {daemon => kded}/networkpackagetypes.h (100%) rename {daemon => kded}/plugins/CMakeLists.txt (100%) rename {daemon => kded}/plugins/battery/CMakeLists.txt (100%) rename {daemon => kded}/plugins/battery/batterydbusinterface.cpp (100%) rename {daemon => kded}/plugins/battery/batterydbusinterface.h (100%) rename {daemon => kded}/plugins/battery/batteryplugin.cpp (100%) rename {daemon => kded}/plugins/battery/batteryplugin.h (100%) rename {daemon => kded}/plugins/battery/kdeconnect_battery.desktop (100%) rename {daemon => kded}/plugins/clipboard/CMakeLists.txt (100%) rename {daemon => kded}/plugins/clipboard/clipboardplugin.cpp (100%) rename {daemon => kded}/plugins/clipboard/clipboardplugin.h (100%) rename {daemon => kded}/plugins/clipboard/kdeconnect_clipboard.desktop (100%) rename {daemon => kded}/plugins/filetransfer/CMakeLists.txt (100%) rename {daemon => kded}/plugins/filetransfer/filetransferplugin.cpp (100%) rename {daemon => kded}/plugins/filetransfer/filetransferplugin.h (100%) rename {daemon => kded}/plugins/filetransfer/kdeconnect_filetransfer.desktop (100%) rename {daemon => kded}/plugins/kdeconnect_plugin.desktop (100%) rename {daemon => kded}/plugins/kdeconnectplugin.cpp (100%) rename {daemon => kded}/plugins/kdeconnectplugin.h (100%) rename {daemon => kded}/plugins/mpriscontrol/CMakeLists.txt (100%) rename {daemon => kded}/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop (100%) rename {daemon => kded}/plugins/mpriscontrol/mpriscontrolplugin.cpp (100%) rename {daemon => kded}/plugins/mpriscontrol/mpriscontrolplugin.h (100%) rename {daemon => kded}/plugins/mpriscontrol/mprisdbusinterface.xml (100%) rename {daemon => kded}/plugins/mpriscontrol/propertiesInterface.xml (100%) rename {daemon => kded}/plugins/notifications/CMakeLists.txt (100%) rename {daemon => kded}/plugins/notifications/kdeconnect_notifications.desktop (100%) rename {daemon => kded}/plugins/notifications/notification.cpp (100%) rename {daemon => kded}/plugins/notifications/notification.h (100%) rename {daemon => kded}/plugins/notifications/notificationsdbusinterface.cpp (100%) rename {daemon => kded}/plugins/notifications/notificationsdbusinterface.h (100%) rename {daemon => kded}/plugins/notifications/notificationsplugin.cpp (100%) rename {daemon => kded}/plugins/notifications/notificationsplugin.h (100%) rename {daemon => kded}/plugins/pausemusic/CMakeLists.txt (100%) rename {daemon => kded}/plugins/pausemusic/kdeconnect_pausemusic.desktop (100%) rename {daemon => kded}/plugins/pausemusic/pausemusicplugin.cpp (100%) rename {daemon => kded}/plugins/pausemusic/pausemusicplugin.h (100%) rename {daemon => kded}/plugins/ping/CMakeLists.txt (100%) rename {daemon => kded}/plugins/ping/kdeconnect_ping.desktop (100%) rename {daemon => kded}/plugins/ping/pingplugin.cpp (100%) rename {daemon => kded}/plugins/ping/pingplugin.h (100%) rename {daemon => kded}/plugins/pluginloader.cpp (100%) rename {daemon => kded}/plugins/pluginloader.h (100%) rename {daemon => kded}/plugins/telephony/CMakeLists.txt (100%) rename {daemon => kded}/plugins/telephony/kdeconnect_telephony.desktop (100%) rename {daemon => kded}/plugins/telephony/telephonyplugin.cpp (100%) rename {daemon => kded}/plugins/telephony/telephonyplugin.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 11b350a67..eecdbd71a 100644 --- 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) diff --git a/daemon/CMakeLists.txt b/kded/CMakeLists.txt similarity index 100% rename from daemon/CMakeLists.txt rename to kded/CMakeLists.txt diff --git a/daemon/daemon.cpp b/kded/daemon.cpp similarity index 100% rename from daemon/daemon.cpp rename to kded/daemon.cpp diff --git a/daemon/daemon.h b/kded/daemon.h similarity index 100% rename from daemon/daemon.h rename to kded/daemon.h diff --git a/daemon/default_args.h b/kded/default_args.h similarity index 100% rename from daemon/default_args.h rename to kded/default_args.h diff --git a/daemon/device.cpp b/kded/device.cpp similarity index 100% rename from daemon/device.cpp rename to kded/device.cpp diff --git a/daemon/device.h b/kded/device.h similarity index 100% rename from daemon/device.h rename to kded/device.h diff --git a/daemon/devicelinks/devicelink.cpp b/kded/devicelinks/devicelink.cpp similarity index 100% rename from daemon/devicelinks/devicelink.cpp rename to kded/devicelinks/devicelink.cpp diff --git a/daemon/devicelinks/devicelink.h b/kded/devicelinks/devicelink.h similarity index 100% rename from daemon/devicelinks/devicelink.h rename to kded/devicelinks/devicelink.h diff --git a/daemon/devicelinks/landevicelink.cpp b/kded/devicelinks/landevicelink.cpp similarity index 100% rename from daemon/devicelinks/landevicelink.cpp rename to kded/devicelinks/landevicelink.cpp diff --git a/daemon/devicelinks/landevicelink.h b/kded/devicelinks/landevicelink.h similarity index 100% rename from daemon/devicelinks/landevicelink.h rename to kded/devicelinks/landevicelink.h diff --git a/daemon/devicelinks/loopbackdevicelink.cpp b/kded/devicelinks/loopbackdevicelink.cpp similarity index 100% rename from daemon/devicelinks/loopbackdevicelink.cpp rename to kded/devicelinks/loopbackdevicelink.cpp diff --git a/daemon/devicelinks/loopbackdevicelink.h b/kded/devicelinks/loopbackdevicelink.h similarity index 100% rename from daemon/devicelinks/loopbackdevicelink.h rename to kded/devicelinks/loopbackdevicelink.h diff --git a/daemon/kdeconnect.desktop b/kded/kdeconnect.desktop similarity index 100% rename from daemon/kdeconnect.desktop rename to kded/kdeconnect.desktop diff --git a/daemon/kdeconnect.notifyrc b/kded/kdeconnect.notifyrc similarity index 100% rename from daemon/kdeconnect.notifyrc rename to kded/kdeconnect.notifyrc diff --git a/daemon/linkproviders/lanlinkprovider.cpp b/kded/linkproviders/lanlinkprovider.cpp similarity index 100% rename from daemon/linkproviders/lanlinkprovider.cpp rename to kded/linkproviders/lanlinkprovider.cpp diff --git a/daemon/linkproviders/lanlinkprovider.h b/kded/linkproviders/lanlinkprovider.h similarity index 100% rename from daemon/linkproviders/lanlinkprovider.h rename to kded/linkproviders/lanlinkprovider.h diff --git a/daemon/linkproviders/linkprovider.cpp b/kded/linkproviders/linkprovider.cpp similarity index 100% rename from daemon/linkproviders/linkprovider.cpp rename to kded/linkproviders/linkprovider.cpp diff --git a/daemon/linkproviders/linkprovider.h b/kded/linkproviders/linkprovider.h similarity index 100% rename from daemon/linkproviders/linkprovider.h rename to kded/linkproviders/linkprovider.h diff --git a/daemon/linkproviders/loopbacklinkprovider.cpp b/kded/linkproviders/loopbacklinkprovider.cpp similarity index 100% rename from daemon/linkproviders/loopbacklinkprovider.cpp rename to kded/linkproviders/loopbacklinkprovider.cpp diff --git a/daemon/linkproviders/loopbacklinkprovider.h b/kded/linkproviders/loopbacklinkprovider.h similarity index 100% rename from daemon/linkproviders/loopbacklinkprovider.h rename to kded/linkproviders/loopbacklinkprovider.h diff --git a/daemon/netaddress.h b/kded/netaddress.h similarity index 100% rename from daemon/netaddress.h rename to kded/netaddress.h diff --git a/daemon/networkpackage.cpp b/kded/networkpackage.cpp similarity index 100% rename from daemon/networkpackage.cpp rename to kded/networkpackage.cpp diff --git a/daemon/networkpackage.h b/kded/networkpackage.h similarity index 100% rename from daemon/networkpackage.h rename to kded/networkpackage.h diff --git a/daemon/networkpackagetypes.h b/kded/networkpackagetypes.h similarity index 100% rename from daemon/networkpackagetypes.h rename to kded/networkpackagetypes.h diff --git a/daemon/plugins/CMakeLists.txt b/kded/plugins/CMakeLists.txt similarity index 100% rename from daemon/plugins/CMakeLists.txt rename to kded/plugins/CMakeLists.txt diff --git a/daemon/plugins/battery/CMakeLists.txt b/kded/plugins/battery/CMakeLists.txt similarity index 100% rename from daemon/plugins/battery/CMakeLists.txt rename to kded/plugins/battery/CMakeLists.txt diff --git a/daemon/plugins/battery/batterydbusinterface.cpp b/kded/plugins/battery/batterydbusinterface.cpp similarity index 100% rename from daemon/plugins/battery/batterydbusinterface.cpp rename to kded/plugins/battery/batterydbusinterface.cpp diff --git a/daemon/plugins/battery/batterydbusinterface.h b/kded/plugins/battery/batterydbusinterface.h similarity index 100% rename from daemon/plugins/battery/batterydbusinterface.h rename to kded/plugins/battery/batterydbusinterface.h diff --git a/daemon/plugins/battery/batteryplugin.cpp b/kded/plugins/battery/batteryplugin.cpp similarity index 100% rename from daemon/plugins/battery/batteryplugin.cpp rename to kded/plugins/battery/batteryplugin.cpp diff --git a/daemon/plugins/battery/batteryplugin.h b/kded/plugins/battery/batteryplugin.h similarity index 100% rename from daemon/plugins/battery/batteryplugin.h rename to kded/plugins/battery/batteryplugin.h diff --git a/daemon/plugins/battery/kdeconnect_battery.desktop b/kded/plugins/battery/kdeconnect_battery.desktop similarity index 100% rename from daemon/plugins/battery/kdeconnect_battery.desktop rename to kded/plugins/battery/kdeconnect_battery.desktop diff --git a/daemon/plugins/clipboard/CMakeLists.txt b/kded/plugins/clipboard/CMakeLists.txt similarity index 100% rename from daemon/plugins/clipboard/CMakeLists.txt rename to kded/plugins/clipboard/CMakeLists.txt diff --git a/daemon/plugins/clipboard/clipboardplugin.cpp b/kded/plugins/clipboard/clipboardplugin.cpp similarity index 100% rename from daemon/plugins/clipboard/clipboardplugin.cpp rename to kded/plugins/clipboard/clipboardplugin.cpp diff --git a/daemon/plugins/clipboard/clipboardplugin.h b/kded/plugins/clipboard/clipboardplugin.h similarity index 100% rename from daemon/plugins/clipboard/clipboardplugin.h rename to kded/plugins/clipboard/clipboardplugin.h diff --git a/daemon/plugins/clipboard/kdeconnect_clipboard.desktop b/kded/plugins/clipboard/kdeconnect_clipboard.desktop similarity index 100% rename from daemon/plugins/clipboard/kdeconnect_clipboard.desktop rename to kded/plugins/clipboard/kdeconnect_clipboard.desktop diff --git a/daemon/plugins/filetransfer/CMakeLists.txt b/kded/plugins/filetransfer/CMakeLists.txt similarity index 100% rename from daemon/plugins/filetransfer/CMakeLists.txt rename to kded/plugins/filetransfer/CMakeLists.txt diff --git a/daemon/plugins/filetransfer/filetransferplugin.cpp b/kded/plugins/filetransfer/filetransferplugin.cpp similarity index 100% rename from daemon/plugins/filetransfer/filetransferplugin.cpp rename to kded/plugins/filetransfer/filetransferplugin.cpp diff --git a/daemon/plugins/filetransfer/filetransferplugin.h b/kded/plugins/filetransfer/filetransferplugin.h similarity index 100% rename from daemon/plugins/filetransfer/filetransferplugin.h rename to kded/plugins/filetransfer/filetransferplugin.h diff --git a/daemon/plugins/filetransfer/kdeconnect_filetransfer.desktop b/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop similarity index 100% rename from daemon/plugins/filetransfer/kdeconnect_filetransfer.desktop rename to kded/plugins/filetransfer/kdeconnect_filetransfer.desktop diff --git a/daemon/plugins/kdeconnect_plugin.desktop b/kded/plugins/kdeconnect_plugin.desktop similarity index 100% rename from daemon/plugins/kdeconnect_plugin.desktop rename to kded/plugins/kdeconnect_plugin.desktop diff --git a/daemon/plugins/kdeconnectplugin.cpp b/kded/plugins/kdeconnectplugin.cpp similarity index 100% rename from daemon/plugins/kdeconnectplugin.cpp rename to kded/plugins/kdeconnectplugin.cpp diff --git a/daemon/plugins/kdeconnectplugin.h b/kded/plugins/kdeconnectplugin.h similarity index 100% rename from daemon/plugins/kdeconnectplugin.h rename to kded/plugins/kdeconnectplugin.h diff --git a/daemon/plugins/mpriscontrol/CMakeLists.txt b/kded/plugins/mpriscontrol/CMakeLists.txt similarity index 100% rename from daemon/plugins/mpriscontrol/CMakeLists.txt rename to kded/plugins/mpriscontrol/CMakeLists.txt diff --git a/daemon/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop b/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop similarity index 100% rename from daemon/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop rename to kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop diff --git a/daemon/plugins/mpriscontrol/mpriscontrolplugin.cpp b/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp similarity index 100% rename from daemon/plugins/mpriscontrol/mpriscontrolplugin.cpp rename to kded/plugins/mpriscontrol/mpriscontrolplugin.cpp diff --git a/daemon/plugins/mpriscontrol/mpriscontrolplugin.h b/kded/plugins/mpriscontrol/mpriscontrolplugin.h similarity index 100% rename from daemon/plugins/mpriscontrol/mpriscontrolplugin.h rename to kded/plugins/mpriscontrol/mpriscontrolplugin.h diff --git a/daemon/plugins/mpriscontrol/mprisdbusinterface.xml b/kded/plugins/mpriscontrol/mprisdbusinterface.xml similarity index 100% rename from daemon/plugins/mpriscontrol/mprisdbusinterface.xml rename to kded/plugins/mpriscontrol/mprisdbusinterface.xml diff --git a/daemon/plugins/mpriscontrol/propertiesInterface.xml b/kded/plugins/mpriscontrol/propertiesInterface.xml similarity index 100% rename from daemon/plugins/mpriscontrol/propertiesInterface.xml rename to kded/plugins/mpriscontrol/propertiesInterface.xml diff --git a/daemon/plugins/notifications/CMakeLists.txt b/kded/plugins/notifications/CMakeLists.txt similarity index 100% rename from daemon/plugins/notifications/CMakeLists.txt rename to kded/plugins/notifications/CMakeLists.txt diff --git a/daemon/plugins/notifications/kdeconnect_notifications.desktop b/kded/plugins/notifications/kdeconnect_notifications.desktop similarity index 100% rename from daemon/plugins/notifications/kdeconnect_notifications.desktop rename to kded/plugins/notifications/kdeconnect_notifications.desktop diff --git a/daemon/plugins/notifications/notification.cpp b/kded/plugins/notifications/notification.cpp similarity index 100% rename from daemon/plugins/notifications/notification.cpp rename to kded/plugins/notifications/notification.cpp diff --git a/daemon/plugins/notifications/notification.h b/kded/plugins/notifications/notification.h similarity index 100% rename from daemon/plugins/notifications/notification.h rename to kded/plugins/notifications/notification.h diff --git a/daemon/plugins/notifications/notificationsdbusinterface.cpp b/kded/plugins/notifications/notificationsdbusinterface.cpp similarity index 100% rename from daemon/plugins/notifications/notificationsdbusinterface.cpp rename to kded/plugins/notifications/notificationsdbusinterface.cpp diff --git a/daemon/plugins/notifications/notificationsdbusinterface.h b/kded/plugins/notifications/notificationsdbusinterface.h similarity index 100% rename from daemon/plugins/notifications/notificationsdbusinterface.h rename to kded/plugins/notifications/notificationsdbusinterface.h diff --git a/daemon/plugins/notifications/notificationsplugin.cpp b/kded/plugins/notifications/notificationsplugin.cpp similarity index 100% rename from daemon/plugins/notifications/notificationsplugin.cpp rename to kded/plugins/notifications/notificationsplugin.cpp diff --git a/daemon/plugins/notifications/notificationsplugin.h b/kded/plugins/notifications/notificationsplugin.h similarity index 100% rename from daemon/plugins/notifications/notificationsplugin.h rename to kded/plugins/notifications/notificationsplugin.h diff --git a/daemon/plugins/pausemusic/CMakeLists.txt b/kded/plugins/pausemusic/CMakeLists.txt similarity index 100% rename from daemon/plugins/pausemusic/CMakeLists.txt rename to kded/plugins/pausemusic/CMakeLists.txt diff --git a/daemon/plugins/pausemusic/kdeconnect_pausemusic.desktop b/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop similarity index 100% rename from daemon/plugins/pausemusic/kdeconnect_pausemusic.desktop rename to kded/plugins/pausemusic/kdeconnect_pausemusic.desktop diff --git a/daemon/plugins/pausemusic/pausemusicplugin.cpp b/kded/plugins/pausemusic/pausemusicplugin.cpp similarity index 100% rename from daemon/plugins/pausemusic/pausemusicplugin.cpp rename to kded/plugins/pausemusic/pausemusicplugin.cpp diff --git a/daemon/plugins/pausemusic/pausemusicplugin.h b/kded/plugins/pausemusic/pausemusicplugin.h similarity index 100% rename from daemon/plugins/pausemusic/pausemusicplugin.h rename to kded/plugins/pausemusic/pausemusicplugin.h diff --git a/daemon/plugins/ping/CMakeLists.txt b/kded/plugins/ping/CMakeLists.txt similarity index 100% rename from daemon/plugins/ping/CMakeLists.txt rename to kded/plugins/ping/CMakeLists.txt diff --git a/daemon/plugins/ping/kdeconnect_ping.desktop b/kded/plugins/ping/kdeconnect_ping.desktop similarity index 100% rename from daemon/plugins/ping/kdeconnect_ping.desktop rename to kded/plugins/ping/kdeconnect_ping.desktop diff --git a/daemon/plugins/ping/pingplugin.cpp b/kded/plugins/ping/pingplugin.cpp similarity index 100% rename from daemon/plugins/ping/pingplugin.cpp rename to kded/plugins/ping/pingplugin.cpp diff --git a/daemon/plugins/ping/pingplugin.h b/kded/plugins/ping/pingplugin.h similarity index 100% rename from daemon/plugins/ping/pingplugin.h rename to kded/plugins/ping/pingplugin.h diff --git a/daemon/plugins/pluginloader.cpp b/kded/plugins/pluginloader.cpp similarity index 100% rename from daemon/plugins/pluginloader.cpp rename to kded/plugins/pluginloader.cpp diff --git a/daemon/plugins/pluginloader.h b/kded/plugins/pluginloader.h similarity index 100% rename from daemon/plugins/pluginloader.h rename to kded/plugins/pluginloader.h diff --git a/daemon/plugins/telephony/CMakeLists.txt b/kded/plugins/telephony/CMakeLists.txt similarity index 100% rename from daemon/plugins/telephony/CMakeLists.txt rename to kded/plugins/telephony/CMakeLists.txt diff --git a/daemon/plugins/telephony/kdeconnect_telephony.desktop b/kded/plugins/telephony/kdeconnect_telephony.desktop similarity index 100% rename from daemon/plugins/telephony/kdeconnect_telephony.desktop rename to kded/plugins/telephony/kdeconnect_telephony.desktop diff --git a/daemon/plugins/telephony/telephonyplugin.cpp b/kded/plugins/telephony/telephonyplugin.cpp similarity index 100% rename from daemon/plugins/telephony/telephonyplugin.cpp rename to kded/plugins/telephony/telephonyplugin.cpp diff --git a/daemon/plugins/telephony/telephonyplugin.h b/kded/plugins/telephony/telephonyplugin.h similarity index 100% rename from daemon/plugins/telephony/telephonyplugin.h rename to kded/plugins/telephony/telephonyplugin.h diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9bbb9c24f..3df090ab6 100644 --- 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}) + diff --git a/tests/networkpackagetests.cpp b/tests/networkpackagetests.cpp index 4ac834480..4090f7d56 100644 --- a/tests/networkpackagetests.cpp +++ b/tests/networkpackagetests.cpp @@ -20,7 +20,7 @@ #include "networkpackagetests.h" -#include "../daemon/networkpackage.h" +#include "../kded/networkpackage.h" #include #include