From b88897847bbfd349183cb22341a96b4f14afd146 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Sat, 14 Jun 2014 15:22:40 +0200 Subject: [PATCH] Reorganize sources We broke kded into core and kded, core contains the library with the backends and plugins. Also we renamed libkdeconnect to interfaces. --- CMakeLists.txt | 8 ++- cli/kdeconnect-cli.cpp | 4 +- core/CMakeLists.txt | 59 ++++++++++++++++ {kded => core}/Messages.sh | 0 {kded => core}/backends/devicelink.cpp | 0 {kded => core}/backends/devicelink.h | 0 {kded => core}/backends/lan/CMakeLists.txt | 0 {kded => core}/backends/lan/downloadjob.cpp | 0 {kded => core}/backends/lan/downloadjob.h | 0 {kded => core}/backends/lan/landevicelink.cpp | 0 {kded => core}/backends/lan/landevicelink.h | 0 .../backends/lan/lanlinkprovider.cpp | 0 {kded => core}/backends/lan/lanlinkprovider.h | 0 {kded => core}/backends/lan/netaddress.h | 0 .../backends/lan/socketlinereader.cpp | 0 .../backends/lan/socketlinereader.h | 0 {kded => core}/backends/lan/uploadjob.cpp | 0 {kded => core}/backends/lan/uploadjob.h | 0 {kded => core}/backends/linkprovider.cpp | 0 {kded => core}/backends/linkprovider.h | 0 .../backends/loopback/CMakeLists.txt | 0 .../backends/loopback/loopbackdevicelink.cpp | 0 .../backends/loopback/loopbackdevicelink.h | 0 .../loopback/loopbacklinkprovider.cpp | 0 .../backends/loopback/loopbacklinkprovider.h | 0 {kded => core}/daemon.cpp | 44 ++++++++---- {kded => core}/daemon.h | 18 ++--- {kded => core}/default_args.h | 0 {kded => core}/device.cpp | 0 {kded => core}/device.h | 0 {kded => core}/filetransferjob.cpp | 0 {kded => core}/filetransferjob.h | 0 {kded => core}/kdebugnamespace.cpp | 0 {kded => core}/kdebugnamespace.h | 0 {kded => core}/networkpackage.cpp | 0 {kded => core}/networkpackage.h | 0 {kded => core}/networkpackagetypes.h | 0 {kded => core}/plugins/CMakeLists.txt | 0 {kded => core}/plugins/battery/CMakeLists.txt | 0 {kded => core}/plugins/battery/README | 0 .../plugins/battery/batterydbusinterface.cpp | 0 .../plugins/battery/batterydbusinterface.h | 0 .../plugins/battery/batteryplugin.cpp | 0 .../plugins/battery/batteryplugin.h | 0 .../battery/kdeconnect_battery.desktop | 0 .../plugins/clipboard/CMakeLists.txt | 0 {kded => core}/plugins/clipboard/README | 0 .../plugins/clipboard/clipboardplugin.cpp | 0 .../plugins/clipboard/clipboardplugin.h | 0 .../clipboard/kdeconnect_clipboard.desktop | 0 .../plugins/kdeconnect_plugin.desktop | 0 {kded => core}/plugins/kdeconnectplugin.cpp | 0 {kded => core}/plugins/kdeconnectplugin.h | 0 .../plugins/mpriscontrol/CMakeLists.txt | 0 {kded => core}/plugins/mpriscontrol/README | 0 .../kdeconnect_mpriscontrol.desktop | 0 .../mpriscontrol/mpriscontrolplugin.cpp | 0 .../plugins/mpriscontrol/mpriscontrolplugin.h | 0 .../mpriscontrol/mprisdbusinterface.xml | 0 .../mpriscontrol/propertiesInterface.xml | 0 .../plugins/notifications/CMakeLists.txt | 0 {kded => core}/plugins/notifications/README | 0 .../kdeconnect_notifications.desktop | 0 .../plugins/notifications/notification.cpp | 0 .../plugins/notifications/notification.h | 0 .../notificationsdbusinterface.cpp | 0 .../notificationsdbusinterface.h | 0 .../notifications/notificationsplugin.cpp | 0 .../notifications/notificationsplugin.h | 0 .../plugins/pausemusic/CMakeLists.txt | 0 {kded => core}/plugins/pausemusic/README | 0 .../pausemusic/kdeconnect_pausemusic.desktop | 0 .../kdeconnect_pausemusic_config.desktop | 0 .../plugins/pausemusic/pausemusic_config.cpp | 0 .../plugins/pausemusic/pausemusic_config.h | 0 .../plugins/pausemusic/pausemusic_config.ui | 0 .../plugins/pausemusic/pausemusicplugin.cpp | 0 .../plugins/pausemusic/pausemusicplugin.h | 0 {kded => core}/plugins/ping/CMakeLists.txt | 0 {kded => core}/plugins/ping/README | 0 .../plugins/ping/kdeconnect_ping.desktop | 0 {kded => core}/plugins/ping/pingplugin.cpp | 0 {kded => core}/plugins/ping/pingplugin.h | 0 {kded => core}/plugins/pluginloader.cpp | 0 {kded => core}/plugins/pluginloader.h | 0 {kded => core}/plugins/sftp/CMakeLists.txt | 0 {kded => core}/plugins/sftp/README | 0 .../plugins/sftp/kdeconnect_sftp.desktop | 0 .../sftp/kdeconnect_sftp_config.desktop | 0 {kded => core}/plugins/sftp/mounter.cpp | 0 {kded => core}/plugins/sftp/mounter.h | 0 {kded => core}/plugins/sftp/mountloop.cpp | 0 {kded => core}/plugins/sftp/mountloop.h | 0 {kded => core}/plugins/sftp/sftp_config.cpp | 0 {kded => core}/plugins/sftp/sftp_config.h | 0 {kded => core}/plugins/sftp/sftp_config.ui | 0 {kded => core}/plugins/sftp/sftpplugin.cpp | 0 {kded => core}/plugins/sftp/sftpplugin.h | 0 {kded => core}/plugins/share/CMakeLists.txt | 0 {kded => core}/plugins/share/README | 0 .../plugins/share/autoclosingqfile.cpp | 0 .../plugins/share/autoclosingqfile.h | 0 .../plugins/share/kdeconnect_share.desktop | 0 .../share/kdeconnect_share_config.desktop | 0 {kded => core}/plugins/share/share_config.cpp | 0 {kded => core}/plugins/share/share_config.h | 0 {kded => core}/plugins/share/share_config.ui | 0 {kded => core}/plugins/share/shareplugin.cpp | 0 {kded => core}/plugins/share/shareplugin.h | 0 .../plugins/telephony/CMakeLists.txt | 0 {kded => core}/plugins/telephony/README | 0 .../telephony/kdeconnect_telephony.desktop | 0 .../plugins/telephony/telephonyplugin.cpp | 0 .../plugins/telephony/telephonyplugin.h | 0 {libkdeconnect => interfaces}/CMakeLists.txt | 38 +++++----- .../KDEConnect/DevicesModel | 0 .../KDEConnect/NotificationsModel | 0 .../KDEConnectConfig.cmake.in | 0 .../dbusinterfaces.cpp | 0 .../dbusinterfaces.h | 26 +++---- .../devicesmodel.cpp | 3 +- {libkdeconnect => interfaces}/devicesmodel.h | 7 +- .../kdebugnamespace.cpp | 0 .../kdebugnamespace.h | 0 {libkdeconnect => interfaces}/modeltest.cpp | 0 {libkdeconnect => interfaces}/modeltest.h | 0 .../notificationsmodel.cpp | 0 .../notificationsmodel.h | 4 +- kcm/CMakeLists.txt | 4 +- kcm/devicessortproxymodel.cpp | 4 +- kcm/kcm.cpp | 4 +- kded/CMakeLists.txt | 70 +------------------ kded/kdeconnectd.cpp | 2 +- kded/kded.cpp | 2 +- kio/CMakeLists.txt | 2 + kio/kiokdeconnect.h | 4 +- libkdeconnect/kdeconnect_export.h | 32 --------- .../kdeconnectdeclarativeplugin.cpp | 4 +- tests/CMakeLists.txt | 3 +- tests/networkpackagetests.cpp | 2 +- tests/testsocketlinereader.cpp | 4 +- 141 files changed, 165 insertions(+), 183 deletions(-) create mode 100644 core/CMakeLists.txt rename {kded => core}/Messages.sh (100%) rename {kded => core}/backends/devicelink.cpp (100%) rename {kded => core}/backends/devicelink.h (100%) rename {kded => core}/backends/lan/CMakeLists.txt (100%) rename {kded => core}/backends/lan/downloadjob.cpp (100%) rename {kded => core}/backends/lan/downloadjob.h (100%) rename {kded => core}/backends/lan/landevicelink.cpp (100%) rename {kded => core}/backends/lan/landevicelink.h (100%) rename {kded => core}/backends/lan/lanlinkprovider.cpp (100%) rename {kded => core}/backends/lan/lanlinkprovider.h (100%) rename {kded => core}/backends/lan/netaddress.h (100%) rename {kded => core}/backends/lan/socketlinereader.cpp (100%) rename {kded => core}/backends/lan/socketlinereader.h (100%) rename {kded => core}/backends/lan/uploadjob.cpp (100%) rename {kded => core}/backends/lan/uploadjob.h (100%) rename {kded => core}/backends/linkprovider.cpp (100%) rename {kded => core}/backends/linkprovider.h (100%) rename {kded => core}/backends/loopback/CMakeLists.txt (100%) rename {kded => core}/backends/loopback/loopbackdevicelink.cpp (100%) rename {kded => core}/backends/loopback/loopbackdevicelink.h (100%) rename {kded => core}/backends/loopback/loopbacklinkprovider.cpp (100%) rename {kded => core}/backends/loopback/loopbacklinkprovider.h (100%) rename {kded => core}/daemon.cpp (86%) rename {kded => core}/daemon.h (83%) rename {kded => core}/default_args.h (100%) rename {kded => core}/device.cpp (100%) rename {kded => core}/device.h (100%) rename {kded => core}/filetransferjob.cpp (100%) rename {kded => core}/filetransferjob.h (100%) rename {kded => core}/kdebugnamespace.cpp (100%) rename {kded => core}/kdebugnamespace.h (100%) rename {kded => core}/networkpackage.cpp (100%) rename {kded => core}/networkpackage.h (100%) rename {kded => core}/networkpackagetypes.h (100%) rename {kded => core}/plugins/CMakeLists.txt (100%) rename {kded => core}/plugins/battery/CMakeLists.txt (100%) rename {kded => core}/plugins/battery/README (100%) rename {kded => core}/plugins/battery/batterydbusinterface.cpp (100%) rename {kded => core}/plugins/battery/batterydbusinterface.h (100%) rename {kded => core}/plugins/battery/batteryplugin.cpp (100%) rename {kded => core}/plugins/battery/batteryplugin.h (100%) rename {kded => core}/plugins/battery/kdeconnect_battery.desktop (100%) rename {kded => core}/plugins/clipboard/CMakeLists.txt (100%) rename {kded => core}/plugins/clipboard/README (100%) rename {kded => core}/plugins/clipboard/clipboardplugin.cpp (100%) rename {kded => core}/plugins/clipboard/clipboardplugin.h (100%) rename {kded => core}/plugins/clipboard/kdeconnect_clipboard.desktop (100%) rename {kded => core}/plugins/kdeconnect_plugin.desktop (100%) rename {kded => core}/plugins/kdeconnectplugin.cpp (100%) rename {kded => core}/plugins/kdeconnectplugin.h (100%) rename {kded => core}/plugins/mpriscontrol/CMakeLists.txt (100%) rename {kded => core}/plugins/mpriscontrol/README (100%) rename {kded => core}/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop (100%) rename {kded => core}/plugins/mpriscontrol/mpriscontrolplugin.cpp (100%) rename {kded => core}/plugins/mpriscontrol/mpriscontrolplugin.h (100%) rename {kded => core}/plugins/mpriscontrol/mprisdbusinterface.xml (100%) rename {kded => core}/plugins/mpriscontrol/propertiesInterface.xml (100%) rename {kded => core}/plugins/notifications/CMakeLists.txt (100%) rename {kded => core}/plugins/notifications/README (100%) rename {kded => core}/plugins/notifications/kdeconnect_notifications.desktop (100%) rename {kded => core}/plugins/notifications/notification.cpp (100%) rename {kded => core}/plugins/notifications/notification.h (100%) rename {kded => core}/plugins/notifications/notificationsdbusinterface.cpp (100%) rename {kded => core}/plugins/notifications/notificationsdbusinterface.h (100%) rename {kded => core}/plugins/notifications/notificationsplugin.cpp (100%) rename {kded => core}/plugins/notifications/notificationsplugin.h (100%) rename {kded => core}/plugins/pausemusic/CMakeLists.txt (100%) rename {kded => core}/plugins/pausemusic/README (100%) rename {kded => core}/plugins/pausemusic/kdeconnect_pausemusic.desktop (100%) rename {kded => core}/plugins/pausemusic/kdeconnect_pausemusic_config.desktop (100%) rename {kded => core}/plugins/pausemusic/pausemusic_config.cpp (100%) rename {kded => core}/plugins/pausemusic/pausemusic_config.h (100%) rename {kded => core}/plugins/pausemusic/pausemusic_config.ui (100%) rename {kded => core}/plugins/pausemusic/pausemusicplugin.cpp (100%) rename {kded => core}/plugins/pausemusic/pausemusicplugin.h (100%) rename {kded => core}/plugins/ping/CMakeLists.txt (100%) rename {kded => core}/plugins/ping/README (100%) rename {kded => core}/plugins/ping/kdeconnect_ping.desktop (100%) rename {kded => core}/plugins/ping/pingplugin.cpp (100%) rename {kded => core}/plugins/ping/pingplugin.h (100%) rename {kded => core}/plugins/pluginloader.cpp (100%) rename {kded => core}/plugins/pluginloader.h (100%) rename {kded => core}/plugins/sftp/CMakeLists.txt (100%) rename {kded => core}/plugins/sftp/README (100%) rename {kded => core}/plugins/sftp/kdeconnect_sftp.desktop (100%) rename {kded => core}/plugins/sftp/kdeconnect_sftp_config.desktop (100%) rename {kded => core}/plugins/sftp/mounter.cpp (100%) rename {kded => core}/plugins/sftp/mounter.h (100%) rename {kded => core}/plugins/sftp/mountloop.cpp (100%) rename {kded => core}/plugins/sftp/mountloop.h (100%) rename {kded => core}/plugins/sftp/sftp_config.cpp (100%) rename {kded => core}/plugins/sftp/sftp_config.h (100%) rename {kded => core}/plugins/sftp/sftp_config.ui (100%) rename {kded => core}/plugins/sftp/sftpplugin.cpp (100%) rename {kded => core}/plugins/sftp/sftpplugin.h (100%) rename {kded => core}/plugins/share/CMakeLists.txt (100%) rename {kded => core}/plugins/share/README (100%) rename {kded => core}/plugins/share/autoclosingqfile.cpp (100%) rename {kded => core}/plugins/share/autoclosingqfile.h (100%) rename {kded => core}/plugins/share/kdeconnect_share.desktop (100%) rename {kded => core}/plugins/share/kdeconnect_share_config.desktop (100%) rename {kded => core}/plugins/share/share_config.cpp (100%) rename {kded => core}/plugins/share/share_config.h (100%) rename {kded => core}/plugins/share/share_config.ui (100%) rename {kded => core}/plugins/share/shareplugin.cpp (100%) rename {kded => core}/plugins/share/shareplugin.h (100%) rename {kded => core}/plugins/telephony/CMakeLists.txt (100%) rename {kded => core}/plugins/telephony/README (100%) rename {kded => core}/plugins/telephony/kdeconnect_telephony.desktop (100%) rename {kded => core}/plugins/telephony/telephonyplugin.cpp (100%) rename {kded => core}/plugins/telephony/telephonyplugin.h (100%) rename {libkdeconnect => interfaces}/CMakeLists.txt (61%) rename {libkdeconnect => interfaces}/KDEConnect/DevicesModel (100%) rename {libkdeconnect => interfaces}/KDEConnect/NotificationsModel (100%) rename {libkdeconnect => interfaces}/KDEConnectConfig.cmake.in (100%) rename {libkdeconnect => interfaces}/dbusinterfaces.cpp (100%) rename {libkdeconnect => interfaces}/dbusinterfaces.h (77%) rename {libkdeconnect => interfaces}/devicesmodel.cpp (98%) rename {libkdeconnect => interfaces}/devicesmodel.h (93%) rename {libkdeconnect => interfaces}/kdebugnamespace.cpp (100%) rename {libkdeconnect => interfaces}/kdebugnamespace.h (100%) rename {libkdeconnect => interfaces}/modeltest.cpp (100%) rename {libkdeconnect => interfaces}/modeltest.h (100%) rename {libkdeconnect => interfaces}/notificationsmodel.cpp (100%) rename {libkdeconnect => interfaces}/notificationsmodel.h (96%) delete mode 100644 libkdeconnect/kdeconnect_export.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 151375e96..f257cc1c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,12 +15,14 @@ include(KDE4Defaults) include_directories(${KDE4_INCLUDES}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -add_subdirectory(kded) -add_subdirectory(libkdeconnect) +add_subdirectory(core) add_subdirectory(kcm) add_subdirectory(kio) -add_subdirectory(plasmoid) add_subdirectory(icon) +add_subdirectory(interfaces) + +add_subdirectory(kded) +add_subdirectory(plasmoid) add_subdirectory(cli) add_subdirectory(tests) diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp index 1e8793738..3366e7d18 100644 --- a/cli/kdeconnect-cli.cpp +++ b/cli/kdeconnect-cli.cpp @@ -22,8 +22,10 @@ #include #include #include -#include +#include #include +#include +#include int main(int argc, char** argv) { diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt new file mode 100644 index 000000000..01cd66156 --- /dev/null +++ b/core/CMakeLists.txt @@ -0,0 +1,59 @@ +project(KDEConnectCore) + +include_directories( + ${KDE4_KIO_LIBS} + ${QJSON_INCLUDE_DIR} + ${QCA2_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) + +add_subdirectory(plugins) + +add_subdirectory(backends/lan) +add_subdirectory(backends/loopback) + +set(kded_kdeconnect_SRCS + ${kded_kdeconnect_SRCS} + + backends/linkprovider.cpp + backends/devicelink.cpp + + plugins/kdeconnectplugin.cpp + plugins/pluginloader.cpp + + networkpackage.cpp + filetransferjob.cpp + daemon.cpp + device.cpp + kdebugnamespace.cpp +) + +kde4_add_library(kdeconnectcore SHARED ${kded_kdeconnect_SRCS}) +target_link_libraries(kdeconnectcore +PUBLIC + ${KDE4_KDECORE_LIBS} + +PRIVATE + ${KDE4_KIO_LIBS} + ${QJSON_LIBRARIES} + ${QT_QTNETWORK_LIBRARY} + ${QCA2_LIBRARIES} +) +generate_export_header(kdeconnectcore EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kdeconnectcore_export.h BASE_NAME KDEConnectCore) + +include(../macros.cmake) + +generate_and_install_dbus_interface( + kdeconnectcore + ../core/daemon.h + org.kde.kdeconnect.daemon.xml + OPTIONS -a +) + +generate_and_install_dbus_interface( + kdeconnectcore + ../core/device.h + org.kde.kdeconnect.device.xml + OPTIONS -a +) + diff --git a/kded/Messages.sh b/core/Messages.sh similarity index 100% rename from kded/Messages.sh rename to core/Messages.sh diff --git a/kded/backends/devicelink.cpp b/core/backends/devicelink.cpp similarity index 100% rename from kded/backends/devicelink.cpp rename to core/backends/devicelink.cpp diff --git a/kded/backends/devicelink.h b/core/backends/devicelink.h similarity index 100% rename from kded/backends/devicelink.h rename to core/backends/devicelink.h diff --git a/kded/backends/lan/CMakeLists.txt b/core/backends/lan/CMakeLists.txt similarity index 100% rename from kded/backends/lan/CMakeLists.txt rename to core/backends/lan/CMakeLists.txt diff --git a/kded/backends/lan/downloadjob.cpp b/core/backends/lan/downloadjob.cpp similarity index 100% rename from kded/backends/lan/downloadjob.cpp rename to core/backends/lan/downloadjob.cpp diff --git a/kded/backends/lan/downloadjob.h b/core/backends/lan/downloadjob.h similarity index 100% rename from kded/backends/lan/downloadjob.h rename to core/backends/lan/downloadjob.h diff --git a/kded/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp similarity index 100% rename from kded/backends/lan/landevicelink.cpp rename to core/backends/lan/landevicelink.cpp diff --git a/kded/backends/lan/landevicelink.h b/core/backends/lan/landevicelink.h similarity index 100% rename from kded/backends/lan/landevicelink.h rename to core/backends/lan/landevicelink.h diff --git a/kded/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp similarity index 100% rename from kded/backends/lan/lanlinkprovider.cpp rename to core/backends/lan/lanlinkprovider.cpp diff --git a/kded/backends/lan/lanlinkprovider.h b/core/backends/lan/lanlinkprovider.h similarity index 100% rename from kded/backends/lan/lanlinkprovider.h rename to core/backends/lan/lanlinkprovider.h diff --git a/kded/backends/lan/netaddress.h b/core/backends/lan/netaddress.h similarity index 100% rename from kded/backends/lan/netaddress.h rename to core/backends/lan/netaddress.h diff --git a/kded/backends/lan/socketlinereader.cpp b/core/backends/lan/socketlinereader.cpp similarity index 100% rename from kded/backends/lan/socketlinereader.cpp rename to core/backends/lan/socketlinereader.cpp diff --git a/kded/backends/lan/socketlinereader.h b/core/backends/lan/socketlinereader.h similarity index 100% rename from kded/backends/lan/socketlinereader.h rename to core/backends/lan/socketlinereader.h diff --git a/kded/backends/lan/uploadjob.cpp b/core/backends/lan/uploadjob.cpp similarity index 100% rename from kded/backends/lan/uploadjob.cpp rename to core/backends/lan/uploadjob.cpp diff --git a/kded/backends/lan/uploadjob.h b/core/backends/lan/uploadjob.h similarity index 100% rename from kded/backends/lan/uploadjob.h rename to core/backends/lan/uploadjob.h diff --git a/kded/backends/linkprovider.cpp b/core/backends/linkprovider.cpp similarity index 100% rename from kded/backends/linkprovider.cpp rename to core/backends/linkprovider.cpp diff --git a/kded/backends/linkprovider.h b/core/backends/linkprovider.h similarity index 100% rename from kded/backends/linkprovider.h rename to core/backends/linkprovider.h diff --git a/kded/backends/loopback/CMakeLists.txt b/core/backends/loopback/CMakeLists.txt similarity index 100% rename from kded/backends/loopback/CMakeLists.txt rename to core/backends/loopback/CMakeLists.txt diff --git a/kded/backends/loopback/loopbackdevicelink.cpp b/core/backends/loopback/loopbackdevicelink.cpp similarity index 100% rename from kded/backends/loopback/loopbackdevicelink.cpp rename to core/backends/loopback/loopbackdevicelink.cpp diff --git a/kded/backends/loopback/loopbackdevicelink.h b/core/backends/loopback/loopbackdevicelink.h similarity index 100% rename from kded/backends/loopback/loopbackdevicelink.h rename to core/backends/loopback/loopbackdevicelink.h diff --git a/kded/backends/loopback/loopbacklinkprovider.cpp b/core/backends/loopback/loopbacklinkprovider.cpp similarity index 100% rename from kded/backends/loopback/loopbacklinkprovider.cpp rename to core/backends/loopback/loopbacklinkprovider.cpp diff --git a/kded/backends/loopback/loopbacklinkprovider.h b/core/backends/loopback/loopbacklinkprovider.h similarity index 100% rename from kded/backends/loopback/loopbacklinkprovider.h rename to core/backends/loopback/loopbacklinkprovider.h diff --git a/kded/daemon.cpp b/core/daemon.cpp similarity index 86% rename from kded/daemon.cpp rename to core/daemon.cpp index ba4571dc8..4243ea9f7 100644 --- a/kded/daemon.cpp +++ b/core/daemon.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -35,8 +36,27 @@ #include "networkpackage.h" #include "backends/lan/lanlinkprovider.h" #include "backends/loopback/loopbacklinkprovider.h" +#include "device.h" +#include "networkpackage.h" +#include "backends/devicelink.h" +#include "backends/linkprovider.h" -Daemon::Daemon(QObject *parent) : QObject(parent) +struct DaemonPrivate +{ + //Different ways to find devices and connect to them + QSet mLinkProviders; + + //Every known device + QMap mDevices; + + // The Initializer object sets things up, and also does cleanup when it goes out of scope + // Note it's not being used anywhere. That's inteneded + QCA::Initializer mQcaInitializer; +}; + +Daemon::Daemon(QObject *parent) + : QObject(parent) + , d(new DaemonPrivate) { KSharedConfigPtr config = KSharedConfig::openConfig("kdeconnectrc"); @@ -97,8 +117,8 @@ Daemon::Daemon(QObject *parent) : QObject(parent) kDebug(kdeconnect_kded()) << "Starting KdeConnect daemon"; //Load backends (hardcoded by now, should be plugins in a future) - mLinkProviders.insert(new LanLinkProvider()); - //mLinkProviders.insert(new LoopbackLinkProvider()); + d->mLinkProviders.insert(new LanLinkProvider()); + //d->mLinkProviders.insert(new LoopbackLinkProvider()); //Read remebered paired devices const KConfigGroup& known = config->group("trusted_devices"); @@ -107,13 +127,13 @@ Daemon::Daemon(QObject *parent) : QObject(parent) Device* device = new Device(this, id); connect(device, SIGNAL(reachableStatusChanged()), this, SLOT(onDeviceReachableStatusChanged())); - mDevices[id] = device; + d->mDevices[id] = device; Q_EMIT deviceAdded(id); } //Listen to connectivity changes QNetworkSession* network = new QNetworkSession(QNetworkConfigurationManager().defaultConfiguration()); - Q_FOREACH (LinkProvider* a, mLinkProviders) { + Q_FOREACH (LinkProvider* a, d->mLinkProviders) { connect(network, SIGNAL(stateChanged(QNetworkSession::State)), a, SLOT(onNetworkChange(QNetworkSession::State))); connect(a, SIGNAL(onConnectionReceived(NetworkPackage, DeviceLink*)), @@ -130,7 +150,7 @@ Daemon::Daemon(QObject *parent) : QObject(parent) void Daemon::setDiscoveryEnabled(bool b) { //Listen to incomming connections - Q_FOREACH (LinkProvider* a, mLinkProviders) { + Q_FOREACH (LinkProvider* a, d->mLinkProviders) { if (b) a->onStart(); else @@ -141,7 +161,7 @@ void Daemon::setDiscoveryEnabled(bool b) void Daemon::forceOnNetworkChange() { - Q_FOREACH (LinkProvider* a, mLinkProviders) { + Q_FOREACH (LinkProvider* a, d->mLinkProviders) { a->onNetworkChange(QNetworkSession::Connected); } } @@ -149,7 +169,7 @@ void Daemon::forceOnNetworkChange() QStringList Daemon::devices(bool onlyReachable, bool onlyVisible) const { QStringList ret; - Q_FOREACH(Device* device, mDevices) { + Q_FOREACH(Device* device, d->mDevices) { if (onlyReachable && !device->isReachable()) continue; if (onlyVisible && !device->isPaired()) continue; ret.append(device->id()); @@ -164,16 +184,16 @@ void Daemon::onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink* //kDebug(kdeconnect_kded()) << "Device discovered" << id << "via" << dl->provider()->name(); - if (mDevices.contains(id)) { + if (d->mDevices.contains(id)) { //kDebug(kdeconnect_kded()) << "It is a known device"; - Device* device = mDevices[id]; + Device* device = d->mDevices[id]; device->addLink(identityPackage, dl); } else { //kDebug(kdeconnect_kded()) << "It is a new device"; Device* device = new Device(this, identityPackage, dl); connect(device, SIGNAL(reachableStatusChanged()), this, SLOT(onDeviceReachableStatusChanged())); - mDevices[id] = device; + d->mDevices[id] = device; Q_EMIT deviceAdded(id); } @@ -197,7 +217,7 @@ void Daemon::onDeviceReachableStatusChanged() if (!device->isPaired()) { kDebug(kdeconnect_kded()) << "Destroying device" << device->name(); Q_EMIT deviceRemoved(id); - mDevices.remove(id); + d->mDevices.remove(id); device->deleteLater(); } diff --git a/kded/daemon.h b/core/daemon.h similarity index 83% rename from kded/daemon.h rename to core/daemon.h index aac56c7de..5f2ae2624 100644 --- a/kded/daemon.h +++ b/core/daemon.h @@ -24,16 +24,14 @@ #include #include #include -#include #include #include #include "kdeconnectcore_export.h" -#include "device.h" -#include "networkpackage.h" -#include "backends/devicelink.h" -#include "backends/linkprovider.h" +class DaemonPrivate; +class NetworkPackage; +class DeviceLink; class KDECONNECTCORE_EXPORT Daemon : public QObject @@ -65,15 +63,7 @@ private Q_SLOTS: void onDeviceReachableStatusChanged(); private: - - //Different ways to find devices and connect to them - QSet mLinkProviders; - - //Every known device - QMap mDevices; - - // The Initializer object sets things up, and also does cleanup when it goes out of scope - QCA::Initializer mQcaInitializer; + QScopedPointer d; }; #endif diff --git a/kded/default_args.h b/core/default_args.h similarity index 100% rename from kded/default_args.h rename to core/default_args.h diff --git a/kded/device.cpp b/core/device.cpp similarity index 100% rename from kded/device.cpp rename to core/device.cpp diff --git a/kded/device.h b/core/device.h similarity index 100% rename from kded/device.h rename to core/device.h diff --git a/kded/filetransferjob.cpp b/core/filetransferjob.cpp similarity index 100% rename from kded/filetransferjob.cpp rename to core/filetransferjob.cpp diff --git a/kded/filetransferjob.h b/core/filetransferjob.h similarity index 100% rename from kded/filetransferjob.h rename to core/filetransferjob.h diff --git a/kded/kdebugnamespace.cpp b/core/kdebugnamespace.cpp similarity index 100% rename from kded/kdebugnamespace.cpp rename to core/kdebugnamespace.cpp diff --git a/kded/kdebugnamespace.h b/core/kdebugnamespace.h similarity index 100% rename from kded/kdebugnamespace.h rename to core/kdebugnamespace.h diff --git a/kded/networkpackage.cpp b/core/networkpackage.cpp similarity index 100% rename from kded/networkpackage.cpp rename to core/networkpackage.cpp diff --git a/kded/networkpackage.h b/core/networkpackage.h similarity index 100% rename from kded/networkpackage.h rename to core/networkpackage.h diff --git a/kded/networkpackagetypes.h b/core/networkpackagetypes.h similarity index 100% rename from kded/networkpackagetypes.h rename to core/networkpackagetypes.h diff --git a/kded/plugins/CMakeLists.txt b/core/plugins/CMakeLists.txt similarity index 100% rename from kded/plugins/CMakeLists.txt rename to core/plugins/CMakeLists.txt diff --git a/kded/plugins/battery/CMakeLists.txt b/core/plugins/battery/CMakeLists.txt similarity index 100% rename from kded/plugins/battery/CMakeLists.txt rename to core/plugins/battery/CMakeLists.txt diff --git a/kded/plugins/battery/README b/core/plugins/battery/README similarity index 100% rename from kded/plugins/battery/README rename to core/plugins/battery/README diff --git a/kded/plugins/battery/batterydbusinterface.cpp b/core/plugins/battery/batterydbusinterface.cpp similarity index 100% rename from kded/plugins/battery/batterydbusinterface.cpp rename to core/plugins/battery/batterydbusinterface.cpp diff --git a/kded/plugins/battery/batterydbusinterface.h b/core/plugins/battery/batterydbusinterface.h similarity index 100% rename from kded/plugins/battery/batterydbusinterface.h rename to core/plugins/battery/batterydbusinterface.h diff --git a/kded/plugins/battery/batteryplugin.cpp b/core/plugins/battery/batteryplugin.cpp similarity index 100% rename from kded/plugins/battery/batteryplugin.cpp rename to core/plugins/battery/batteryplugin.cpp diff --git a/kded/plugins/battery/batteryplugin.h b/core/plugins/battery/batteryplugin.h similarity index 100% rename from kded/plugins/battery/batteryplugin.h rename to core/plugins/battery/batteryplugin.h diff --git a/kded/plugins/battery/kdeconnect_battery.desktop b/core/plugins/battery/kdeconnect_battery.desktop similarity index 100% rename from kded/plugins/battery/kdeconnect_battery.desktop rename to core/plugins/battery/kdeconnect_battery.desktop diff --git a/kded/plugins/clipboard/CMakeLists.txt b/core/plugins/clipboard/CMakeLists.txt similarity index 100% rename from kded/plugins/clipboard/CMakeLists.txt rename to core/plugins/clipboard/CMakeLists.txt diff --git a/kded/plugins/clipboard/README b/core/plugins/clipboard/README similarity index 100% rename from kded/plugins/clipboard/README rename to core/plugins/clipboard/README diff --git a/kded/plugins/clipboard/clipboardplugin.cpp b/core/plugins/clipboard/clipboardplugin.cpp similarity index 100% rename from kded/plugins/clipboard/clipboardplugin.cpp rename to core/plugins/clipboard/clipboardplugin.cpp diff --git a/kded/plugins/clipboard/clipboardplugin.h b/core/plugins/clipboard/clipboardplugin.h similarity index 100% rename from kded/plugins/clipboard/clipboardplugin.h rename to core/plugins/clipboard/clipboardplugin.h diff --git a/kded/plugins/clipboard/kdeconnect_clipboard.desktop b/core/plugins/clipboard/kdeconnect_clipboard.desktop similarity index 100% rename from kded/plugins/clipboard/kdeconnect_clipboard.desktop rename to core/plugins/clipboard/kdeconnect_clipboard.desktop diff --git a/kded/plugins/kdeconnect_plugin.desktop b/core/plugins/kdeconnect_plugin.desktop similarity index 100% rename from kded/plugins/kdeconnect_plugin.desktop rename to core/plugins/kdeconnect_plugin.desktop diff --git a/kded/plugins/kdeconnectplugin.cpp b/core/plugins/kdeconnectplugin.cpp similarity index 100% rename from kded/plugins/kdeconnectplugin.cpp rename to core/plugins/kdeconnectplugin.cpp diff --git a/kded/plugins/kdeconnectplugin.h b/core/plugins/kdeconnectplugin.h similarity index 100% rename from kded/plugins/kdeconnectplugin.h rename to core/plugins/kdeconnectplugin.h diff --git a/kded/plugins/mpriscontrol/CMakeLists.txt b/core/plugins/mpriscontrol/CMakeLists.txt similarity index 100% rename from kded/plugins/mpriscontrol/CMakeLists.txt rename to core/plugins/mpriscontrol/CMakeLists.txt diff --git a/kded/plugins/mpriscontrol/README b/core/plugins/mpriscontrol/README similarity index 100% rename from kded/plugins/mpriscontrol/README rename to core/plugins/mpriscontrol/README diff --git a/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop b/core/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop similarity index 100% rename from kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop rename to core/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop diff --git a/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp b/core/plugins/mpriscontrol/mpriscontrolplugin.cpp similarity index 100% rename from kded/plugins/mpriscontrol/mpriscontrolplugin.cpp rename to core/plugins/mpriscontrol/mpriscontrolplugin.cpp diff --git a/kded/plugins/mpriscontrol/mpriscontrolplugin.h b/core/plugins/mpriscontrol/mpriscontrolplugin.h similarity index 100% rename from kded/plugins/mpriscontrol/mpriscontrolplugin.h rename to core/plugins/mpriscontrol/mpriscontrolplugin.h diff --git a/kded/plugins/mpriscontrol/mprisdbusinterface.xml b/core/plugins/mpriscontrol/mprisdbusinterface.xml similarity index 100% rename from kded/plugins/mpriscontrol/mprisdbusinterface.xml rename to core/plugins/mpriscontrol/mprisdbusinterface.xml diff --git a/kded/plugins/mpriscontrol/propertiesInterface.xml b/core/plugins/mpriscontrol/propertiesInterface.xml similarity index 100% rename from kded/plugins/mpriscontrol/propertiesInterface.xml rename to core/plugins/mpriscontrol/propertiesInterface.xml diff --git a/kded/plugins/notifications/CMakeLists.txt b/core/plugins/notifications/CMakeLists.txt similarity index 100% rename from kded/plugins/notifications/CMakeLists.txt rename to core/plugins/notifications/CMakeLists.txt diff --git a/kded/plugins/notifications/README b/core/plugins/notifications/README similarity index 100% rename from kded/plugins/notifications/README rename to core/plugins/notifications/README diff --git a/kded/plugins/notifications/kdeconnect_notifications.desktop b/core/plugins/notifications/kdeconnect_notifications.desktop similarity index 100% rename from kded/plugins/notifications/kdeconnect_notifications.desktop rename to core/plugins/notifications/kdeconnect_notifications.desktop diff --git a/kded/plugins/notifications/notification.cpp b/core/plugins/notifications/notification.cpp similarity index 100% rename from kded/plugins/notifications/notification.cpp rename to core/plugins/notifications/notification.cpp diff --git a/kded/plugins/notifications/notification.h b/core/plugins/notifications/notification.h similarity index 100% rename from kded/plugins/notifications/notification.h rename to core/plugins/notifications/notification.h diff --git a/kded/plugins/notifications/notificationsdbusinterface.cpp b/core/plugins/notifications/notificationsdbusinterface.cpp similarity index 100% rename from kded/plugins/notifications/notificationsdbusinterface.cpp rename to core/plugins/notifications/notificationsdbusinterface.cpp diff --git a/kded/plugins/notifications/notificationsdbusinterface.h b/core/plugins/notifications/notificationsdbusinterface.h similarity index 100% rename from kded/plugins/notifications/notificationsdbusinterface.h rename to core/plugins/notifications/notificationsdbusinterface.h diff --git a/kded/plugins/notifications/notificationsplugin.cpp b/core/plugins/notifications/notificationsplugin.cpp similarity index 100% rename from kded/plugins/notifications/notificationsplugin.cpp rename to core/plugins/notifications/notificationsplugin.cpp diff --git a/kded/plugins/notifications/notificationsplugin.h b/core/plugins/notifications/notificationsplugin.h similarity index 100% rename from kded/plugins/notifications/notificationsplugin.h rename to core/plugins/notifications/notificationsplugin.h diff --git a/kded/plugins/pausemusic/CMakeLists.txt b/core/plugins/pausemusic/CMakeLists.txt similarity index 100% rename from kded/plugins/pausemusic/CMakeLists.txt rename to core/plugins/pausemusic/CMakeLists.txt diff --git a/kded/plugins/pausemusic/README b/core/plugins/pausemusic/README similarity index 100% rename from kded/plugins/pausemusic/README rename to core/plugins/pausemusic/README diff --git a/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop b/core/plugins/pausemusic/kdeconnect_pausemusic.desktop similarity index 100% rename from kded/plugins/pausemusic/kdeconnect_pausemusic.desktop rename to core/plugins/pausemusic/kdeconnect_pausemusic.desktop diff --git a/kded/plugins/pausemusic/kdeconnect_pausemusic_config.desktop b/core/plugins/pausemusic/kdeconnect_pausemusic_config.desktop similarity index 100% rename from kded/plugins/pausemusic/kdeconnect_pausemusic_config.desktop rename to core/plugins/pausemusic/kdeconnect_pausemusic_config.desktop diff --git a/kded/plugins/pausemusic/pausemusic_config.cpp b/core/plugins/pausemusic/pausemusic_config.cpp similarity index 100% rename from kded/plugins/pausemusic/pausemusic_config.cpp rename to core/plugins/pausemusic/pausemusic_config.cpp diff --git a/kded/plugins/pausemusic/pausemusic_config.h b/core/plugins/pausemusic/pausemusic_config.h similarity index 100% rename from kded/plugins/pausemusic/pausemusic_config.h rename to core/plugins/pausemusic/pausemusic_config.h diff --git a/kded/plugins/pausemusic/pausemusic_config.ui b/core/plugins/pausemusic/pausemusic_config.ui similarity index 100% rename from kded/plugins/pausemusic/pausemusic_config.ui rename to core/plugins/pausemusic/pausemusic_config.ui diff --git a/kded/plugins/pausemusic/pausemusicplugin.cpp b/core/plugins/pausemusic/pausemusicplugin.cpp similarity index 100% rename from kded/plugins/pausemusic/pausemusicplugin.cpp rename to core/plugins/pausemusic/pausemusicplugin.cpp diff --git a/kded/plugins/pausemusic/pausemusicplugin.h b/core/plugins/pausemusic/pausemusicplugin.h similarity index 100% rename from kded/plugins/pausemusic/pausemusicplugin.h rename to core/plugins/pausemusic/pausemusicplugin.h diff --git a/kded/plugins/ping/CMakeLists.txt b/core/plugins/ping/CMakeLists.txt similarity index 100% rename from kded/plugins/ping/CMakeLists.txt rename to core/plugins/ping/CMakeLists.txt diff --git a/kded/plugins/ping/README b/core/plugins/ping/README similarity index 100% rename from kded/plugins/ping/README rename to core/plugins/ping/README diff --git a/kded/plugins/ping/kdeconnect_ping.desktop b/core/plugins/ping/kdeconnect_ping.desktop similarity index 100% rename from kded/plugins/ping/kdeconnect_ping.desktop rename to core/plugins/ping/kdeconnect_ping.desktop diff --git a/kded/plugins/ping/pingplugin.cpp b/core/plugins/ping/pingplugin.cpp similarity index 100% rename from kded/plugins/ping/pingplugin.cpp rename to core/plugins/ping/pingplugin.cpp diff --git a/kded/plugins/ping/pingplugin.h b/core/plugins/ping/pingplugin.h similarity index 100% rename from kded/plugins/ping/pingplugin.h rename to core/plugins/ping/pingplugin.h diff --git a/kded/plugins/pluginloader.cpp b/core/plugins/pluginloader.cpp similarity index 100% rename from kded/plugins/pluginloader.cpp rename to core/plugins/pluginloader.cpp diff --git a/kded/plugins/pluginloader.h b/core/plugins/pluginloader.h similarity index 100% rename from kded/plugins/pluginloader.h rename to core/plugins/pluginloader.h diff --git a/kded/plugins/sftp/CMakeLists.txt b/core/plugins/sftp/CMakeLists.txt similarity index 100% rename from kded/plugins/sftp/CMakeLists.txt rename to core/plugins/sftp/CMakeLists.txt diff --git a/kded/plugins/sftp/README b/core/plugins/sftp/README similarity index 100% rename from kded/plugins/sftp/README rename to core/plugins/sftp/README diff --git a/kded/plugins/sftp/kdeconnect_sftp.desktop b/core/plugins/sftp/kdeconnect_sftp.desktop similarity index 100% rename from kded/plugins/sftp/kdeconnect_sftp.desktop rename to core/plugins/sftp/kdeconnect_sftp.desktop diff --git a/kded/plugins/sftp/kdeconnect_sftp_config.desktop b/core/plugins/sftp/kdeconnect_sftp_config.desktop similarity index 100% rename from kded/plugins/sftp/kdeconnect_sftp_config.desktop rename to core/plugins/sftp/kdeconnect_sftp_config.desktop diff --git a/kded/plugins/sftp/mounter.cpp b/core/plugins/sftp/mounter.cpp similarity index 100% rename from kded/plugins/sftp/mounter.cpp rename to core/plugins/sftp/mounter.cpp diff --git a/kded/plugins/sftp/mounter.h b/core/plugins/sftp/mounter.h similarity index 100% rename from kded/plugins/sftp/mounter.h rename to core/plugins/sftp/mounter.h diff --git a/kded/plugins/sftp/mountloop.cpp b/core/plugins/sftp/mountloop.cpp similarity index 100% rename from kded/plugins/sftp/mountloop.cpp rename to core/plugins/sftp/mountloop.cpp diff --git a/kded/plugins/sftp/mountloop.h b/core/plugins/sftp/mountloop.h similarity index 100% rename from kded/plugins/sftp/mountloop.h rename to core/plugins/sftp/mountloop.h diff --git a/kded/plugins/sftp/sftp_config.cpp b/core/plugins/sftp/sftp_config.cpp similarity index 100% rename from kded/plugins/sftp/sftp_config.cpp rename to core/plugins/sftp/sftp_config.cpp diff --git a/kded/plugins/sftp/sftp_config.h b/core/plugins/sftp/sftp_config.h similarity index 100% rename from kded/plugins/sftp/sftp_config.h rename to core/plugins/sftp/sftp_config.h diff --git a/kded/plugins/sftp/sftp_config.ui b/core/plugins/sftp/sftp_config.ui similarity index 100% rename from kded/plugins/sftp/sftp_config.ui rename to core/plugins/sftp/sftp_config.ui diff --git a/kded/plugins/sftp/sftpplugin.cpp b/core/plugins/sftp/sftpplugin.cpp similarity index 100% rename from kded/plugins/sftp/sftpplugin.cpp rename to core/plugins/sftp/sftpplugin.cpp diff --git a/kded/plugins/sftp/sftpplugin.h b/core/plugins/sftp/sftpplugin.h similarity index 100% rename from kded/plugins/sftp/sftpplugin.h rename to core/plugins/sftp/sftpplugin.h diff --git a/kded/plugins/share/CMakeLists.txt b/core/plugins/share/CMakeLists.txt similarity index 100% rename from kded/plugins/share/CMakeLists.txt rename to core/plugins/share/CMakeLists.txt diff --git a/kded/plugins/share/README b/core/plugins/share/README similarity index 100% rename from kded/plugins/share/README rename to core/plugins/share/README diff --git a/kded/plugins/share/autoclosingqfile.cpp b/core/plugins/share/autoclosingqfile.cpp similarity index 100% rename from kded/plugins/share/autoclosingqfile.cpp rename to core/plugins/share/autoclosingqfile.cpp diff --git a/kded/plugins/share/autoclosingqfile.h b/core/plugins/share/autoclosingqfile.h similarity index 100% rename from kded/plugins/share/autoclosingqfile.h rename to core/plugins/share/autoclosingqfile.h diff --git a/kded/plugins/share/kdeconnect_share.desktop b/core/plugins/share/kdeconnect_share.desktop similarity index 100% rename from kded/plugins/share/kdeconnect_share.desktop rename to core/plugins/share/kdeconnect_share.desktop diff --git a/kded/plugins/share/kdeconnect_share_config.desktop b/core/plugins/share/kdeconnect_share_config.desktop similarity index 100% rename from kded/plugins/share/kdeconnect_share_config.desktop rename to core/plugins/share/kdeconnect_share_config.desktop diff --git a/kded/plugins/share/share_config.cpp b/core/plugins/share/share_config.cpp similarity index 100% rename from kded/plugins/share/share_config.cpp rename to core/plugins/share/share_config.cpp diff --git a/kded/plugins/share/share_config.h b/core/plugins/share/share_config.h similarity index 100% rename from kded/plugins/share/share_config.h rename to core/plugins/share/share_config.h diff --git a/kded/plugins/share/share_config.ui b/core/plugins/share/share_config.ui similarity index 100% rename from kded/plugins/share/share_config.ui rename to core/plugins/share/share_config.ui diff --git a/kded/plugins/share/shareplugin.cpp b/core/plugins/share/shareplugin.cpp similarity index 100% rename from kded/plugins/share/shareplugin.cpp rename to core/plugins/share/shareplugin.cpp diff --git a/kded/plugins/share/shareplugin.h b/core/plugins/share/shareplugin.h similarity index 100% rename from kded/plugins/share/shareplugin.h rename to core/plugins/share/shareplugin.h diff --git a/kded/plugins/telephony/CMakeLists.txt b/core/plugins/telephony/CMakeLists.txt similarity index 100% rename from kded/plugins/telephony/CMakeLists.txt rename to core/plugins/telephony/CMakeLists.txt diff --git a/kded/plugins/telephony/README b/core/plugins/telephony/README similarity index 100% rename from kded/plugins/telephony/README rename to core/plugins/telephony/README diff --git a/kded/plugins/telephony/kdeconnect_telephony.desktop b/core/plugins/telephony/kdeconnect_telephony.desktop similarity index 100% rename from kded/plugins/telephony/kdeconnect_telephony.desktop rename to core/plugins/telephony/kdeconnect_telephony.desktop diff --git a/kded/plugins/telephony/telephonyplugin.cpp b/core/plugins/telephony/telephonyplugin.cpp similarity index 100% rename from kded/plugins/telephony/telephonyplugin.cpp rename to core/plugins/telephony/telephonyplugin.cpp diff --git a/kded/plugins/telephony/telephonyplugin.h b/core/plugins/telephony/telephonyplugin.h similarity index 100% rename from kded/plugins/telephony/telephonyplugin.h rename to core/plugins/telephony/telephonyplugin.h diff --git a/libkdeconnect/CMakeLists.txt b/interfaces/CMakeLists.txt similarity index 61% rename from libkdeconnect/CMakeLists.txt rename to interfaces/CMakeLists.txt index 175bc8041..f5faefa08 100644 --- a/libkdeconnect/CMakeLists.txt +++ b/interfaces/CMakeLists.txt @@ -27,7 +27,7 @@ set(libkdeconnect_HEADERS devicesmodel.h notificationsmodel.h dbusinterfaces.h - kdeconnect_export.h + ${CMAKE_CURRENT_BINARY_DIR}/kdeconnectinterfaces_export.h ${CMAKE_BINARY_DIR}/libkdeconnect/daemoninterface.h ${CMAKE_BINARY_DIR}/libkdeconnect/deviceinterface.h ${CMAKE_BINARY_DIR}/libkdeconnect/devicebatteryinterface.h @@ -37,28 +37,30 @@ set(libkdeconnect_HEADERS ) set_source_files_properties( - ${CMAKE_BINARY_DIR}/kded/org.kde.kdeconnect.daemon.xml - ${CMAKE_BINARY_DIR}/kded/org.kde.kdeconnect.device.xml - ${CMAKE_BINARY_DIR}/kded/plugins/battery/org.kde.kdeconnect.device.battery.xml - ${CMAKE_BINARY_DIR}/kded/plugins/sftp/org.kde.kdeconnect.device.sftp.xml - ${CMAKE_BINARY_DIR}/kded/plugins/notifications/org.kde.kdeconnect.device.notifications.xml - ${CMAKE_BINARY_DIR}/kded/plugins/notifications/org.kde.kdeconnect.device.notifications.notification.xml + ${CMAKE_BINARY_DIR}/core/org.kde.kdeconnect.daemon.xml + ${CMAKE_BINARY_DIR}/core/org.kde.kdeconnect.device.xml + ${CMAKE_BINARY_DIR}/core/plugins/battery/org.kde.kdeconnect.device.battery.xml + ${CMAKE_BINARY_DIR}/core/plugins/sftp/org.kde.kdeconnect.device.sftp.xml + ${CMAKE_BINARY_DIR}/core/plugins/notifications/org.kde.kdeconnect.device.notifications.xml + ${CMAKE_BINARY_DIR}/core/plugins/notifications/org.kde.kdeconnect.device.notifications.notification.xml PROPERTIES NO_NAMESPACE true ) -qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/kded/org.kde.kdeconnect.daemon.xml daemoninterface) -qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/kded/org.kde.kdeconnect.device.xml deviceinterface) -qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/kded/plugins/battery/org.kde.kdeconnect.device.battery.xml devicebatteryinterface ) -qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/kded/plugins/sftp/org.kde.kdeconnect.device.sftp.xml devicesftpinterface ) -qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/kded/plugins/notifications/org.kde.kdeconnect.device.notifications.xml devicenotificationsinterface ) -qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/kded/plugins/notifications/org.kde.kdeconnect.device.notifications.notification.xml notificationinterface ) +qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/org.kde.kdeconnect.daemon.xml daemoninterface) +qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/org.kde.kdeconnect.device.xml deviceinterface) +qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/plugins/battery/org.kde.kdeconnect.device.battery.xml devicebatteryinterface ) +qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/plugins/sftp/org.kde.kdeconnect.device.sftp.xml devicesftpinterface ) +qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/plugins/notifications/org.kde.kdeconnect.device.notifications.xml devicenotificationsinterface ) +qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/plugins/notifications/org.kde.kdeconnect.device.notifications.notification.xml notificationinterface ) -kde4_add_library(kdeconnect SHARED ${libkdeconnect_SRC}) -set_target_properties(kdeconnect PROPERTIES +kde4_add_library(kdeconnectinterfaces SHARED ${libkdeconnect_SRC}) +set_target_properties(kdeconnectinterfaces PROPERTIES VERSION ${KDECONNECT_VERSION} SOVERSION ${KDECONNECT_VERSION_MAJOR} ) -add_dependencies(kdeconnect +generate_export_header(kdeconnectinterfaces EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kdeconnectinterfaces_export.h BASE_NAME KDEConnectInterfaces) + +add_dependencies(kdeconnectinterfaces org.kde.kdeconnect.daemon.xml org.kde.kdeconnect.device.xml org.kde.kdeconnect.device.battery.xml @@ -67,7 +69,7 @@ add_dependencies(kdeconnect org.kde.kdeconnect.device.notifications.notification.xml ) -target_link_libraries(kdeconnect +target_link_libraries(kdeconnectinterfaces ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} @@ -80,7 +82,7 @@ configure_file(KDEConnectConfig.cmake.in ${CMAKE_BINARY_DIR}/libkdeconnect/KDECo macro_write_basic_cmake_version_file(${CMAKE_BINARY_DIR}/libkdeconnect/KDEConnectConfigVersion.cmake ${KDECONNECT_VERSION_MAJOR} ${KDECONNECT_VERSION_MINOR} ${KDECONNECT_VERSION_PATCH}) -install(TARGETS kdeconnect EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kdeconnectinterfaces EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) #Install header files install(FILES ${libkdeconnect_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kdeconnect COMPONENT Devel) diff --git a/libkdeconnect/KDEConnect/DevicesModel b/interfaces/KDEConnect/DevicesModel similarity index 100% rename from libkdeconnect/KDEConnect/DevicesModel rename to interfaces/KDEConnect/DevicesModel diff --git a/libkdeconnect/KDEConnect/NotificationsModel b/interfaces/KDEConnect/NotificationsModel similarity index 100% rename from libkdeconnect/KDEConnect/NotificationsModel rename to interfaces/KDEConnect/NotificationsModel diff --git a/libkdeconnect/KDEConnectConfig.cmake.in b/interfaces/KDEConnectConfig.cmake.in similarity index 100% rename from libkdeconnect/KDEConnectConfig.cmake.in rename to interfaces/KDEConnectConfig.cmake.in diff --git a/libkdeconnect/dbusinterfaces.cpp b/interfaces/dbusinterfaces.cpp similarity index 100% rename from libkdeconnect/dbusinterfaces.cpp rename to interfaces/dbusinterfaces.cpp diff --git a/libkdeconnect/dbusinterfaces.h b/interfaces/dbusinterfaces.h similarity index 77% rename from libkdeconnect/dbusinterfaces.h rename to interfaces/dbusinterfaces.h index c5b49050f..702d6bb10 100644 --- a/libkdeconnect/dbusinterfaces.h +++ b/interfaces/dbusinterfaces.h @@ -21,20 +21,20 @@ #ifndef DBUSINTERFACES_H #define DBUSINTERFACES_H -#include "kdeconnect_export.h" +#include "interfaces/kdeconnectinterfaces_export.h" -#include "libkdeconnect/daemoninterface.h" -#include "libkdeconnect/deviceinterface.h" -#include "libkdeconnect/devicebatteryinterface.h" -#include "libkdeconnect/devicesftpinterface.h" -#include "libkdeconnect/devicenotificationsinterface.h" -#include "libkdeconnect/notificationinterface.h" +#include "interfaces/daemoninterface.h" +#include "interfaces/deviceinterface.h" +#include "interfaces/devicebatteryinterface.h" +#include "interfaces/devicesftpinterface.h" +#include "interfaces/devicenotificationsinterface.h" +#include "interfaces/notificationinterface.h" /** * Using these "proxy" classes just in case we need to rename the * interface, so we can change the class name in a single place. */ -class KDECONNECT_EXPORT DaemonDbusInterface +class KDECONNECTINTERFACES_EXPORT DaemonDbusInterface : public OrgKdeKdeconnectDaemonInterface { Q_OBJECT @@ -43,7 +43,7 @@ public: virtual ~DaemonDbusInterface(); }; -class KDECONNECT_EXPORT DeviceDbusInterface +class KDECONNECTINTERFACES_EXPORT DeviceDbusInterface : public OrgKdeKdeconnectDeviceInterface { Q_OBJECT @@ -52,7 +52,7 @@ public: virtual ~DeviceDbusInterface(); }; -class KDECONNECT_EXPORT DeviceBatteryDbusInterface +class KDECONNECTINTERFACES_EXPORT DeviceBatteryDbusInterface : public OrgKdeKdeconnectDeviceBatteryInterface { Q_OBJECT @@ -61,7 +61,7 @@ public: virtual ~DeviceBatteryDbusInterface(); }; -class KDECONNECT_EXPORT DeviceNotificationsDbusInterface +class KDECONNECTINTERFACES_EXPORT DeviceNotificationsDbusInterface : public OrgKdeKdeconnectDeviceNotificationsInterface { Q_OBJECT @@ -70,7 +70,7 @@ public: virtual ~DeviceNotificationsDbusInterface(); }; -class KDECONNECT_EXPORT NotificationDbusInterface +class KDECONNECTINTERFACES_EXPORT NotificationDbusInterface : public OrgKdeKdeconnectDeviceNotificationsNotificationInterface { Q_OBJECT @@ -79,7 +79,7 @@ public: virtual ~NotificationDbusInterface(); }; -class KDECONNECT_EXPORT SftpDbusInterface +class KDECONNECTINTERFACES_EXPORT SftpDbusInterface : public OrgKdeKdeconnectDeviceSftpInterface { Q_OBJECT diff --git a/libkdeconnect/devicesmodel.cpp b/interfaces/devicesmodel.cpp similarity index 98% rename from libkdeconnect/devicesmodel.cpp rename to interfaces/devicesmodel.cpp index c8f83dcc7..8f2495f62 100644 --- a/libkdeconnect/devicesmodel.cpp +++ b/interfaces/devicesmodel.cpp @@ -27,7 +27,8 @@ #include #include "kdebugnamespace.h" -#include "modeltest.h" +// #include "modeltest.h" +#include "interfaces/dbusinterfaces.h" DevicesModel::DevicesModel(QObject *parent) : QAbstractListModel(parent) diff --git a/libkdeconnect/devicesmodel.h b/interfaces/devicesmodel.h similarity index 93% rename from libkdeconnect/devicesmodel.h rename to interfaces/devicesmodel.h index 09bb1a130..33340f58d 100644 --- a/libkdeconnect/devicesmodel.h +++ b/interfaces/devicesmodel.h @@ -26,9 +26,12 @@ #include #include -#include "libkdeconnect/dbusinterfaces.h" +#include "interfaces/kdeconnectinterfaces_export.h" -class KDECONNECT_EXPORT DevicesModel +class DaemonDbusInterface; +class DeviceDbusInterface; + +class KDECONNECTINTERFACES_EXPORT DevicesModel : public QAbstractListModel { Q_OBJECT diff --git a/libkdeconnect/kdebugnamespace.cpp b/interfaces/kdebugnamespace.cpp similarity index 100% rename from libkdeconnect/kdebugnamespace.cpp rename to interfaces/kdebugnamespace.cpp diff --git a/libkdeconnect/kdebugnamespace.h b/interfaces/kdebugnamespace.h similarity index 100% rename from libkdeconnect/kdebugnamespace.h rename to interfaces/kdebugnamespace.h diff --git a/libkdeconnect/modeltest.cpp b/interfaces/modeltest.cpp similarity index 100% rename from libkdeconnect/modeltest.cpp rename to interfaces/modeltest.cpp diff --git a/libkdeconnect/modeltest.h b/interfaces/modeltest.h similarity index 100% rename from libkdeconnect/modeltest.h rename to interfaces/modeltest.h diff --git a/libkdeconnect/notificationsmodel.cpp b/interfaces/notificationsmodel.cpp similarity index 100% rename from libkdeconnect/notificationsmodel.cpp rename to interfaces/notificationsmodel.cpp diff --git a/libkdeconnect/notificationsmodel.h b/interfaces/notificationsmodel.h similarity index 96% rename from libkdeconnect/notificationsmodel.h rename to interfaces/notificationsmodel.h index 799908276..f9a747973 100644 --- a/libkdeconnect/notificationsmodel.h +++ b/interfaces/notificationsmodel.h @@ -26,9 +26,9 @@ #include #include -#include "libkdeconnect/dbusinterfaces.h" +#include "interfaces/dbusinterfaces.h" -class KDECONNECT_EXPORT NotificationsModel +class KDECONNECTINTERFACES_EXPORT NotificationsModel : public QAbstractListModel { Q_OBJECT diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt index 505359b48..a1c1db4a7 100644 --- a/kcm/CMakeLists.txt +++ b/kcm/CMakeLists.txt @@ -14,14 +14,12 @@ kde4_add_ui_files(kcm_SRCS kcm.ui) kde4_add_plugin(kcm_kdeconnect ${kcm_SRCS}) -add_dependencies(kcm_kdeconnect libkdeconnect) - target_link_libraries(kcm_kdeconnect ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KCMUTILS_LIBS} - kdeconnect + kdeconnectinterfaces ) install(TARGETS kcm_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/kcm/devicessortproxymodel.cpp b/kcm/devicessortproxymodel.cpp index 68c11fdbe..e17ec8b87 100644 --- a/kcm/devicessortproxymodel.cpp +++ b/kcm/devicessortproxymodel.cpp @@ -20,8 +20,8 @@ #include "devicessortproxymodel.h" -#include "libkdeconnect/dbusinterfaces.h" -#include "libkdeconnect/devicesmodel.h" +#include "interfaces/dbusinterfaces.h" +#include "interfaces/devicesmodel.h" #include "kdebugnamespace.h" diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp index 3e36d4795..78a39cf93 100644 --- a/kcm/kcm.cpp +++ b/kcm/kcm.cpp @@ -35,8 +35,8 @@ #include #include "ui_kcm.h" -#include "libkdeconnect/dbusinterfaces.h" -#include "libkdeconnect/devicesmodel.h" +#include "interfaces/dbusinterfaces.h" +#include "interfaces/devicesmodel.h" #include "devicessortproxymodel.h" #include "kdebugnamespace.h" diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index 5904ffd85..23042227b 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -1,77 +1,11 @@ -project(KDEConnectCore) - -include_directories( - ${KDE4_KIO_LIBS} - ${QJSON_INCLUDE_DIR} - ${QCA2_INCLUDE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -) - -add_subdirectory(plugins) - -add_subdirectory(backends/lan) -add_subdirectory(backends/loopback) - -set(kded_kdeconnect_SRCS - ${kded_kdeconnect_SRCS} - - backends/linkprovider.cpp - backends/devicelink.cpp - - plugins/kdeconnectplugin.cpp - plugins/pluginloader.cpp - - networkpackage.cpp - filetransferjob.cpp - daemon.cpp - device.cpp - kdebugnamespace.cpp -) - -kde4_add_library(kdeconnectcore SHARED ${kded_kdeconnect_SRCS}) -target_link_libraries(kdeconnectcore -PUBLIC - ${KDE4_KDECORE_LIBS} - -PRIVATE - ${KDE4_KIO_LIBS} - ${QJSON_LIBRARIES} - ${QT_QTNETWORK_LIBRARY} - ${QCA2_LIBRARIES} -) -generate_export_header(kdeconnectcore EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kdeconnectcore_export.h BASE_NAME KDEConnectCore) +include_directories(${CMAKE_SOURCE_DIR}) kde4_add_executable(kdeconnectd kdeconnectd.cpp) target_link_libraries(kdeconnectd kdeconnectcore ${KDE4_KDEUI_LIBS}) kde4_add_plugin(kded_kdeconnect kded.cpp) -target_link_libraries(kded_kdeconnect - ${KDE4_KDECORE_LIBS} -) - -include(../macros.cmake) - -generate_and_install_dbus_interface( - kdeconnectd - daemon.h - org.kde.kdeconnect.daemon.xml - OPTIONS -a -) - -generate_and_install_dbus_interface( - kdeconnectd - device.h - org.kde.kdeconnect.device.xml - OPTIONS -a -) - -generate_and_install_dbus_interface( - kded_kdeconnect - kded.h - org.kde.kded.kdeconnect.xml - OPTIONS -a -) +target_link_libraries(kded_kdeconnect ${KDE4_KDECORE_LIBS}) install(TARGETS kdeconnectd DESTINATION ${LIBEXEC_INSTALL_DIR}) install(TARGETS kded_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/kded/kdeconnectd.cpp b/kded/kdeconnectd.cpp index 167371c64..65606a893 100644 --- a/kded/kdeconnectd.cpp +++ b/kded/kdeconnectd.cpp @@ -28,7 +28,7 @@ #include #include -#include "daemon.h" +#include "core/daemon.h" static int sigtermfd[2]; const static char deadbeef = 1; diff --git a/kded/kded.cpp b/kded/kded.cpp index d79fbe2f6..8159124ce 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -25,7 +25,7 @@ #include #include -#include "kdebugnamespace.h" +#include "core/kdebugnamespace.h" int theArea = KDebug::registerArea("kdeconnect-kded"); diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt index 0d58ced5b..8a0754d24 100644 --- a/kio/CMakeLists.txt +++ b/kio/CMakeLists.txt @@ -1,3 +1,5 @@ +include_directories(${CMAKE_SOURCE_DIR}) + set(kio_kdeconnect_PART_SRCS kiokdeconnect.cpp kdebugnamespace.cpp) diff --git a/kio/kiokdeconnect.h b/kio/kiokdeconnect.h index 486bfc8a5..ae63c1fb6 100644 --- a/kio/kiokdeconnect.h +++ b/kio/kiokdeconnect.h @@ -25,7 +25,7 @@ #include -#include "../libkdeconnect/dbusinterfaces.h" +#include "interfaces/dbusinterfaces.h" class KioKdeconnect : public QObject, public KIO::SlaveBase { @@ -58,4 +58,4 @@ private: }; -#endif \ No newline at end of file +#endif diff --git a/libkdeconnect/kdeconnect_export.h b/libkdeconnect/kdeconnect_export.h deleted file mode 100644 index cc7e49c68..000000000 --- a/libkdeconnect/kdeconnect_export.h +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright 2013 Albert Vaca - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License or (at your option) version 3 or any later version - * accepted by the membership of KDE e.V. (or its successor approved - * by the membership of KDE e.V.), which shall act as a proxy - * defined in Section 14 of version 3 of the license. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef KDECONNECT_EXPORT_H -#define KDECONNECT_EXPORT_H - -#include - -#if defined(KDECONNECT_LIBRARY) -#define KDECONNECT_EXPORT Q_DECL_EXPORT -#else -#define KDECONNECT_EXPORT Q_DECL_IMPORT -#endif - -#endif diff --git a/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp b/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp index edd5b27a0..0fa00b7b7 100644 --- a/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp +++ b/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp @@ -29,8 +29,8 @@ #include "objectfactory.h" #include "responsewaiter.h" -#include "libkdeconnect/devicesmodel.h" -#include "libkdeconnect/notificationsmodel.h" +#include "interfaces/devicesmodel.h" +#include "interfaces/notificationsmodel.h" Q_EXPORT_PLUGIN2(kdeconnectdeclarativeplugin, KdeConnectDeclarativePlugin) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d6215c582..51ad49d48 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories( ${QCA2_INCLUDE_DIR} ${KDE4_INCLUDES} ${KDEConnectCore_BINARY_DIR} + ${CMAKE_SOURCE_DIR} ) set(kdeconnect_libraries @@ -21,5 +22,5 @@ kde4_add_unit_test(kdeconnect_tests networkpackagetests.cpp) target_link_libraries(kdeconnect_tests ${kdeconnect_libraries}) #Socketlinereader -kde4_add_unit_test(testsocketlinereader testsocketlinereader.cpp ../kded/backends/lan/socketlinereader.cpp) +kde4_add_unit_test(testsocketlinereader testsocketlinereader.cpp ../core/backends/lan/socketlinereader.cpp) target_link_libraries(testsocketlinereader ${kdeconnect_libraries}) diff --git a/tests/networkpackagetests.cpp b/tests/networkpackagetests.cpp index 806ab93a6..8f6f8ac7b 100644 --- a/tests/networkpackagetests.cpp +++ b/tests/networkpackagetests.cpp @@ -20,7 +20,7 @@ #include "networkpackagetests.h" -#include "../kded/networkpackage.h" +#include "core/networkpackage.h" #include #include diff --git a/tests/testsocketlinereader.cpp b/tests/testsocketlinereader.cpp index e3198ab74..797f60a9f 100644 --- a/tests/testsocketlinereader.cpp +++ b/tests/testsocketlinereader.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * *************************************************************************************/ -#include "../kded/backends/lan/socketlinereader.h" +#include "../core/backends/lan/socketlinereader.h" #include #include @@ -116,4 +116,4 @@ void TestSocketLineReader::newPackage() QTEST_MAIN(TestSocketLineReader) -#include "testsocketlinereader.moc" \ No newline at end of file +#include "testsocketlinereader.moc"