[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:58 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=d971269
The following commit has been merged in the master branch:
commit d971269bd5ff8fea80619c3f21caeca4b245d923
Author: Àlex Fiestas <afiestas at kde.org>
Date: Mon Sep 22 00:59:34 2014 +0200
Remove kdebugnamespace completely and replace by core_debug
In those places that belong to "core" we use core_debug, in any other
place we have added custom logging categories so we use those instead.
---
core/backends/lan/landevicelink.cpp | 1 +
core/backends/lan/lanlinkprovider.cpp | 3 +-
core/backends/lan/uploadjob.cpp | 2 +-
core/backends/loopback/loopbacklinkprovider.cpp | 2 +-
.../autoclosingqfile.cpp => core/core_debug.h | 13 ++++----
core/daemon.cpp | 3 +-
core/device.cpp | 2 +-
core/filetransferjob.cpp | 6 ++--
core/kdebugnamespace.h | 39 ----------------------
core/kdeconnectplugin.cpp | 1 +
core/networkpackage.cpp | 2 ++
core/networkpackage.h | 1 -
core/pluginloader.cpp | 2 +-
kio/kiokdeconnect.cpp | 2 --
plugins/battery/batterydbusinterface.cpp | 1 -
plugins/ping/pingplugin.h | 2 +-
plugins/share/autoclosingqfile.h | 2 --
plugins/share/share_config.cpp | 2 --
18 files changed, 22 insertions(+), 64 deletions(-)
diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
index c2c9083..bdedbea 100644
--- a/core/backends/lan/landevicelink.cpp
+++ b/core/backends/lan/landevicelink.cpp
@@ -19,6 +19,7 @@
*/
#include "landevicelink.h"
+#include "core_debug.h"
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index a9644b2..f352aea 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -19,6 +19,7 @@
*/
#include "lanlinkprovider.h"
+#include "core_debug.h"
#include <sys/socket.h>
#include <netinet/in.h>
@@ -29,7 +30,6 @@
#include <QTcpServer>
#include <QUdpSocket>
-#include "../../kdebugnamespace.h"
#include "landevicelink.h"
void LanLinkProvider::configureSocket(QTcpSocket* socket)
@@ -151,7 +151,6 @@ void LanLinkProvider::connectError()
disconnect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError()));
disconnect(socket, SIGNAL(connected()), this, SLOT(connected()));
- qCDebug(KDECONNECT_CORE) << "Fallback (1), try reverse connection";
NetworkPackage np("");
NetworkPackage::createIdentityPackage(&np);
np.set("tcpPort", mTcpPort);
diff --git a/core/backends/lan/uploadjob.cpp b/core/backends/lan/uploadjob.cpp
index d5d3f08..8df673d 100644
--- a/core/backends/lan/uploadjob.cpp
+++ b/core/backends/lan/uploadjob.cpp
@@ -20,8 +20,8 @@
#include <qalgorithms.h>
-#include "kdebugnamespace.h"
#include "uploadjob.h"
+#include "core_debug.h"
UploadJob::UploadJob(const QSharedPointer<QIODevice>& source): KJob()
{
diff --git a/core/backends/loopback/loopbacklinkprovider.cpp b/core/backends/loopback/loopbacklinkprovider.cpp
index df793a6..cbfc6c6 100644
--- a/core/backends/loopback/loopbacklinkprovider.cpp
+++ b/core/backends/loopback/loopbacklinkprovider.cpp
@@ -20,7 +20,7 @@
#include "loopbacklinkprovider.h"
-#include "kdebugnamespace.h"
+#include "core_debug.h"
LoopbackLinkProvider::LoopbackLinkProvider()
: identityPackage(PACKAGE_TYPE_IDENTITY)
diff --git a/plugins/share/autoclosingqfile.cpp b/core/core_debug.h
similarity index 86%
copy from plugins/share/autoclosingqfile.cpp
copy to core/core_debug.h
index ef2aeea..33504de 100644
--- a/plugins/share/autoclosingqfile.cpp
+++ b/core/core_debug.h
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright 2013 Albert Vaca <albertvaka at gmail.com>
*
* This program is free software; you can redistribute it and/or
@@ -18,10 +18,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "autoclosingqfile.h"
+#ifndef CORE_DEBUG_H
+#define CORE_DEBUG_H
-AutoClosingQFile::AutoClosingQFile(const QString& name)
- : QFile(name)
-{
+#include <QLoggingCategory>
-}
+Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_CORE)
+
+#endif //CORE_DEBUG_H
\ No newline at end of file
diff --git a/core/daemon.cpp b/core/daemon.cpp
index e1d753e..614107d 100644
--- a/core/daemon.cpp
+++ b/core/daemon.cpp
@@ -32,7 +32,7 @@
#include <KConfigGroup>
#include <KStandardDirs>
-#include "kdebugnamespace.h"
+#include "core_debug.h"
#include "networkpackage.h"
#include "backends/lan/lanlinkprovider.h"
#include "backends/loopback/loopbacklinkprovider.h"
@@ -41,6 +41,7 @@
#include "backends/devicelink.h"
#include "backends/linkprovider.h"
+#include <QDebug>
struct DaemonPrivate
{
//Different ways to find devices and connect to them
diff --git a/core/device.cpp b/core/device.cpp
index d33720e..f427a9c 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -37,7 +37,7 @@
#include <KGlobal>
#include <KComponentData>
-#include "kdebugnamespace.h"
+#include "core_debug.h"
#include "kdeconnectplugin.h"
#include "pluginloader.h"
#include "backends/devicelink.h"
diff --git a/core/filetransferjob.cpp b/core/filetransferjob.cpp
index 555c61b..acb7d45 100644
--- a/core/filetransferjob.cpp
+++ b/core/filetransferjob.cpp
@@ -19,15 +19,15 @@
*/
#include "filetransferjob.h"
+#include <core_debug.h>
#include <qalgorithms.h>
#include <QFileInfo>
+#include <QDebug>
#include <KIO/RenameDialog>
#include <KLocalizedString>
-#include "kdebugnamespace.h"
-
FileTransferJob::FileTransferJob(const QSharedPointer<QIODevice>& origin, int size, const QUrl &destination): KJob()
{
Q_ASSERT(destination.isLocalFile());
@@ -105,7 +105,7 @@ void FileTransferJob::renameDone(int result)
break;
}
default:
- kWarning() << "Unknown Error";
+ qCWarning(KDECONNECT_CORE()) << "Unknown Error";
emitResult();
}
diff --git a/core/kdebugnamespace.h b/core/kdebugnamespace.h
deleted file mode 100644
index 09ab700..0000000
--- a/core/kdebugnamespace.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright 2013 Albert Vaca <albertvaka at gmail.com>
- * Copyright 2014 Alejandro Fiestas Olivares <afiestas at kde.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef QDEBUG_KDECONNECT_CORE_H
-#define QDEBUG_KDECONNECT_CORE_H
-
-#include <QLoggingCategory>
-
-Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_CORE)
-
-//Just until we port everything to qCDebug
-#include <KDebug>
-#include <kdemacros.h>
-
-inline int debugArea()
-{
- static int theArea = KDebug::registerArea("kdeconnect");
- return theArea;
-};
-#endif
-
diff --git a/core/kdeconnectplugin.cpp b/core/kdeconnectplugin.cpp
index 620550b..fd609ac 100644
--- a/core/kdeconnectplugin.cpp
+++ b/core/kdeconnectplugin.cpp
@@ -19,6 +19,7 @@
*/
#include "kdeconnectplugin.h"
+#include <QDebug>
struct KdeConnectPluginPrivate
{
diff --git a/core/networkpackage.cpp b/core/networkpackage.cpp
index f2cddf9..8bf50d2 100644
--- a/core/networkpackage.cpp
+++ b/core/networkpackage.cpp
@@ -19,6 +19,7 @@
*/
#include "networkpackage.h"
+#include "core_debug.h"
#include <KSharedConfig>
#include <KConfigGroup>
@@ -32,6 +33,7 @@
#include <QDateTime>
#include <qjsondocument.h>
#include <QtCrypto>
+#include <QDebug>
#include "filetransferjob.h"
diff --git a/core/networkpackage.h b/core/networkpackage.h
index 550ef9d..dec0111 100644
--- a/core/networkpackage.h
+++ b/core/networkpackage.h
@@ -33,7 +33,6 @@
#include <QUrl>
#include "kdeconnectcore_export.h"
-#include "kdebugnamespace.h"
#include "default_args.h"
class FileTransferJob;
diff --git a/core/pluginloader.cpp b/core/pluginloader.cpp
index ce65c5a..b374ac7 100644
--- a/core/pluginloader.cpp
+++ b/core/pluginloader.cpp
@@ -22,7 +22,7 @@
#include <KServiceTypeTrader>
-#include "kdebugnamespace.h"
+#include "core_debug.h"
#include "device.h"
#include "kdeconnectplugin.h"
diff --git a/kio/kiokdeconnect.cpp b/kio/kiokdeconnect.cpp
index d803a53..91eb704 100644
--- a/kio/kiokdeconnect.cpp
+++ b/kio/kiokdeconnect.cpp
@@ -33,8 +33,6 @@
#include <k4aboutdata.h>
#include <kdemacros.h>
-#include <core/kdebugnamespace.h>
-
Q_LOGGING_CATEGORY(KDECONNECT_KIO, "kdeconnect.kio")
extern "C" int KDE_EXPORT kdemain(int argc, char **argv)
diff --git a/plugins/battery/batterydbusinterface.cpp b/plugins/battery/batterydbusinterface.cpp
index 249eb59..7602585 100644
--- a/plugins/battery/batterydbusinterface.cpp
+++ b/plugins/battery/batterydbusinterface.cpp
@@ -23,7 +23,6 @@
#include <QDebug>
#include <core/device.h>
-#include <core/kdebugnamespace.h>
BatteryDbusInterface::BatteryDbusInterface(const Device *device)
: QDBusAbstractAdaptor(const_cast<Device*>(device))
diff --git a/plugins/ping/pingplugin.h b/plugins/ping/pingplugin.h
index 82fd759..54b17d6 100644
--- a/plugins/ping/pingplugin.h
+++ b/plugins/ping/pingplugin.h
@@ -28,7 +28,7 @@
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_PING)
-class KDE_EXPORT PingPlugin
+class Q_DECL_EXPORT PingPlugin
: public KdeConnectPlugin
{
Q_OBJECT
diff --git a/plugins/share/autoclosingqfile.h b/plugins/share/autoclosingqfile.h
index c9673d8..54dea83 100644
--- a/plugins/share/autoclosingqfile.h
+++ b/plugins/share/autoclosingqfile.h
@@ -23,8 +23,6 @@
#include <QFile>
-#include <core/kdebugnamespace.h>
-
class AutoClosingQFile : public QFile
{
Q_OBJECT
diff --git a/plugins/share/share_config.cpp b/plugins/share/share_config.cpp
index 3805fc9..ee06f40 100644
--- a/plugins/share/share_config.cpp
+++ b/plugins/share/share_config.cpp
@@ -27,8 +27,6 @@
#include <KUrlRequester>
#include <KAboutData>
-#include <core/kdebugnamespace.h>
-
#include "ui_share_config.h"
K_PLUGIN_FACTORY(ShareConfigFactory, registerPlugin<ShareConfig>();)
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list