[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdeconnect-kde] plugins: Fixed notifications not being appearing in the model nor in the plasmoid
From:       Albert Vaca <albertvaka () gmail ! com>
Date:       2014-06-30 23:26:16
Message-ID: E1X1kxk-0007lL-QW () scm ! kde ! org
[Download RAW message or body]

Git commit 3147067fbf23641b3d9bc659f685562981c73bee by Albert Vaca.
Committed on 30/06/2014 at 23:23.
Pushed by albertvaka into branch 'master'.

Fixed notifications not being appearing in the model nor in the plasmoid

The parent of the QDbusAdaptor has to be a Device, and now it was a
KdeConnectPlugin for the Notifications plugin.

Instead of passing the parent (that is actually a Device) to the
QDbusAdaptor as we were doing in the Battery plugin, I preferred to get the
actual Device from the KdeConnectPlugin, even though it needs a const_cast.

M  +3    -2    plugins/battery/batterydbusinterface.cpp
M  +3    -1    plugins/battery/batterydbusinterface.h
M  +1    -1    plugins/battery/batteryplugin.cpp
M  +5    -1    plugins/notifications/notificationsdbusinterface.cpp
M  +3    -1    plugins/notifications/notificationsdbusinterface.h

http://commits.kde.org/kdeconnect-kde/3147067fbf23641b3d9bc659f685562981c73=
bee

diff --git a/plugins/battery/batterydbusinterface.cpp b/plugins/battery/bat=
terydbusinterface.cpp
index 5960da8..ea550fb 100644
--- a/plugins/battery/batterydbusinterface.cpp
+++ b/plugins/battery/batterydbusinterface.cpp
@@ -20,10 +20,11 @@
 =

 #include "batterydbusinterface.h"
 =

+#include <core/device.h>
 #include <core/kdebugnamespace.h>
 =

-BatteryDbusInterface::BatteryDbusInterface(QObject *parent)
-    : QDBusAbstractAdaptor(parent)
+BatteryDbusInterface::BatteryDbusInterface(const Device *device)
+    : QDBusAbstractAdaptor(const_cast<Device*>(device))
 {
 }
 =

diff --git a/plugins/battery/batterydbusinterface.h b/plugins/battery/batte=
rydbusinterface.h
index 2fef9f6..b444ae2 100644
--- a/plugins/battery/batterydbusinterface.h
+++ b/plugins/battery/batterydbusinterface.h
@@ -23,6 +23,8 @@
 =

 #include <QDBusAbstractAdaptor>
 =

+class Device;
+
 class BatteryDbusInterface
     : public QDBusAbstractAdaptor
 {
@@ -30,7 +32,7 @@ class BatteryDbusInterface
     Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.device.battery")
 =

 public:
-    explicit BatteryDbusInterface(QObject *parent);
+    explicit BatteryDbusInterface(const Device *device);
     virtual ~BatteryDbusInterface();
     =

     Q_SCRIPTABLE int charge() const { return mCharge; }
diff --git a/plugins/battery/batteryplugin.cpp b/plugins/battery/batteryplu=
gin.cpp
index 7b677c2..975ebae 100644
--- a/plugins/battery/batteryplugin.cpp
+++ b/plugins/battery/batteryplugin.cpp
@@ -32,7 +32,7 @@ K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_batt=
ery", "kdeconnect-plugi
 =

 BatteryPlugin::BatteryPlugin(QObject *parent, const QVariantList &args)
     : KdeConnectPlugin(parent, args)
-    , batteryDbusInterface(new BatteryDbusInterface(parent))
+    , batteryDbusInterface(new BatteryDbusInterface(device()))
 {
 =

     //TODO: Add battery reporting, could be based on:
diff --git a/plugins/notifications/notificationsdbusinterface.cpp b/plugins=
/notifications/notificationsdbusinterface.cpp
index 75172b2..412640d 100644
--- a/plugins/notifications/notificationsdbusinterface.cpp
+++ b/plugins/notifications/notificationsdbusinterface.cpp
@@ -26,18 +26,22 @@
 #include <KIcon>
 #include <KMD5>
 =

+#include <core/device.h>
+#include <core/kdeconnectplugin.h>
 #include <core/kdebugnamespace.h>
 #include <core/filetransferjob.h>
+
 #include "notificationsplugin.h"
 =

 NotificationsDbusInterface::NotificationsDbusInterface(KdeConnectPlugin* p=
lugin)
-    : QDBusAbstractAdaptor(plugin)
+    : QDBusAbstractAdaptor(const_cast<Device*>(plugin->device()))
     , mDevice(plugin->device())
     , mPlugin(plugin)
     , mLastId(0)
     , imagesDir(QDir::temp().absoluteFilePath("kdeconnect"))
 {
     imagesDir.mkpath(imagesDir.absolutePath());
+
 }
 =

 NotificationsDbusInterface::~NotificationsDbusInterface()
diff --git a/plugins/notifications/notificationsdbusinterface.h b/plugins/n=
otifications/notificationsdbusinterface.h
index acd6736..5c1244e 100644
--- a/plugins/notifications/notificationsdbusinterface.h
+++ b/plugins/notifications/notificationsdbusinterface.h
@@ -27,9 +27,11 @@
 #include <QStringList>
 #include <QDir>
 =

-#include <core/device.h>
 #include "notification.h"
 =

+class KdeConnectPlugin;
+class Device;
+
 class NotificationsDbusInterface
     : public QDBusAbstractAdaptor
 {

[prev in list] [next in list] [prev in thread] [next in thread]