[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:28:21 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=a3decd5

The following commit has been merged in the master branch:
commit a3decd542cd1226c17398fb951b2e13cc81e7975
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Mon Mar 9 21:59:36 2015 -0700

    Includes cleanup
---
 CMakeLists.txt                      |  3 +++
 cli/CMakeLists.txt                  |  1 -
 cli/kdeconnect-cli.cpp              | 13 +++++++------
 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         |  7 ++++---
 plugins/share/shareplugin.cpp       | 14 +++++---------
 plugins/telephony/telephonyplugin.h |  5 ++---
 tests/CMakeLists.txt                |  2 +-
 12 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32cda38..b81a476 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 8a8f40b..7ddf635 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 70a894e..30c42ab 100644
--- a/cli/kdeconnect-cli.cpp
+++ b/cli/kdeconnect-cli.cpp
@@ -18,17 +18,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <interfaces/devicesmodel.h>
-#include <interfaces/notificationsmodel.h>
-#include <interfaces/dbusinterfaces.h>
 #include <QDBusMessage>
 #include <QDBusConnection>
-#include <QGuiApplication>
+#include <QCoreApplication>
+#include <QTextStream>
+
 #include <KAboutData>
 #include <KLocalizedString>
-#include <QTextStream>
 
-#include "../kdeconnect-version.h"
+#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 4a00727..83f5ded 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 af1fe12..0ae6c00 100644
--- a/core/backends/devicelink.h
+++ b/core/backends/devicelink.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QtCrypto>
 
-#include "../networkpackage.h"
+#include "core/networkpackage.h"
 
 class NetworkPackage;
 class LinkProvider;
diff --git a/core/backends/linkprovider.h b/core/backends/linkprovider.h
index 00805c1..04aeac9 100644
--- a/core/backends/linkprovider.h
+++ b/core/backends/linkprovider.h
@@ -25,7 +25,7 @@
 #include <QVector>
 #include <QNetworkSession>
 
-#include "../networkpackage.h"
+#include "core/networkpackage.h"
 
 class DeviceLink;
 
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index f593d0e..8847c32 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 40a53e5..cb7de79 100644
--- a/daemon/kdeconnectd.cpp
+++ b/daemon/kdeconnectd.cpp
@@ -29,8 +29,7 @@
 #include <KDBusService>
 
 #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 72c2a50..519bee5 100644
--- a/plugins/ping/pingplugin.cpp
+++ b/plugins/ping/pingplugin.cpp
@@ -21,13 +21,14 @@
 #include "pingplugin.h"
 
 #include <KNotification>
-#include <QIcon>
-#include <QDebug>
 #include <KLocalizedString>
 #include <KPluginFactory>
+
+#include <QDebug>
+#include <QDBusConnection>
 #include <QLoggingCategory>
+
 #include <core/device.h>
-#include <QDBusConnection>
 
 K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< PingPlugin >(); )
 
diff --git a/plugins/share/shareplugin.cpp b/plugins/share/shareplugin.cpp
index dbafb11..2fd689c 100644
--- a/plugins/share/shareplugin.cpp
+++ b/plugins/share/shareplugin.cpp
@@ -21,20 +21,17 @@
 #include "shareplugin.h"
 #include "share_debug.h"
 
-#include <QIcon>
-#include <KLocalizedString>
 #include <QStandardPaths>
-#include <KSharedConfig>
-#include <KConfigGroup>
-#include <KJobTrackerInterface>
-#include <KPluginFactory>
-
-#include <qprocess.h>
+#include <QProcess>
 #include <QDir>
 #include <QDesktopServices>
 #include <QDBusConnection>
 #include <QDebug>
 
+#include <KLocalizedString>
+#include <KJobTrackerInterface>
+#include <KPluginFactory>
+
 #include <core/filetransferjob.h>
 #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<QIODevice> ioFile(new QFile(url.toLocalFile()));
diff --git a/plugins/telephony/telephonyplugin.h b/plugins/telephony/telephonyplugin.h
index fb57d5e..ce74e9e 100644
--- a/plugins/telephony/telephonyplugin.h
+++ b/plugins/telephony/telephonyplugin.h
@@ -22,11 +22,10 @@
 #define TELEPHONYPLUGIN_H
 
 #include <QLoggingCategory>
-#include <knotification.h>
 
-#include <core/kdeconnectplugin.h>
+#include <KNotification>
 
-#include <KStatusNotifierItem>
+#include <core/kdeconnectplugin.h>
 
 #define PACKAGE_TYPE_TELEPHONY QLatin1String("kdeconnect.telephony")
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4c508b7..b21a04f 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
 )
 

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list