[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:57 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=5933c68
The following commit has been merged in the master branch:
commit 5933c6810c7e8b564a597751de97f79aaa500991
Author: Albert Vaca <albertvaka at gmail.com>
Date: Tue Jul 5 14:27:53 2016 +0200
More unused includes cleanup
---
core/backends/lan/downloadjob.cpp | 6 ++----
core/backends/lan/downloadjob.h | 4 ++--
core/backends/lan/landevicelink.cpp | 4 ++--
core/backends/lan/landevicelink.h | 2 +-
core/backends/lan/lanlinkprovider.cpp | 10 ++++------
core/backends/lan/lanlinkprovider.h | 4 ++--
core/backends/lan/lanpairinghandler.h | 4 ++--
core/backends/lan/server.h | 5 ++---
core/backends/lan/socketlinereader.h | 1 -
core/backends/lan/uploadjob.cpp | 6 ++----
core/filetransferjob.h | 7 ++-----
plugins/findmyphone/findmyphoneplugin.cpp | 1 -
plugins/sendnotifications/notifyingapplication.h | 1 -
plugins/sendnotifications/notifyingapplicationmodel.cpp | 7 +++++--
plugins/sendnotifications/sendnotificationsplugin.h | 3 +--
plugins/sftp/mounter.cpp | 2 +-
plugins/share/shareplugin.cpp | 3 ++-
17 files changed, 30 insertions(+), 40 deletions(-)
diff --git a/core/backends/lan/downloadjob.cpp b/core/backends/lan/downloadjob.cpp
index 3ddc08a..50fa0da 100644
--- a/core/backends/lan/downloadjob.cpp
+++ b/core/backends/lan/downloadjob.cpp
@@ -18,11 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <kdeconnectconfig.h>
#include "downloadjob.h"
-#include "lanlinkprovider.h"
-
-#include <core/core_debug.h>
#ifndef Q_OS_WIN
#include <sys/socket.h>
@@ -31,7 +27,9 @@
#include <netdb.h>
#endif
+#include "kdeconnectconfig.h"
#include "lanlinkprovider.h"
+#include "core/core_debug.h"
DownloadJob::DownloadJob(const QHostAddress &address, const QVariantMap &transferInfo)
: KJob()
diff --git a/core/backends/lan/downloadjob.h b/core/backends/lan/downloadjob.h
index 76a74b7..daa898e 100644
--- a/core/backends/lan/downloadjob.h
+++ b/core/backends/lan/downloadjob.h
@@ -26,11 +26,11 @@
#include <QIODevice>
#include <QVariantMap>
#include <QHostAddress>
-#include <QTcpSocket>
#include <QSharedPointer>
#include <QSslSocket>
#include <QBuffer>
-#include <kdeconnectcore_export.h>
+
+#include "kdeconnectcore_export.h"
class KDECONNECTCORE_EXPORT DownloadJob
diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
index 569b5cc..a6658e9 100644
--- a/core/backends/lan/landevicelink.cpp
+++ b/core/backends/lan/landevicelink.cpp
@@ -22,8 +22,8 @@
#include "landevicelink.h"
#include "core_debug.h"
-#include <kdeconnectconfig.h>
-#include "../linkprovider.h"
+#include "kdeconnectconfig.h"
+#include "backends/linkprovider.h"
#include "uploadjob.h"
#include "downloadjob.h"
#include "socketlinereader.h"
diff --git a/core/backends/lan/landevicelink.h b/core/backends/lan/landevicelink.h
index dfb4f6d..8eb1586 100644
--- a/core/backends/lan/landevicelink.h
+++ b/core/backends/lan/landevicelink.h
@@ -27,7 +27,7 @@
#include <QSslCertificate>
#include <kdeconnectcore_export.h>
-#include "../devicelink.h"
+#include "backends/devicelink.h"
#include "uploadjob.h"
class SocketLineReader;
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index 7630f0c..7fe58f8 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -31,17 +31,15 @@
#include <QHostInfo>
#include <QTcpServer>
#include <QUdpSocket>
-#include <QtGlobal>
#include <QNetworkSession>
#include <QNetworkConfigurationManager>
+#include <QSslCipher>
+#include <QSslConfiguration>
-#include "../../daemon.h"
+#include "daemon.h"
#include "landevicelink.h"
#include "lanpairinghandler.h"
-#include <kdeconnectconfig.h>
-#include <QDBusPendingReply>
-#include <QtNetwork/qsslcipher.h>
-#include <QtNetwork/qsslconfiguration.h>
+#include "kdeconnectconfig.h"
#define MIN_VERSION_WITH_SSL_SUPPORT 6
diff --git a/core/backends/lan/lanlinkprovider.h b/core/backends/lan/lanlinkprovider.h
index 88f416d..133fc69 100644
--- a/core/backends/lan/lanlinkprovider.h
+++ b/core/backends/lan/lanlinkprovider.h
@@ -29,8 +29,8 @@
#include <QNetworkSession>
#include <QSslSocket>
-#include <kdeconnectcore_export.h>
-#include "../linkprovider.h"
+#include "kdeconnectcore_export.h"
+#include "backends/linkprovider.h"
#include "server.h"
#include "landevicelink.h"
diff --git a/core/backends/lan/lanpairinghandler.h b/core/backends/lan/lanpairinghandler.h
index cd4da2d..363f64c 100644
--- a/core/backends/lan/lanpairinghandler.h
+++ b/core/backends/lan/lanpairinghandler.h
@@ -25,8 +25,8 @@
#include <QTimer>
#include "device.h"
-#include "../devicelink.h"
-#include "../pairinghandler.h"
+#include "backends/devicelink.h"
+#include "backends/pairinghandler.h"
// This class is used pairing related stuff. It has direct access to links and can directly send packages
class LanPairingHandler
diff --git a/core/backends/lan/server.h b/core/backends/lan/server.h
index 977cf82..ad1af00 100644
--- a/core/backends/lan/server.h
+++ b/core/backends/lan/server.h
@@ -22,10 +22,9 @@
#define KDECONNECT_SERVER_H
#include <QTcpServer>
-#include <QSslError>
-#include <QtNetwork/qsslsocket.h>
-#include <kdeconnectcore_export.h>
+#include <QSslSocket>
+#include "kdeconnectcore_export.h"
// This class overrides QTcpServer to bind QSslSocket to native socket descriptor instead of QTcpSocket
class KDECONNECTCORE_EXPORT Server
diff --git a/core/backends/lan/socketlinereader.h b/core/backends/lan/socketlinereader.h
index 66b9cee..bdaf24a 100644
--- a/core/backends/lan/socketlinereader.h
+++ b/core/backends/lan/socketlinereader.h
@@ -22,7 +22,6 @@
#define SOCKETLINEREADER_H
#include <QObject>
-#include <QString>
#include <QQueue>
#include <QSslSocket>
#include <QHostAddress>
diff --git a/core/backends/lan/uploadjob.cpp b/core/backends/lan/uploadjob.cpp
index a2b14a3..9cdf702 100644
--- a/core/backends/lan/uploadjob.cpp
+++ b/core/backends/lan/uploadjob.cpp
@@ -19,13 +19,11 @@
*/
#include "uploadjob.h"
-#include "lanlinkprovider.h"
-#include <qalgorithms.h>
-#include <QtGlobal>
#include <KLocalizedString>
-#include <kdeconnectconfig.h>
+#include "lanlinkprovider.h"
+#include "kdeconnectconfig.h"
#include "core_debug.h"
UploadJob::UploadJob(const QSharedPointer<QIODevice>& source, const QString& deviceId)
diff --git a/core/filetransferjob.h b/core/filetransferjob.h
index 2021034..ee434de 100644
--- a/core/filetransferjob.h
+++ b/core/filetransferjob.h
@@ -22,16 +22,13 @@
#ifndef FILETRANSFERJOB_H
#define FILETRANSFERJOB_H
+#include <KJob>
+
#include <QIODevice>
#include <QTime>
-#include <QTemporaryFile>
#include <QSharedPointer>
-
-#include <KJob>
#include <QUrl>
-#include <QNetworkAccessManager>
#include <QNetworkReply>
-#include <QBuffer>
#include "kdeconnectcore_export.h"
diff --git a/plugins/findmyphone/findmyphoneplugin.cpp b/plugins/findmyphone/findmyphoneplugin.cpp
index e405497..2bfb09d 100644
--- a/plugins/findmyphone/findmyphoneplugin.cpp
+++ b/plugins/findmyphone/findmyphoneplugin.cpp
@@ -21,7 +21,6 @@
#include "findmyphoneplugin.h"
-#include <core/device.h>
#include <QDBusConnection>
#include <QDebug>
diff --git a/plugins/sendnotifications/notifyingapplication.h b/plugins/sendnotifications/notifyingapplication.h
index 97421aa..d0d8226 100644
--- a/plugins/sendnotifications/notifyingapplication.h
+++ b/plugins/sendnotifications/notifyingapplication.h
@@ -22,7 +22,6 @@
#define NOTIFYINGAPPLICATION_H
#include <QRegularExpression>
-#include <QList>
struct NotifyingApplication {
QString name;
diff --git a/plugins/sendnotifications/notifyingapplicationmodel.cpp b/plugins/sendnotifications/notifyingapplicationmodel.cpp
index eadd46a..c6e6f3c 100644
--- a/plugins/sendnotifications/notifyingapplicationmodel.cpp
+++ b/plugins/sendnotifications/notifyingapplicationmodel.cpp
@@ -18,13 +18,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "notifyingapplicationmodel.h"
+
+#include <algorithm>
+
#include <QString>
#include <QIcon>
#include <QDebug>
+
#include <KLocalizedString>
-#include <algorithm>
-#include "notifyingapplicationmodel.h"
//#include "modeltest.h"
NotifyingApplicationModel::NotifyingApplicationModel(QObject *parent)
diff --git a/plugins/sendnotifications/sendnotificationsplugin.h b/plugins/sendnotifications/sendnotificationsplugin.h
index 3c52c0b..c428af8 100644
--- a/plugins/sendnotifications/sendnotificationsplugin.h
+++ b/plugins/sendnotifications/sendnotificationsplugin.h
@@ -21,9 +21,8 @@
#ifndef SENDNOTIFICATIONSPLUGIN_H
#define SENDNOTIFICATIONSPLUGIN_H
-#include <knotification.h>
+#include "core/kdeconnectplugin.h"
-#include <core/kdeconnectplugin.h>
#define PACKAGE_TYPE_NOTIFICATION QLatin1String("kdeconnect.notification")
/*
diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
index 9c98dff..375f073 100644
--- a/plugins/sftp/mounter.cpp
+++ b/plugins/sftp/mounter.cpp
@@ -27,7 +27,7 @@
#include "mountloop.h"
#include "sftp_debug.h"
-#include <kdeconnectconfig.h>
+#include "kdeconnectconfig.h"
Mounter::Mounter(SftpPlugin* sftp)
: QObject(sftp)
diff --git a/plugins/share/shareplugin.cpp b/plugins/share/shareplugin.cpp
index d6c16a4..cc75e63 100644
--- a/plugins/share/shareplugin.cpp
+++ b/plugins/share/shareplugin.cpp
@@ -27,13 +27,14 @@
#include <QDesktopServices>
#include <QDBusConnection>
#include <QDebug>
+#include <QTemporaryFile>
#include <KLocalizedString>
#include <KJobTrackerInterface>
#include <KPluginFactory>
#include <KIO/MkpathJob>
-#include <core/filetransferjob.h>
+#include "core/filetransferjob.h"
#include "autoclosingqfile.h"
K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_share.json", registerPlugin< SharePlugin >(); )
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list