[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:26:41 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=43932a4

The following commit has been merged in the master branch:
commit 43932a4300761b8b7554972d4c13f4012daa9403
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Fri Jul 26 16:21:19 2013 +0200

    Added battery reporting via dbus interface
---
 daemon/CMakeLists.txt                              | 30 ++++++++-----
 daemon/daemon.cpp                                  |  3 +-
 daemon/daemon.h                                    |  2 +-
 daemon/device.cpp                                  | 11 +++--
 daemon/device.h                                    | 11 +++--
 daemon/devicelinks/tcpdevicelink.cpp               | 14 +++---
 daemon/linkproviders/linkprovider.cpp              |  3 +-
 daemon/networkpackage.cpp                          |  4 +-
 daemon/networkpackagetypes.h                       |  1 +
 ...geinterface.cpp => batterypackageinterface.cpp} | 38 +++++++++++-----
 ...ackageinterface.h => batterypackageinterface.h} | 12 ++---
 .../clipboardpackageinterface.cpp                  |  3 +-
 .../devicebatteryinformation_p.cpp}                | 10 +++--
 .../packageinterfaces/devicebatteryinformation_p.h | 52 ++++++++--------------
 .../notificationpackageinterface.cpp               |  6 ++-
 daemon/packageinterfaces/packageinterface.cpp      |  3 +-
 daemon/packageinterfaces/pingpackageinterface.cpp  |  3 +-
 kcm/CMakeLists.txt                                 |  1 +
 kcm/dbusinterfaces.cpp                             |  4 +-
 kcm/dbusinterfaces.h                               | 10 ++++-
 20 files changed, 131 insertions(+), 90 deletions(-)

diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index 007dea5..ce393c1 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -13,6 +13,8 @@ set(kded_kdeconnect_SRCS
     packageinterfaces/notificationpackageinterface.cpp
     packageinterfaces/pausemusicpackageinterface.cpp
     packageinterfaces/clipboardpackageinterface.cpp
+    packageinterfaces/batterypackageinterface.cpp
+    packageinterfaces/devicebatteryinformation_p.cpp
 
     networkpackage.cpp
     daemon.cpp
@@ -31,30 +33,34 @@ target_link_libraries(kded_kdeconnect
     ${QJSON_LIBRARY}
 )
 
-qt4_generate_dbus_interface(
+macro (generate_and_install_dbus_interface project_main_target header_file output_xml_file) #OPTIONS qdbus_options
+    QT4_EXTRACT_OPTIONS(extra_files_ignore qdbus_options ${ARGN})
+    qt4_generate_dbus_interface(${header_file} ${output_xml_file} OPTIONS ${qdbus_options})
+    add_dependencies(${project_main_target} ${output_xml_file})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file} DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
+endmacro (generate_and_install_dbus_interface)
+
+generate_and_install_dbus_interface(
+    kded_kdeconnect
     daemon.h
     org.kde.kdeconnect.xml
     OPTIONS -a
 )
 
-qt4_generate_dbus_interface(
+generate_and_install_dbus_interface(
+    kded_kdeconnect
     device.h
     org.kde.kdeconnect.device.xml
     OPTIONS -a
 )
 
-add_custom_target(
-    org.kde.kdeconnect.xml
-    SOURCES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.xml
-)
-
-add_custom_target(
-    org.kde.kdeconnect.device.xml
-    SOURCES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.device.xml
+generate_and_install_dbus_interface(
+    kded_kdeconnect
+    packageinterfaces/devicebatteryinformation_p.h
+    org.kde.kdeconnect.device.battery.xml
+    OPTIONS -a
 )
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.device.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
 install(TARGETS kded_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
 install(FILES kdeconnect.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kdeconnect)
diff --git a/daemon/daemon.cpp b/daemon/daemon.cpp
index fcb7c47..01171c8 100644
--- a/daemon/daemon.cpp
+++ b/daemon/daemon.cpp
@@ -26,6 +26,7 @@
 #include "packageinterfaces/notificationpackageinterface.h"
 #include "packageinterfaces/pausemusicpackageinterface.h"
 #include "packageinterfaces/clipboardpackageinterface.h"
+#include "packageinterfaces/batterypackageinterface.h"
 
 #include "linkproviders/avahitcplinkprovider.h"
 #include "linkproviders/loopbacklinkprovider.h"
@@ -56,7 +57,6 @@ Daemon::Daemon(QObject *parent, const QList<QVariant>&)
 
     //Debugging
     qDebug() << "Starting KdeConnect daemon";
-    config->group("devices").group("paired").group("fake_unreachable").writeEntry("name","Fake device");
 
     //TODO: Do not hardcode the load of the package interfaces
     //use: https://techbase.kde.org/Development/Tutorials/Services/Plugins
@@ -64,6 +64,7 @@ Daemon::Daemon(QObject *parent, const QList<QVariant>&)
     mPackageInterfaces.push_back(new NotificationPackageInterface());
     mPackageInterfaces.push_back(new PauseMusicPackageInterface());
     mPackageInterfaces.push_back(new ClipboardPackageInterface());
+    mPackageInterfaces.push_back(new BatteryPackageInterface());
 
     //TODO: Do not hardcode the load of the device locators
     //use: https://techbase.kde.org/Development/Tutorials/Services/Plugins
diff --git a/daemon/daemon.h b/daemon/daemon.h
index ab1d4e9..9228e2e 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -49,7 +49,7 @@ class Daemon
     : public KDEDModule
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "kdeconnect.daemon")
+    Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.daemon")
 
 public:
     Daemon(QObject *parent, const QList<QVariant>&);
diff --git a/daemon/device.cpp b/daemon/device.cpp
index 08241e4..e158dbf 100644
--- a/daemon/device.cpp
+++ b/daemon/device.cpp
@@ -3,7 +3,7 @@
 #include <ksharedconfig.h>
 #include "devicelinks/devicelink.h"
 #include "linkproviders/linkprovider.h"
-
+#include "packageinterfaces/devicebatteryinformation_p.h"
 #include <KConfigGroup>
 #include <QDebug>
 
@@ -13,7 +13,10 @@ Device::Device(const QString& id, const QString& name)
     m_deviceName = name;
     m_paired = true;
     m_knownIdentiy = true;
-    QDBusConnection::sessionBus().registerObject("/modules/kdeconnect/Devices/"+id, this, QDBusConnection::ExportScriptableContents);
+
+    //Register in bus
+    QDBusConnection::sessionBus().registerObject("/modules/kdeconnect/devices/"+id, this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
+
 }
 
 Device::Device(const QString& id, const QString& name, DeviceLink* link)
@@ -22,7 +25,9 @@ Device::Device(const QString& id, const QString& name, DeviceLink* link)
     m_deviceName = name;
     m_paired = false;
     m_knownIdentiy = true;
-    QDBusConnection::sessionBus().registerObject("/modules/kdeconnect/Devices/"+id, this, QDBusConnection::ExportScriptableContents);
+
+    //Register in bus
+    QDBusConnection::sessionBus().registerObject("/modules/kdeconnect/devices/"+id, this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
 
     addLink(link);
 }
diff --git a/daemon/device.h b/daemon/device.h
index 7bc0441..a0f279c 100644
--- a/daemon/device.h
+++ b/daemon/device.h
@@ -32,7 +32,9 @@ class DeviceLink;
 class Device : public QObject
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "kdeconnect.device")
+    Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.device")
+    Q_PROPERTY(QString id READ id)
+    Q_PROPERTY(QString name READ name)
 
 public:
 
@@ -46,6 +48,9 @@ public:
     //(not supported yet, do we need it or we can rely on the device presenging itself?)
     //Device(const QString& id, DeviceLink* dl);
 
+    QString id() const{ return m_deviceId; }
+    QString name() const { return m_deviceName; }
+
     //Add and remove links
     void addLink(DeviceLink*);
     void removeLink(DeviceLink*);
@@ -56,10 +61,8 @@ Q_SIGNALS:
 public Q_SLOTS:
     bool sendPackage(const NetworkPackage& np);
 
-    //Public dbus interface
+    //Public dbus operations
 public Q_SLOTS:
-    Q_SCRIPTABLE QString id() const{ return m_deviceId; }
-    Q_SCRIPTABLE QString name() const { return m_deviceName; }
     Q_SCRIPTABLE QStringList availableLinks() const;
     Q_SCRIPTABLE bool paired() const { return m_paired; }
     Q_SCRIPTABLE bool reachable() const { return !m_deviceLinks.empty(); }
diff --git a/daemon/devicelinks/tcpdevicelink.cpp b/daemon/devicelinks/tcpdevicelink.cpp
index 7bfaf38..bc357d0 100644
--- a/daemon/devicelinks/tcpdevicelink.cpp
+++ b/daemon/devicelinks/tcpdevicelink.cpp
@@ -39,12 +39,16 @@ void TcpDeviceLink::dataReceived()
 {
     qDebug() << "TcpDeviceLink dataReceived";
 
-    QByteArray a = mSocket->readAll();
+    QByteArray data = mSocket->readAll();
+    QList<QByteArray> packages = data.split('
');
+    Q_FOREACH(const QByteArray& package, packages) {
 
-    qDebug() << a;
+        if (package.length() < 3) continue;
 
-    NetworkPackage np;
-    NetworkPackage::unserialize(a,&np);
+        NetworkPackage np;
+        NetworkPackage::unserialize(package,&np);
 
-    emit receivedPackage(np);
+        emit receivedPackage(np);
+
+    }
 }
diff --git a/daemon/linkproviders/linkprovider.cpp b/daemon/linkproviders/linkprovider.cpp
index 7fce173..2ca4dba 100644
--- a/daemon/linkproviders/linkprovider.cpp
+++ b/daemon/linkproviders/linkprovider.cpp
@@ -20,6 +20,7 @@
 
 #include "linkprovider.h"
 
-LinkProvider::LinkProvider() {
+LinkProvider::LinkProvider()
+{
     //gcc complains if we don't add something to compile on a class with virtual functions
 }
\ No newline at end of file
diff --git a/daemon/networkpackage.cpp b/daemon/networkpackage.cpp
index 255ef36..4fea230 100644
--- a/daemon/networkpackage.cpp
+++ b/daemon/networkpackage.cpp
@@ -23,7 +23,6 @@
 #include <kconfiggroup.h>
 #include <qbytearray.h>
 #include <qdatastream.h>
-#include <KDebug>
 #include <QHostInfo>
 #include <sstream>
 #include <string>
@@ -66,7 +65,8 @@ QByteArray NetworkPackage::serialize() const
 
 void NetworkPackage::unserialize(QByteArray a, NetworkPackage* np)
 {
-    kDebug() << a;
+    qDebug() << "Unserialize:" << a;
+    
     //Json -> QVariant
     QJson::Parser parser;
     bool ok;
diff --git a/daemon/networkpackagetypes.h b/daemon/networkpackagetypes.h
index b5d6338..981139f 100644
--- a/daemon/networkpackagetypes.h
+++ b/daemon/networkpackagetypes.h
@@ -24,6 +24,7 @@
 #define PACKAGE_TYPE_IDENTITY QString("kdeconnect.identity")
 #define PACKAGE_TYPE_PING QString("kdeconnect.ping")
 #define PACKAGE_TYPE_NOTIFICATION QString("kdeconnect.notification")
+#define PACKAGE_TYPE_BATTERY QString("kdeconnect.battery")
 #define PACKAGE_TYPE_CALL QString("kdeconnect.call")
 #define PACKAGE_TYPE_CLIPBOARD QString("kdeconnect.clipboard")
 
diff --git a/daemon/packageinterfaces/pingpackageinterface.cpp b/daemon/packageinterfaces/batterypackageinterface.cpp
similarity index 54%
copy from daemon/packageinterfaces/pingpackageinterface.cpp
copy to daemon/packageinterfaces/batterypackageinterface.cpp
index b81ebd0..ec4a1a5 100644
--- a/daemon/packageinterfaces/pingpackageinterface.cpp
+++ b/daemon/packageinterfaces/batterypackageinterface.cpp
@@ -18,21 +18,39 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pingpackageinterface.h"
+#include "batterypackageinterface.h"
 
-#include <KDebug>
+#include <QDebug>
 #include <kicon.h>
 
-bool PingPackageInterface::receivePackage(const Device& device, const NetworkPackage& np) {
 
-    if (np.type() != PACKAGE_TYPE_PING) return false;
+BatteryPackageInterface::BatteryPackageInterface()
+{
+    //TODO: Get initial state of all devices
+}
+
+bool BatteryPackageInterface::receivePackage(const Device& device, const NetworkPackage& np)
+{
+    if (np.type() != PACKAGE_TYPE_BATTERY) return false;
+
+    QString id = device.id();
+
+    if (!devices.contains(id)) {
+
+        //TODO: Avoid ugly const_cast
+        DeviceBatteryInformation* deviceInfo = new DeviceBatteryInformation(const_cast<Device*>(&device));
+
+        devices[id] = deviceInfo;
+
+        qDebug() << "Added battery info to device" << id;
+
+    }
+
+    bool isCharging = np.get<bool>("isCharging");
+    devices[id]->setCharging(isCharging);
 
-    KNotification* notification = new KNotification("pingReceived"); //KNotification::Persistent
-    notification->setPixmap(KIcon("dialog-ok").pixmap(48, 48));
-    notification->setComponentData(KComponentData("kdeconnect", "kdeconnect"));
-    notification->setTitle("Ping!");
-    notification->setText(device.name());
-    notification->sendEvent();
+    int currentCharge = np.get<int>("currentCharge");
+    devices[id]->setCharge(currentCharge);
 
     return true;
 
diff --git a/daemon/packageinterfaces/notificationpackageinterface.h b/daemon/packageinterfaces/batterypackageinterface.h
similarity index 83%
copy from daemon/packageinterfaces/notificationpackageinterface.h
copy to daemon/packageinterfaces/batterypackageinterface.h
index dae8749..f2d5afe 100644
--- a/daemon/packageinterfaces/notificationpackageinterface.h
+++ b/daemon/packageinterfaces/batterypackageinterface.h
@@ -18,23 +18,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NOTIFICATIONPACKAGEINTERFACE_H
-#define NOTIFICATIONPACKAGEINTERFACE_H
+#ifndef BATTERYPACKAGEINTERFACE_H
+#define BATTERYPACKAGEINTERFACE_H
 
 #include <knotification.h>
 
 #include "packageinterface.h"
 
-class NotificationPackageInterface
+#include "devicebatteryinformation_p.h"
+
+class BatteryPackageInterface
     : public PackageInterface
 {
 
 public:
+    BatteryPackageInterface();
     virtual bool receivePackage(const Device&, const NetworkPackage& np);
 
 private:
-    static KNotification* createNotification(const QString& deviceName,const NetworkPackage& np);
-
+    QHash<QString,DeviceBatteryInformation*> devices;
 
 };
 
diff --git a/daemon/packageinterfaces/clipboardpackageinterface.cpp b/daemon/packageinterfaces/clipboardpackageinterface.cpp
index 201fa9e..1454bf8 100644
--- a/daemon/packageinterfaces/clipboardpackageinterface.cpp
+++ b/daemon/packageinterfaces/clipboardpackageinterface.cpp
@@ -24,7 +24,8 @@
 #include <KDebug>
 #include <QApplication>
 
-ClipboardPackageInterface::ClipboardPackageInterface() {
+ClipboardPackageInterface::ClipboardPackageInterface()
+{
     clipboard = QApplication::clipboard();
     ignore_next_clipboard_change = false;
     connect(clipboard,SIGNAL(changed(QClipboard::Mode)),this,SLOT(clipboardChanged(QClipboard::Mode)));
diff --git a/daemon/linkproviders/linkprovider.cpp b/daemon/packageinterfaces/devicebatteryinformation_p.cpp
similarity index 85%
copy from daemon/linkproviders/linkprovider.cpp
copy to daemon/packageinterfaces/devicebatteryinformation_p.cpp
index 7fce173..647746f 100644
--- a/daemon/linkproviders/linkprovider.cpp
+++ b/daemon/packageinterfaces/devicebatteryinformation_p.cpp
@@ -18,8 +18,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "linkprovider.h"
+#include "devicebatteryinformation_p.h"
 
-LinkProvider::LinkProvider() {
-    //gcc complains if we don't add something to compile on a class with virtual functions
-}
\ No newline at end of file
+DeviceBatteryInformation::DeviceBatteryInformation(QObject* parent)
+    : QDBusAbstractAdaptor(parent)
+{
+
+}
diff --git a/kcm/wizard.h b/daemon/packageinterfaces/devicebatteryinformation_p.h
similarity index 57%
copy from kcm/wizard.h
copy to daemon/packageinterfaces/devicebatteryinformation_p.h
index 6f559aa..1b2bda1 100644
--- a/kcm/wizard.h
+++ b/daemon/packageinterfaces/devicebatteryinformation_p.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,49 +18,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WIZARD_H
-#define WIZARD_H
+#ifndef DEVICEBATTERYINFORMATION_H
+#define DEVICEBATTERYINFORMATION_H
 
-#include <QWizard>
 #include <QObject>
+#include <QDBusAbstractAdaptor>
 
-#include "dbusinterfaces.h"
-#include "devicesmodel.h"
-
-namespace Ui {
-    class Wizard;
-}
-
-class QStandardItemModel;
-
-class AddDeviceWizard : public QWizard
+class DeviceBatteryInformation
+    : public QDBusAbstractAdaptor
 {
     Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.battery")
+    Q_PROPERTY( int charge READ charge )
+    Q_PROPERTY( bool isCharging READ isCharging NOTIFY chargingChange )
 
 public:
-    AddDeviceWizard(QWidget* parent);
-    ~AddDeviceWizard();
-    void show();
-    void restart();
+    DeviceBatteryInformation(QObject* parent = 0);
 
-private Q_SLOTS:
-    void pageChanged(int id);
-    
-    void deviceDiscovered(QString id, QString name);
-    //void deviceLost(QString id);
+    int charge() { return mCharge; }
+    void setCharge(int charge) { mCharge = charge; }
+    bool isCharging() { return mIsCharging; }
+    void setCharging(bool isCharging) { mIsCharging = isCharging; }
 
-    void deviceSelected(const QModelIndex& index);
-
-    void wizardFinished();
+private:
+    bool mIsCharging;
+    int mCharge;
 
 Q_SIGNALS:
-    void deviceAdded(QString id, QString name);
+    Q_SCRIPTABLE void chargingChange(bool charging);
 
-private:
-    Ui::Wizard* wizardUi;
-    DaemonDbusInterface* dbusInterface;
-    DevicesModel* discoveredDevicesList;
-    QModelIndex selectedIndex;
 };
 
-#endif // WIZARD_H
+#endif //DEVICEBATTERYINFORMATION_H
\ No newline at end of file
diff --git a/daemon/packageinterfaces/notificationpackageinterface.cpp b/daemon/packageinterfaces/notificationpackageinterface.cpp
index c3130fa..e0a001b 100644
--- a/daemon/packageinterfaces/notificationpackageinterface.cpp
+++ b/daemon/packageinterfaces/notificationpackageinterface.cpp
@@ -23,7 +23,8 @@
 #include <QDebug>
 #include <kicon.h>
 
-KNotification* NotificationPackageInterface::createNotification(const QString& deviceName, const NetworkPackage& np) {
+KNotification* NotificationPackageInterface::createNotification(const QString& deviceName, const NetworkPackage& np)
+{
 
     QString npType = np.get<QString>("notificationType");
 
@@ -71,7 +72,8 @@ KNotification* NotificationPackageInterface::createNotification(const QString& d
 
 }
 
-bool NotificationPackageInterface::receivePackage(const Device& device, const NetworkPackage& np) {
+bool NotificationPackageInterface::receivePackage(const Device& device, const NetworkPackage& np)
+{
 
     if (np.type() != PACKAGE_TYPE_NOTIFICATION) return false;
 
diff --git a/daemon/packageinterfaces/packageinterface.cpp b/daemon/packageinterfaces/packageinterface.cpp
index 18a3431..d1f75cb 100644
--- a/daemon/packageinterfaces/packageinterface.cpp
+++ b/daemon/packageinterfaces/packageinterface.cpp
@@ -20,6 +20,7 @@
 
 #include "packageinterface.h"
 
-PackageInterface::PackageInterface() {
+PackageInterface::PackageInterface()
+{
     //gcc complains if we don't add something to compile on a class with virtual functions
 }
diff --git a/daemon/packageinterfaces/pingpackageinterface.cpp b/daemon/packageinterfaces/pingpackageinterface.cpp
index b81ebd0..b984fdd 100644
--- a/daemon/packageinterfaces/pingpackageinterface.cpp
+++ b/daemon/packageinterfaces/pingpackageinterface.cpp
@@ -23,7 +23,8 @@
 #include <KDebug>
 #include <kicon.h>
 
-bool PingPackageInterface::receivePackage(const Device& device, const NetworkPackage& np) {
+bool PingPackageInterface::receivePackage(const Device& device, const NetworkPackage& np)
+{
 
     if (np.type() != PACKAGE_TYPE_PING) return false;
 
diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt
index f279a5d..2c15af2 100644
--- a/kcm/CMakeLists.txt
+++ b/kcm/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(kcm_kdeconnect
 add_dependencies(kcm_kdeconnect
     org.kde.kdeconnect.xml
     org.kde.kdeconnect.device.xml
+    org.kde.kdeconnect.device.battery.xml
 )
 
 install(TARGETS kcm_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/kcm/dbusinterfaces.cpp b/kcm/dbusinterfaces.cpp
index c695064..70b6df4 100644
--- a/kcm/dbusinterfaces.cpp
+++ b/kcm/dbusinterfaces.cpp
@@ -21,13 +21,13 @@
 #include "dbusinterfaces.h"
 
 DaemonDbusInterface::DaemonDbusInterface(QObject* parent)
-    : KdeconnectDaemonInterface("org.kde.kdeconnect", "/modules/kdeconnect", QDBusConnection::sessionBus(), parent)
+    : OrgKdeKdeconnectDaemonInterface("org.kde.kdeconnect", "/modules/kdeconnect", QDBusConnection::sessionBus(), parent)
 {
 
 }
 
 DeviceDbusInterface::DeviceDbusInterface(const QString& id, QObject* parent)
-    : KdeconnectDeviceInterface("org.kde.kdeconnect", "/modules/kdeconnect/Devices/"+id, QDBusConnection::sessionBus(), parent)
+    : OrgKdeKdeconnectDeviceInterface("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+id, QDBusConnection::sessionBus(), parent)
 {
 
 }
\ No newline at end of file
diff --git a/kcm/dbusinterfaces.h b/kcm/dbusinterfaces.h
index ccf7b33..1a9fd33 100644
--- a/kcm/dbusinterfaces.h
+++ b/kcm/dbusinterfaces.h
@@ -24,8 +24,12 @@
 #ifndef DbusInterfaces_H_
 #define DbusInterfaces_H_
 
+/**
+ * Using these "proxy" classes just in case we need to rename the
+ * interface, so we can change the class name in a single place.
+ */
 class DaemonDbusInterface
-    : public KdeconnectDaemonInterface
+    : public OrgKdeKdeconnectDaemonInterface
 {
     Q_OBJECT
 public:
@@ -33,7 +37,9 @@ public:
 
 };
 
-class DeviceDbusInterface : public KdeconnectDeviceInterface{
+class DeviceDbusInterface
+    : public OrgKdeKdeconnectDeviceInterface
+{
     Q_OBJECT
 public:
     DeviceDbusInterface(const QString& id, QObject* parent);

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list