[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=6deec34

The following commit has been merged in the master branch:
commit 6deec3429af0d41f50c2526f10c45eec5b4d26a5
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sat Oct 17 15:32:13 2015 -0700

    Use id instead of a pointer in the dismissRequested signal and slot.
    
    Also changed connection to the Qt5 way.
---
 plugins/notifications/notification.cpp               | 4 ++--
 plugins/notifications/notification.h                 | 6 +++---
 plugins/notifications/notificationsdbusinterface.cpp | 8 +++-----
 plugins/notifications/notificationsdbusinterface.h   | 2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/plugins/notifications/notification.cpp b/plugins/notifications/notification.cpp
index b44b5f8..3e42f2a 100644
--- a/plugins/notifications/notification.cpp
+++ b/plugins/notifications/notification.cpp
@@ -25,7 +25,7 @@
 Notification::Notification(const NetworkPackage& np, const QString& iconPath, QObject* parent)
     : QObject(parent)
 {
-    mId = np.get<QString>("id");
+    mInternalId = np.get<QString>("id");
     mAppName = np.get<QString>("appName");
     mTicker = np.get<QString>("ticker");
     mDismissable = np.get<bool>("isClearable");
@@ -40,7 +40,7 @@ Notification::~Notification()
 void Notification::dismiss()
 {
     if (mDismissable) {
-        Q_EMIT dismissRequested(this);
+        Q_EMIT dismissRequested(mInternalId);
     }
 }
 
diff --git a/plugins/notifications/notification.h b/plugins/notifications/notification.h
index 3c14d26..dcf09a7 100644
--- a/plugins/notifications/notification.h
+++ b/plugins/notifications/notification.h
@@ -41,7 +41,7 @@ public:
     Notification(const NetworkPackage& np, const QString& iconPath, QObject* parent);
     virtual ~Notification();
 
-    QString internalId() const { return mId; }
+    QString internalId() const { return mInternalId; }
     QString appName() const { return mAppName; }
     QString ticker() const { return mTicker; }
     QString iconPath() const { return mIconPath; }
@@ -51,10 +51,10 @@ public Q_SLOTS:
     Q_SCRIPTABLE void dismiss();
 
 Q_SIGNALS:
-    void dismissRequested(Notification* self);
+    void dismissRequested(const QString& mInternalId);
 
 private:
-    QString mId;
+    QString mInternalId;
     QString mAppName;
     QString mTicker;
     QString mIconPath;
diff --git a/plugins/notifications/notificationsdbusinterface.cpp b/plugins/notifications/notificationsdbusinterface.cpp
index e7b89f2..3c504c6 100644
--- a/plugins/notifications/notificationsdbusinterface.cpp
+++ b/plugins/notifications/notificationsdbusinterface.cpp
@@ -98,8 +98,8 @@ void NotificationsDbusInterface::addNotification(Notification* noti)
         removeNotification(internalId);
     }
 
-    connect(noti, SIGNAL(dismissRequested(Notification*)),
-            this, SLOT(dismissRequested(Notification*)));
+    connect(noti, &Notification::dismissRequested,
+            this, &NotificationsDbusInterface::dismissRequested);
 
     const QString& publicId = newId();
     mNotifications[publicId] = noti;
@@ -133,10 +133,8 @@ void NotificationsDbusInterface::removeNotification(const QString& internalId)
     Q_EMIT notificationRemoved(publicId);
 }
 
-void NotificationsDbusInterface::dismissRequested(Notification* notification)
+void NotificationsDbusInterface::dismissRequested(const QString& internalId)
 {
-    const QString& internalId = notification->internalId();
-
     NetworkPackage np(PACKAGE_TYPE_NOTIFICATION);
     np.set<QString>("cancel", internalId);
     mPlugin->sendPackage(np);
diff --git a/plugins/notifications/notificationsdbusinterface.h b/plugins/notifications/notificationsdbusinterface.h
index 127d562..21d5a6a 100644
--- a/plugins/notifications/notificationsdbusinterface.h
+++ b/plugins/notifications/notificationsdbusinterface.h
@@ -44,7 +44,7 @@ public:
 
     void processPackage(const NetworkPackage& np);
     void clearNotifications();
-    void dismissRequested(Notification* notification);
+    void dismissRequested(const QString& notification);
 
 public Q_SLOTS:
     Q_SCRIPTABLE QStringList activeNotifications();

-- 
kdeconnect packaging