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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7c0fbbc034ee135252a4853df0c5490170c82054
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Jul 5 14:13:48 2016 +0200

    Unused include cleanup
---
 core/backends/lan/lanlinkprovider.h   |  5 +++--
 core/backends/lan/lanpairinghandler.h |  3 +++
 core/backends/linkprovider.h          |  2 --
 core/backends/pairinghandler.h        |  5 ++---
 core/daemon.cpp                       |  4 ++--
 core/device.cpp                       | 10 ++--------
 core/device.h                         |  4 ----
 core/pluginloader.cpp                 |  1 -
 interfaces/notificationsmodel.cpp     |  1 -
 9 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/core/backends/lan/lanlinkprovider.h b/core/backends/lan/lanlinkprovider.h
index 926a777..88f416d 100644
--- a/core/backends/lan/lanlinkprovider.h
+++ b/core/backends/lan/lanlinkprovider.h
@@ -25,8 +25,9 @@
 #include <QTcpServer>
 #include <QSslSocket>
 #include <QUdpSocket>
-#include <QtNetwork/qsslsocket.h>
-
+#include <QTimer>
+#include <QNetworkSession>
+#include <QSslSocket>
 
 #include <kdeconnectcore_export.h>
 #include "../linkprovider.h"
diff --git a/core/backends/lan/lanpairinghandler.h b/core/backends/lan/lanpairinghandler.h
index eb0a8ac..cd4da2d 100644
--- a/core/backends/lan/lanpairinghandler.h
+++ b/core/backends/lan/lanpairinghandler.h
@@ -21,6 +21,9 @@
 #ifndef KDECONNECT_LANPAIRINGHANDLER_H
 #define KDECONNECT_LANPAIRINGHANDLER_H
 
+#include <QObject>
+#include <QTimer>
+
 #include "device.h"
 #include "../devicelink.h"
 #include "../pairinghandler.h"
diff --git a/core/backends/linkprovider.h b/core/backends/linkprovider.h
index 5dda36e..70f35e1 100644
--- a/core/backends/linkprovider.h
+++ b/core/backends/linkprovider.h
@@ -22,8 +22,6 @@
 #define LINKPROVIDER_H
 
 #include <QObject>
-#include <QVector>
-#include <QNetworkSession>
 
 #include "core/networkpackage.h"
 #include "pairinghandler.h"
diff --git a/core/backends/pairinghandler.h b/core/backends/pairinghandler.h
index e918b3c..8fc0c9d 100644
--- a/core/backends/pairinghandler.h
+++ b/core/backends/pairinghandler.h
@@ -24,8 +24,6 @@
 #include "networkpackage.h"
 #include "devicelink.h"
 
-#include <QTimer>
-
 /*
  * This class separates the pairing interface for each type of link.
  * Since different links can pair via different methods, like for LanLink certificate and public key should be shared,
@@ -37,7 +35,8 @@
  * After that if any one of the link is paired, then we can say that device is paired, so new link will pair automatically
  */
 
-class KDECONNECTCORE_EXPORT PairingHandler : public QObject
+class KDECONNECTCORE_EXPORT PairingHandler
+    : public QObject
 {
     Q_OBJECT
 
diff --git a/core/daemon.cpp b/core/daemon.cpp
index 33b7619..f03667b 100644
--- a/core/daemon.cpp
+++ b/core/daemon.cpp
@@ -171,7 +171,7 @@ void Daemon::onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink*
     //qCDebug(KDECONNECT_CORE) << "Device discovered" << id << "via" << dl->provider()->name();
 
     if (d->mDevices.contains(id)) {
-        qCDebug(KDECONNECT_CORE) << "It is a known device " << identityPackage.get<QString>("deviceName");
+        qCDebug(KDECONNECT_CORE) << "It is a known device" << identityPackage.get<QString>("deviceName");
         Device* device = d->mDevices[id];
         bool wasReachable = device->isReachable();
         device->addLink(identityPackage, dl);
@@ -179,7 +179,7 @@ void Daemon::onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink*
             Q_EMIT deviceVisibilityChanged(id, true);
         }
     } else {
-        qCDebug(KDECONNECT_CORE) << "It is a new device " << identityPackage.get<QString>("deviceName");
+        qCDebug(KDECONNECT_CORE) << "It is a new device" << identityPackage.get<QString>("deviceName");
         Device* device = new Device(this, identityPackage, dl);
 
         //we discard the connections that we created but it's not paired.
diff --git a/core/device.cpp b/core/device.cpp
index bbccb96..4ec66bc 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -25,16 +25,11 @@
 #endif
 
 #include <QDBusConnection>
-#include <QFile>
-#include <QStandardPaths>
+#include <QSslCertificate>
 
 #include <KSharedConfig>
 #include <KConfigGroup>
 #include <KLocalizedString>
-#include <QIcon>
-#include <QDir>
-#include <QJsonArray>
-#include <qstringbuilder.h>
 
 #include "core_debug.h"
 #include "kdeconnectplugin.h"
@@ -47,7 +42,6 @@
 
 #define MIN_VERSION_WITH_CAPPABILITIES_SUPPORT 6
 
-
 Q_LOGGING_CATEGORY(KDECONNECT_CORE, "kdeconnect.core")
 
 static void warn(const QString &info)
@@ -137,7 +131,7 @@ void Device::reloadPlugins()
                 && (m_outgoingCapabilities & incomingInterfaces).isEmpty()
             ) {
                 if (!m_incomingCapabilities.isEmpty() || !m_outgoingCapabilities.isEmpty()) {
-                    qCWarning(KDECONNECT_CORE) << "not loading " << pluginName << "because of unmatched capabilities" <<
+                    qCWarning(KDECONNECT_CORE) << "not loading" << pluginName << "because of unmatched capabilities" <<
                         outgoingInterfaces << incomingInterfaces;
                 }
 
diff --git a/core/device.h b/core/device.h
index 16dd9cf..f466856 100644
--- a/core/device.h
+++ b/core/device.h
@@ -25,10 +25,6 @@
 #include <QString>
 #include <QVector>
 #include <QSet>
-#include <QSslKey>
-#include <QtCrypto>
-#include <QSslCertificate>
-#include <QTimer>
 
 #include "networkpackage.h"
 #include "backends/devicelink.h"
diff --git a/core/pluginloader.cpp b/core/pluginloader.cpp
index 0a55570..9608d46 100644
--- a/core/pluginloader.cpp
+++ b/core/pluginloader.cpp
@@ -23,7 +23,6 @@
 #include <KPluginMetaData>
 #include <KPluginLoader>
 #include <KPluginFactory>
-#include <QJsonArray>
 
 #include "core_debug.h"
 #include "device.h"
diff --git a/interfaces/notificationsmodel.cpp b/interfaces/notificationsmodel.cpp
index 3469cd5..472b458 100644
--- a/interfaces/notificationsmodel.cpp
+++ b/interfaces/notificationsmodel.cpp
@@ -25,7 +25,6 @@
 #include <QDBusInterface>
 
 #include <KSharedConfig>
-#include <KConfigGroup>
 #include <QIcon>
 
 //#include "modeltest.h"

-- 
kdeconnect packaging