From a3decd542cd1226c17398fb951b2e13cc81e7975 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 9 Mar 2015 21:59:36 -0700 Subject: [PATCH] Includes cleanup --- CMakeLists.txt | 3 +++ cli/CMakeLists.txt | 1 - cli/kdeconnect-cli.cpp | 15 ++++++++------- core/CMakeLists.txt | 6 ++++-- core/backends/devicelink.h | 2 +- core/backends/linkprovider.h | 2 +- daemon/CMakeLists.txt | 2 -- daemon/kdeconnectd.cpp | 3 +-- plugins/ping/pingplugin.cpp | 9 +++++---- plugins/share/shareplugin.cpp | 14 +++++--------- plugins/telephony/telephonyplugin.h | 5 ++--- tests/CMakeLists.txt | 2 +- 12 files changed, 31 insertions(+), 33 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32cda3870..b81a476a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,8 @@ find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test) find_package(KF5 REQUIRED COMPONENTS I18n KIO Notifications ConfigWidgets DBusAddons KCMUtils IconThemes) find_package(Qca-qt5 2.1.0 REQUIRED) +include_directories(${CMAKE_SOURCE_DIR}) + configure_file(kdeconnect-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/kdeconnect-version.h) include(KDEInstallDirs) @@ -29,6 +31,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(core) add_subdirectory(kcm) +add_subdirectory(kcmplugin) add_subdirectory(kio) add_subdirectory(icon) add_subdirectory(interfaces) diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index 8a8f40b51..7ddf635c2 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -1,4 +1,3 @@ -include_directories(${CMAKE_SOURCE_DIR}) add_executable(kdeconnect-cli kdeconnect-cli.cpp) diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp index 70a894e1b..30c42ab30 100644 --- a/cli/kdeconnect-cli.cpp +++ b/cli/kdeconnect-cli.cpp @@ -18,17 +18,18 @@ * along with this program. If not, see . */ -#include -#include -#include #include #include -#include -#include -#include +#include #include -#include "../kdeconnect-version.h" +#include +#include + +#include "interfaces/devicesmodel.h" +#include "interfaces/notificationsmodel.h" +#include "interfaces/dbusinterfaces.h" +#include "kdeconnect-version.h" int main(int argc, char** argv) { diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 4a007276c..83f5ded91 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -9,7 +9,9 @@ include_directories( add_subdirectory(backends/lan) add_subdirectory(backends/loopback) -set(kded_kdeconnect_SRCS +find_package(KF5Notifications 5.9 REQUIRED) + +set(kdeconnectcore_SRCS ${backends_kdeconnect_SRCS} backends/linkprovider.cpp @@ -26,7 +28,7 @@ set(kded_kdeconnect_SRCS device.cpp ) -add_library(kdeconnectcore SHARED ${kded_kdeconnect_SRCS}) +add_library(kdeconnectcore SHARED ${kdeconnectcore_SRCS}) target_link_libraries(kdeconnectcore PUBLIC Qt5::Network diff --git a/core/backends/devicelink.h b/core/backends/devicelink.h index af1fe1251..0ae6c0090 100644 --- a/core/backends/devicelink.h +++ b/core/backends/devicelink.h @@ -24,7 +24,7 @@ #include #include -#include "../networkpackage.h" +#include "core/networkpackage.h" class NetworkPackage; class LinkProvider; diff --git a/core/backends/linkprovider.h b/core/backends/linkprovider.h index 00805c1b5..04aeac90f 100644 --- a/core/backends/linkprovider.h +++ b/core/backends/linkprovider.h @@ -25,7 +25,7 @@ #include #include -#include "../networkpackage.h" +#include "core/networkpackage.h" class DeviceLink; diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index f593d0e97..8847c32ae 100644 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt @@ -1,7 +1,5 @@ project(kdeconnectd) -include_directories(${CMAKE_SOURCE_DIR}) - add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-daemon") add_executable(kdeconnectd kdeconnectd.cpp) diff --git a/daemon/kdeconnectd.cpp b/daemon/kdeconnectd.cpp index 40a53e5bd..cb7de79f0 100644 --- a/daemon/kdeconnectd.cpp +++ b/daemon/kdeconnectd.cpp @@ -29,8 +29,7 @@ #include #include "core/daemon.h" - -#include "../kdeconnect-version.h" +#include "kdeconnect-version.h" static int sigtermfd[2]; const static char deadbeef = 1; diff --git a/plugins/ping/pingplugin.cpp b/plugins/ping/pingplugin.cpp index 72c2a50da..519bee57f 100644 --- a/plugins/ping/pingplugin.cpp +++ b/plugins/ping/pingplugin.cpp @@ -21,13 +21,14 @@ #include "pingplugin.h" #include -#include -#include #include #include -#include -#include + +#include #include +#include + +#include K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< PingPlugin >(); ) diff --git a/plugins/share/shareplugin.cpp b/plugins/share/shareplugin.cpp index dbafb1149..2fd689c74 100644 --- a/plugins/share/shareplugin.cpp +++ b/plugins/share/shareplugin.cpp @@ -21,20 +21,17 @@ #include "shareplugin.h" #include "share_debug.h" -#include -#include #include -#include -#include -#include -#include - -#include +#include #include #include #include #include +#include +#include +#include + #include #include "autoclosingqfile.h" @@ -188,7 +185,6 @@ void SharePlugin::openDestinationFolder() void SharePlugin::shareUrl(const QUrl& url) { - qDebug() << url; NetworkPackage package(PACKAGE_TYPE_SHARE); if(url.isLocalFile()) { QSharedPointer ioFile(new QFile(url.toLocalFile())); diff --git a/plugins/telephony/telephonyplugin.h b/plugins/telephony/telephonyplugin.h index fb57d5ebd..ce74e9e2f 100644 --- a/plugins/telephony/telephonyplugin.h +++ b/plugins/telephony/telephonyplugin.h @@ -22,12 +22,11 @@ #define TELEPHONYPLUGIN_H #include -#include + +#include #include -#include - #define PACKAGE_TYPE_TELEPHONY QLatin1String("kdeconnect.telephony") Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_TELEPHONY) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4c508b74b..b21a04fe6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -4,10 +4,10 @@ include_directories( ) set(kdeconnect_libraries + kdeconnectcore KF5::KIOWidgets Qt5::Network Qt5::Test - kdeconnectcore qca-qt5 )