[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:02 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=2fd082f
The following commit has been merged in the master branch:
commit 2fd082f4a0a89521f33249bc87d43cc971c09522
Author: Albert Vaca <albertvaka at gmail.com>
Date: Thu Sep 26 17:49:40 2013 +0200
Includes and cmakelists cleanup
---
kded/daemon.cpp | 9 +++++----
kded/device.cpp | 1 +
kded/device.h | 1 -
kded/filetransferjob.h | 5 +++--
kded/plugins/battery/CMakeLists.txt | 7 ++++---
kded/plugins/clipboard/CMakeLists.txt | 7 ++++---
kded/plugins/filetransfer/CMakeLists.txt | 8 ++++----
kded/plugins/kdeconnectplugin.cpp | 2 --
kded/plugins/mpriscontrol/CMakeLists.txt | 7 ++++---
kded/plugins/notifications/CMakeLists.txt | 7 ++++---
kded/plugins/notifications/notificationsdbusinterface.cpp | 2 +-
kded/plugins/pausemusic/CMakeLists.txt | 7 ++++---
kded/plugins/pausemusic/pausemusicplugin.cpp | 2 +-
kded/plugins/ping/CMakeLists.txt | 7 ++++---
kded/plugins/pluginloader.cpp | 3 ++-
15 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/kded/daemon.cpp b/kded/daemon.cpp
index 82afac7..e873ed7 100644
--- a/kded/daemon.cpp
+++ b/kded/daemon.cpp
@@ -33,8 +33,6 @@
#include <KConfig>
#include <KConfigGroup>
-#include <KNotification>
-#include <KIcon>
K_PLUGIN_FACTORY(KdeConnectFactory, registerPlugin<Daemon>();)
K_EXPORT_PLUGIN(KdeConnectFactory("kdeconnect", "kdeconnect"))
@@ -77,7 +75,8 @@ Daemon::Daemon(QObject *parent, const QList<QVariant>&)
const QStringList& list = known.groupList();
Q_FOREACH(const QString& id, list) {
Device* device = new Device(id);
- connect(device, SIGNAL(reachableStatusChanged()), this, SLOT(onDeviceReachableStatusChanged()));
+ connect(device, SIGNAL(reachableStatusChanged()),
+ this, SLOT(onDeviceReachableStatusChanged()));
mDevices[id] = device;
Q_EMIT deviceAdded(id);
}
@@ -96,6 +95,7 @@ Daemon::Daemon(QObject *parent, const QList<QVariant>&)
setDiscoveryEnabled(true);
}
+
void Daemon::setDiscoveryEnabled(bool b)
{
//Listen to incomming connections
@@ -107,6 +107,7 @@ void Daemon::setDiscoveryEnabled(bool b)
}
}
+
void Daemon::forceOnNetworkChange()
{
Q_FOREACH (LinkProvider* a, mLinkProviders) {
@@ -162,7 +163,7 @@ void Daemon::onDeviceReachableStatusChanged()
Q_EMIT deviceVisibilityChanged(id, device->isReachable());
- qDebug() << "Device" << device->name() << "reachable status changed:" << device->isReachable();
+ //qDebug() << "Device" << device->name() << "reachable status changed:" << device->isReachable();
if (!device->isReachable()) {
diff --git a/kded/device.cpp b/kded/device.cpp
index bc36dcc..4c9712b 100644
--- a/kded/device.cpp
+++ b/kded/device.cpp
@@ -10,6 +10,7 @@
#include <KNotification>
#include <KIcon>
+#include <QDBusConnection>
#include <QDebug>
#include "plugins/kdeconnectplugin.h"
diff --git a/kded/device.h b/kded/device.h
index f7e8e68..04f4462 100644
--- a/kded/device.h
+++ b/kded/device.h
@@ -22,7 +22,6 @@
#define DEVICE_H
#include <QObject>
-#include <QDBusConnection>
#include <QString>
#include <QMap>
#include <QSslKey>
diff --git a/kded/filetransferjob.h b/kded/filetransferjob.h
index 8923291..eed813c 100644
--- a/kded/filetransferjob.h
+++ b/kded/filetransferjob.h
@@ -30,7 +30,8 @@
#include <KIO/Job>
#include <KSharedPtr>
-class FileTransferJob : public KJob
+class FileTransferJob
+ : public KJob
{
Q_OBJECT
@@ -52,4 +53,4 @@ private:
};
-#endif // FILETRANSFERJOB_H
+#endif
diff --git a/kded/plugins/battery/CMakeLists.txt b/kded/plugins/battery/CMakeLists.txt
index e38fec2..a5176a1 100644
--- a/kded/plugins/battery/CMakeLists.txt
+++ b/kded/plugins/battery/CMakeLists.txt
@@ -2,14 +2,15 @@ find_package(KDE4 REQUIRED)
find_package(QJSON REQUIRED)
find_package(QCA2 REQUIRED)
+include(KDE4Defaults)
+
include_directories(
${QJSON_INCLUDE_DIR}
${QCA2_INCLUDE_DIR}
+ ${KDE4_INCLUDES}
+ ${CMAKE_SOURCE_DIR}
)
-include(KDE4Defaults)
-include_directories(${KDE4_INCLUDES})
-
set(kdeconnect_battery_SRCS
batteryplugin.cpp
batterydbusinterface.cpp
diff --git a/kded/plugins/clipboard/CMakeLists.txt b/kded/plugins/clipboard/CMakeLists.txt
index 9cf8179..1a39f06 100644
--- a/kded/plugins/clipboard/CMakeLists.txt
+++ b/kded/plugins/clipboard/CMakeLists.txt
@@ -2,14 +2,15 @@ find_package(KDE4 REQUIRED)
find_package(QJSON REQUIRED)
find_package(QCA2 REQUIRED)
+include(KDE4Defaults)
+
include_directories(
${QJSON_INCLUDE_DIR}
${QCA2_INCLUDE_DIR}
+ ${KDE4_INCLUDES}
+ ${CMAKE_SOURCE_DIR}
)
-include(KDE4Defaults)
-include_directories(${KDE4_INCLUDES})
-
set(kdeconnect_clipboard_SRCS
clipboardplugin.cpp
../kdeconnectplugin.cpp
diff --git a/kded/plugins/filetransfer/CMakeLists.txt b/kded/plugins/filetransfer/CMakeLists.txt
index 58370f6..f95a5ff 100644
--- a/kded/plugins/filetransfer/CMakeLists.txt
+++ b/kded/plugins/filetransfer/CMakeLists.txt
@@ -2,15 +2,15 @@ find_package(KDE4 REQUIRED)
find_package(QJSON REQUIRED)
find_package(QCA2 REQUIRED)
+include(KDE4Defaults)
+
include_directories(
${QJSON_INCLUDE_DIR}
- ${KIO_INCLUDE_DIR}
${QCA2_INCLUDE_DIR}
+ ${KDE4_INCLUDES}
+ ${CMAKE_SOURCE_DIR}
)
-include(KDE4Defaults)
-include_directories(${KDE4_INCLUDES})
-
set(kdeconnect_filetransfer_SRCS
filetransferplugin.cpp
autoclosingqfile.cpp
diff --git a/kded/plugins/kdeconnectplugin.cpp b/kded/plugins/kdeconnectplugin.cpp
index 9a9d0bf..1f3691e 100644
--- a/kded/plugins/kdeconnectplugin.cpp
+++ b/kded/plugins/kdeconnectplugin.cpp
@@ -20,8 +20,6 @@
#include "kdeconnectplugin.h"
-#include <QPointer>
-
#include "../device.h"
KdeConnectPlugin::KdeConnectPlugin(QObject* parent, const QVariantList& args)
diff --git a/kded/plugins/mpriscontrol/CMakeLists.txt b/kded/plugins/mpriscontrol/CMakeLists.txt
index 04965f6..7332fda 100644
--- a/kded/plugins/mpriscontrol/CMakeLists.txt
+++ b/kded/plugins/mpriscontrol/CMakeLists.txt
@@ -2,14 +2,15 @@ find_package(KDE4 REQUIRED)
find_package(QJSON REQUIRED)
find_package(QCA2 REQUIRED)
+include(KDE4Defaults)
+
include_directories(
${QJSON_INCLUDE_DIR}
${QCA2_INCLUDE_DIR}
+ ${KDE4_INCLUDES}
+ ${CMAKE_SOURCE_DIR}
)
-include(KDE4Defaults)
-include_directories(${KDE4_INCLUDES})
-
set(kdeconnect_mpriscontrol_SRCS
mpriscontrolplugin.cpp
../kdeconnectplugin.cpp
diff --git a/kded/plugins/notifications/CMakeLists.txt b/kded/plugins/notifications/CMakeLists.txt
index 37bf9dd..dddb6b5 100644
--- a/kded/plugins/notifications/CMakeLists.txt
+++ b/kded/plugins/notifications/CMakeLists.txt
@@ -2,14 +2,15 @@ find_package(KDE4 REQUIRED)
find_package(QJSON REQUIRED)
find_package(QCA2 REQUIRED)
+include(KDE4Defaults)
+
include_directories(
${QJSON_INCLUDE_DIR}
${QCA2_INCLUDE_DIR}
+ ${KDE4_INCLUDES}
+ ${CMAKE_SOURCE_DIR}
)
-include(KDE4Defaults)
-include_directories(${KDE4_INCLUDES})
-
set(kdeconnect_notifications_SRCS
notification.cpp
notificationsplugin.cpp
diff --git a/kded/plugins/notifications/notificationsdbusinterface.cpp b/kded/plugins/notifications/notificationsdbusinterface.cpp
index 475c7cc..2ed568f 100644
--- a/kded/plugins/notifications/notificationsdbusinterface.cpp
+++ b/kded/plugins/notifications/notificationsdbusinterface.cpp
@@ -23,7 +23,7 @@
#include "../../filetransferjob.h"
#include <QDebug>
-#include <qdir.h>
+#include <QDir>
#include <QDBusConnection>
#include <KNotification>
diff --git a/kded/plugins/pausemusic/CMakeLists.txt b/kded/plugins/pausemusic/CMakeLists.txt
index 9f47678..ac8d2e2 100644
--- a/kded/plugins/pausemusic/CMakeLists.txt
+++ b/kded/plugins/pausemusic/CMakeLists.txt
@@ -2,14 +2,15 @@ find_package(KDE4 REQUIRED)
find_package(QJSON REQUIRED)
find_package(QCA2 REQUIRED)
+include(KDE4Defaults)
+
include_directories(
${QJSON_INCLUDE_DIR}
${QCA2_INCLUDE_DIR}
+ ${KDE4_INCLUDES}
+ ${CMAKE_SOURCE_DIR}
)
-include(KDE4Defaults)
-include_directories(${KDE4_INCLUDES})
-
set(kdeconnect_pausemusic_SRCS
pausemusicplugin.cpp
../kdeconnectplugin.cpp
diff --git a/kded/plugins/pausemusic/pausemusicplugin.cpp b/kded/plugins/pausemusic/pausemusicplugin.cpp
index 31055ea..0c2de49 100644
--- a/kded/plugins/pausemusic/pausemusicplugin.cpp
+++ b/kded/plugins/pausemusic/pausemusicplugin.cpp
@@ -23,7 +23,7 @@
#include <QDebug>
#include <QDBusConnection>
#include <QDBusInterface>
-#include <qdbusconnectioninterface.h>
+#include <QDBusConnectionInterface>
#include <QDBusReply>
#include <QDBusMessage>
diff --git a/kded/plugins/ping/CMakeLists.txt b/kded/plugins/ping/CMakeLists.txt
index 56d03f2..7e36276 100644
--- a/kded/plugins/ping/CMakeLists.txt
+++ b/kded/plugins/ping/CMakeLists.txt
@@ -2,14 +2,15 @@ find_package(KDE4 REQUIRED)
find_package(QJSON REQUIRED)
find_package(QCA2 REQUIRED)
+include(KDE4Defaults)
+
include_directories(
${QJSON_INCLUDE_DIR}
${QCA2_INCLUDE_DIR}
+ ${KDE4_INCLUDES}
+ ${CMAKE_SOURCE_DIR}
)
-include(KDE4Defaults)
-include_directories(${KDE4_INCLUDES})
-
set(kdeconnect_ping_SRCS
pingplugin.cpp
../kdeconnectplugin.cpp
diff --git a/kded/plugins/pluginloader.cpp b/kded/plugins/pluginloader.cpp
index 2c0f912..ce7729a 100644
--- a/kded/plugins/pluginloader.cpp
+++ b/kded/plugins/pluginloader.cpp
@@ -22,8 +22,9 @@
#include "kdeconnectplugin.h"
+#include <QDebug>
+
#include <KServiceTypeTrader>
-#include <KDebug>
#include "../device.h"
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list