[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:47 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=3147067
The following commit has been merged in the master branch:
commit 3147067fbf23641b3d9bc659f685562981c73bee
Author: Albert Vaca <albertvaka at gmail.com>
Date: Tue Jul 1 01:23:21 2014 +0200
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.
---
plugins/battery/batterydbusinterface.cpp | 5 +++--
plugins/battery/batterydbusinterface.h | 4 +++-
plugins/battery/batteryplugin.cpp | 2 +-
plugins/notifications/notificationsdbusinterface.cpp | 6 +++++-
plugins/notifications/notificationsdbusinterface.h | 4 +++-
5 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/plugins/battery/batterydbusinterface.cpp b/plugins/battery/batterydbusinterface.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/batterydbusinterface.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/batteryplugin.cpp
index 7b677c2..975ebae 100644
--- a/plugins/battery/batteryplugin.cpp
+++ b/plugins/battery/batteryplugin.cpp
@@ -32,7 +32,7 @@ K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_battery", "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* plugin)
- : 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/notifications/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
{
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list