[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=73db3eb

The following commit has been merged in the master branch:
commit 73db3eb694ec5bee6c7568d3ab7710a14e49e808
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Mon Sep 22 00:45:06 2014 +0200

    Port Notifications from kDebug to qCDebug
---
 plugins/notifications/notification.cpp                      |  2 --
 .../notifications/notification_debug.h                      | 13 +++++++------
 plugins/notifications/notificationsdbusinterface.cpp        |  8 ++++----
 plugins/notifications/notificationsplugin.cpp               |  4 +++-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugins/notifications/notification.cpp b/plugins/notifications/notification.cpp
index 3c15d47..5b38a77 100644
--- a/plugins/notifications/notification.cpp
+++ b/plugins/notifications/notification.cpp
@@ -22,8 +22,6 @@
 
 #include <QDBusConnection>
 
-#include <core/kdebugnamespace.h>
-
 Notification::Notification(const NetworkPackage& np, const QString& iconPath, QObject* parent)
     : QObject(parent)
 {
diff --git a/core/backends/linkprovider.cpp b/plugins/notifications/notification_debug.h
similarity index 78%
copy from core/backends/linkprovider.cpp
copy to plugins/notifications/notification_debug.h
index 1d6c0bf..09da52f 100644
--- a/core/backends/linkprovider.cpp
+++ b/plugins/notifications/notification_debug.h
@@ -1,5 +1,5 @@
 /**
- * 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
@@ -18,10 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "linkprovider.h"
+#ifndef NOTIFICATION_DEBUG_H
+#define NOTIFICATION_DEBUG_H
 
-LinkProvider::LinkProvider()
-{
-    //gcc complains if we don't add something to compile on a class with virtual functions
-}
+#include <QLoggingCategory>
 
+Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_NOTIFICATION)
+
+#endif //NOTIFICATION_DEBUG_H
\ No newline at end of file
diff --git a/plugins/notifications/notificationsdbusinterface.cpp b/plugins/notifications/notificationsdbusinterface.cpp
index 7c4b08a..b52b397 100644
--- a/plugins/notifications/notificationsdbusinterface.cpp
+++ b/plugins/notifications/notificationsdbusinterface.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "notificationsdbusinterface.h"
+#include "notification_debug.h"
 
 #include <QDBusConnection>
 
@@ -28,7 +29,6 @@
 
 #include <core/device.h>
 #include <core/kdeconnectplugin.h>
-#include <core/kdebugnamespace.h>
 #include <core/filetransferjob.h>
 
 #include "notificationsplugin.h"
@@ -109,10 +109,10 @@ void NotificationsDbusInterface::addNotification(Notification* noti)
 
 void NotificationsDbusInterface::removeNotification(const QString& internalId)
 {
-    kDebug(debugArea()) << "removeNotification" << internalId;
+    qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "removeNotification" << internalId;
 
     if (!mInternalIdToPublicId.contains(internalId)) {
-        kDebug(debugArea()) << "Not found";
+        qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Not found";
         return;
     }
 
@@ -120,7 +120,7 @@ void NotificationsDbusInterface::removeNotification(const QString& internalId)
 
     Notification* noti = mNotifications.take(publicId);
     if (!noti) {
-        kDebug(debugArea()) << "Not found";
+        qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Not found";
         return;
     }
 
diff --git a/plugins/notifications/notificationsplugin.cpp b/plugins/notifications/notificationsplugin.cpp
index 277f54a..9c0ab63 100644
--- a/plugins/notifications/notificationsplugin.cpp
+++ b/plugins/notifications/notificationsplugin.cpp
@@ -20,12 +20,14 @@
 
 #include "notificationsplugin.h"
 
-#include <core/kdebugnamespace.h>
 #include "notificationsdbusinterface.h"
+#include "notification_debug.h"
 
 K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< NotificationsPlugin >(); )
 K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_notifications", "kdeconnect-plugins") )
 
+Q_LOGGING_CATEGORY(KDECONNECT_PLUGIN_NOTIFICATION, "kdeconnect.plugin.notification")
+
 NotificationsPlugin::NotificationsPlugin(QObject* parent, const QVariantList& args)
     : KdeConnectPlugin(parent, args)
 {

-- 
kdeconnect packaging