[mce-qt] Add support for mce name owner tracking. JB#43785

As mce-qt already tracks mce service availability for proxy validity evaluation, it would be handy if it could be used also for mce name ownership tracking instead of instantiating custom service trackers whenever such information needs to be known. Modify QMceProxy singleton class so that it tracks mce service name ownership rather than just service availability. Implement QMceNameOwner class that exposes mce name ownership info from QMceProxy. Adapt all existing QMceXxx classes to the changes. Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
sailfishos · Dec 3, 2019 · 4cc7500 · 4cc7500
1 parent e41ade0
commit 4cc7500
Show file tree

Hide file tree

Showing 16 changed files with 411 additions and 198 deletions.
diff --git a/lib/include/qmcenameowner.h b/lib/include/qmcenameowner.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *   3. Neither the name of Jolla Ltd nor the names of its contributors may
+ *      be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#ifndef QMCE_NAMEOWNER_H_
+#define QMCE_NAMEOWNER_H_
+
+#include "qmcetypes.h"
+
+class QMCE_EXPORT QMceNameOwner : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool valid READ valid NOTIFY validChanged)
+    Q_PROPERTY(QString nameOwner READ nameOwner NOTIFY nameOwnerChanged)
+public:
+    QMceNameOwner(QObject *aParent = nullptr);
+    bool valid() const;
+    QString nameOwner() const;
+Q_SIGNALS:
+    void validChanged();
+    void nameOwnerChanged();
+private:
+    class Private;
+    Private *iPrivate;
+};
+
+#endif // QMCE_NAMEOWNER_H_
diff --git a/lib/lib.pro b/lib/lib.pro
@@ -31,6 +31,7 @@ SOURCES += \
     src/qmcechargertype.cpp \
     src/qmcechargerstate.cpp \
     src/qmcedisplay.cpp \
+    src/qmcenameowner.cpp \
     src/qmcepowersavemode.cpp \
     src/qmceproxy.cpp \
     src/qmcetklock.cpp
@@ -44,6 +45,7 @@ PUBLIC_HEADERS += \
     include/qmcechargertype.h \
     include/qmcechargerstate.h \
     include/qmcedisplay.h \
+    include/qmcenameowner.h \
     include/qmcepowersavemode.h \
     include/qmcetypes.h \
     include/qmcetklock.h

diff --git a/lib/src/qmcebatterylevel.cpp b/lib/src/qmcebatterylevel.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2016-2018 Jolla Ltd.
+ * Copyright (c) 2016-2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
  * Contact: Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
@@ -51,7 +52,7 @@ class QMceBatteryLevel::Private : public QObject {
     void queryValue();
     void setValid(bool valid);
 private Q_SLOTS:
-    void onProxyValidChanged();
+    void onNameOwnerChanged();
     void onQueryFinished(QDBusPendingCallWatcher* aWatcher);
     void updateValue(int percent);
 private:
@@ -68,15 +69,15 @@ QMceBatteryLevel::Private::Private(QMceBatteryLevel* aParent) :
     iValid(false),
     iValue(100)
 {
-    connect(iProxy->signalProxy(),
-            SIGNAL(battery_level_ind(int)),
-            SLOT(updateValue(int)));
-    connect(iProxy.data(),
-            SIGNAL(validChanged()),
-            SLOT(onProxyValidChanged()));
-    if (iProxy->valid()) {
-        queryValue();
-    }
+    QObject::connect(iProxy->signalProxy(),
+                     &QMceSignalProxy::battery_level_ind,
+                     this,
+                     &QMceBatteryLevel::Private::updateValue);
+    QObject::connect(iProxy.data(),
+                     &QMceProxy::nameOwnerChanged,
+                     this,
+                     &QMceBatteryLevel::Private::onNameOwnerChanged);
+    onNameOwnerChanged();
 }
 
 bool QMceBatteryLevel::Private::valid() const
@@ -107,10 +108,12 @@ void QMceBatteryLevel::Private::updateValue(int percent)
 
 void QMceBatteryLevel::Private::queryValue()
 {
-    connect(new QDBusPendingCallWatcher(
-        iProxy->requestProxy()->get_battery_level(), this),
-        SIGNAL(finished(QDBusPendingCallWatcher*)),
-        SLOT(onQueryFinished(QDBusPendingCallWatcher*)));
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(
+        iProxy->requestProxy()->get_battery_level(), this);
+    QObject::connect(watcher,
+                     &QDBusPendingCallWatcher::finished,
+                     this,
+                     &QMceBatteryLevel::Private::onQueryFinished);
 }
 
 void QMceBatteryLevel::Private::onQueryFinished(QDBusPendingCallWatcher* aWatcher)
@@ -123,9 +126,9 @@ void QMceBatteryLevel::Private::onQueryFinished(QDBusPendingCallWatcher* aWatche
     aWatcher->deleteLater();
 }
 
-void QMceBatteryLevel::Private::onProxyValidChanged()
+void QMceBatteryLevel::Private::onNameOwnerChanged()
 {
-    if (iProxy->valid()) {
+    if (iProxy->hasNameOwner()) {
         queryValue();
     } else {
         setValid(false);

diff --git a/lib/src/qmcebatterystate.cpp b/lib/src/qmcebatterystate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019 Jolla Ltd.
+ * Copyright (c) 2016-2019 Jolla Ltd.
  * Copyright (c) 2019 Open Mobile Platform LLC.
  *
  * You may use this file under the terms of BSD license as follows:
@@ -53,7 +53,7 @@ class QMceBatteryState::Private : public QObject {
     void queryValue();
     void setValid(bool valid);
 private Q_SLOTS:
-    void onProxyValidChanged();
+    void onNameOwnerChanged();
     void onQueryFinished(QDBusPendingCallWatcher* aWatcher);
     void updateValue(QString state);
 private:
@@ -70,15 +70,15 @@ QMceBatteryState::Private::Private(QMceBatteryState* aParent) :
     iValid(false),
     iValue(Unknown)
 {
-    connect(iProxy->signalProxy(),
-            SIGNAL(battery_state_ind(QString)),
-            SLOT(updateValue(QString)));
-    connect(iProxy.data(),
-            SIGNAL(validChanged()),
-            SLOT(onProxyValidChanged()));
-    if (iProxy->valid()) {
-        queryValue();
-    }
+    QObject::connect(iProxy->signalProxy(),
+                     &QMceSignalProxy::battery_state_ind,
+                     this,
+                     &QMceBatteryState::Private::updateValue);
+    QObject::connect(iProxy.data(),
+                     &QMceProxy::nameOwnerChanged,
+                     this,
+                     &QMceBatteryState::Private::onNameOwnerChanged);
+    onNameOwnerChanged();
 }
 
 bool QMceBatteryState::Private::valid() const
@@ -122,10 +122,12 @@ void QMceBatteryState::Private::updateValue(QString state)
 
 void QMceBatteryState::Private::queryValue()
 {
-    connect(new QDBusPendingCallWatcher(
-        iProxy->requestProxy()->get_battery_state(), this),
-        SIGNAL(finished(QDBusPendingCallWatcher*)),
-        SLOT(onQueryFinished(QDBusPendingCallWatcher*)));
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(
+        iProxy->requestProxy()->get_battery_state(), this);
+    QObject::connect(watcher,
+                     &QDBusPendingCallWatcher::finished,
+                     this,
+                     &QMceBatteryState::Private::onQueryFinished);
 }
 
 void QMceBatteryState::Private::onQueryFinished(QDBusPendingCallWatcher* aWatcher)
@@ -137,9 +139,9 @@ void QMceBatteryState::Private::onQueryFinished(QDBusPendingCallWatcher* aWatche
     aWatcher->deleteLater();
 }
 
-void QMceBatteryState::Private::onProxyValidChanged()
+void QMceBatteryState::Private::onNameOwnerChanged()
 {
-    if (iProxy->valid()) {
+    if (iProxy->hasNameOwner()) {
         queryValue();
     } else {
         setValid(false);

diff --git a/lib/src/qmcebatterystatus.cpp b/lib/src/qmcebatterystatus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019 Jolla Ltd.
+ * Copyright (c) 2016-2019 Jolla Ltd.
  * Copyright (c) 2019 Open Mobile Platform LLC.
  * Contact: Slava Monich <slava.monich@jolla.com>
  *
@@ -54,7 +54,7 @@ class QMceBatteryStatus::Private : public QObject {
     void queryValue();
     void setValid(bool valid);
 private Q_SLOTS:
-    void onProxyValidChanged();
+    void onNameOwnerChanged();
     void onQueryFinished(QDBusPendingCallWatcher* aWatcher);
     void updateValue(QString status);
 private:
@@ -71,15 +71,15 @@ QMceBatteryStatus::Private::Private(QMceBatteryStatus* aParent) :
     iValid(false),
     iValue(Ok)
 {
-    connect(iProxy->signalProxy(),
-            SIGNAL(battery_status_ind(QString)),
-            SLOT(updateValue(QString)));
-    connect(iProxy.data(),
-            SIGNAL(validChanged()),
-            SLOT(onProxyValidChanged()));
-    if (iProxy->valid()) {
-        queryValue();
-    }
+    QObject::connect(iProxy->signalProxy(),
+                     &QMceSignalProxy::battery_status_ind,
+                     this,
+                     &QMceBatteryStatus::Private::updateValue);
+    QObject::connect(iProxy.data(),
+                     &QMceProxy::nameOwnerChanged,
+                     this,
+                     &QMceBatteryStatus::Private::onNameOwnerChanged);
+    onNameOwnerChanged();
 }
 
 bool QMceBatteryStatus::Private::valid() const
@@ -128,10 +128,12 @@ void QMceBatteryStatus::Private::updateValue(QString status)
 
 void QMceBatteryStatus::Private::queryValue()
 {
-    connect(new QDBusPendingCallWatcher(
-        iProxy->requestProxy()->get_battery_status(), this),
-        SIGNAL(finished(QDBusPendingCallWatcher*)),
-        SLOT(onQueryFinished(QDBusPendingCallWatcher*)));
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(
+        iProxy->requestProxy()->get_battery_status(), this);
+    QObject::connect(watcher,
+                     &QDBusPendingCallWatcher::finished,
+                     this,
+                     &QMceBatteryStatus::Private::onQueryFinished);
 }
 
 void QMceBatteryStatus::Private::onQueryFinished(QDBusPendingCallWatcher* aWatcher)
@@ -143,9 +145,9 @@ void QMceBatteryStatus::Private::onQueryFinished(QDBusPendingCallWatcher* aWatch
     aWatcher->deleteLater();
 }
 
-void QMceBatteryStatus::Private::onProxyValidChanged()
+void QMceBatteryStatus::Private::onNameOwnerChanged()
 {
-    if (iProxy->valid()) {
+    if (iProxy->hasNameOwner()) {
         queryValue();
     } else {
         setValid(false);

diff --git a/lib/src/qmcecablestate.cpp b/lib/src/qmcecablestate.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2016-2018 Jolla Ltd.
+ * Copyright (c) 2016-2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
  * Contact: Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
@@ -53,7 +54,7 @@ class QMceCableState::Private : public QObject {
     void queryValue();
     void setValid(bool valid);
 private Q_SLOTS:
-    void onProxyValidChanged();
+    void onNameOwnerChanged();
     void onQueryFinished(QDBusPendingCallWatcher* aWatcher);
     void updateValue(QString state);
 private:
@@ -70,15 +71,15 @@ QMceCableState::Private::Private(QMceCableState* aParent) :
     iValid(false),
     iValue(false)
 {
-    connect(iProxy->signalProxy(),
-            SIGNAL(usb_cable_state_ind(QString)),
-            SLOT(updateValue(QString)));
-    connect(iProxy.data(),
-            SIGNAL(validChanged()),
-            SLOT(onProxyValidChanged()));
-    if (iProxy->valid()) {
-        queryValue();
-    }
+    QObject::connect(iProxy->signalProxy(),
+                     &QMceSignalProxy::usb_cable_state_ind,
+                     this,
+                     &QMceCableState::Private::updateValue);
+    QObject::connect(iProxy.data(),
+                     &QMceProxy::nameOwnerChanged,
+                     this,
+                     &QMceCableState::Private::onNameOwnerChanged);
+    onNameOwnerChanged();
 }
 
 bool QMceCableState::Private::valid() const
@@ -123,10 +124,12 @@ void QMceCableState::Private::updateValue(QString state)
 
 void QMceCableState::Private::queryValue()
 {
-    connect(new QDBusPendingCallWatcher(
-        iProxy->requestProxy()->get_usb_cable_state(), this),
-        SIGNAL(finished(QDBusPendingCallWatcher*)),
-        SLOT(onQueryFinished(QDBusPendingCallWatcher*)));
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(
+        iProxy->requestProxy()->get_usb_cable_state(), this);
+    QObject::connect(watcher,
+                     &QDBusPendingCallWatcher::finished,
+                     this,
+                     &QMceCableState::Private::onQueryFinished);
 }
 
 void QMceCableState::Private::onQueryFinished(QDBusPendingCallWatcher* aWatcher)
@@ -138,9 +141,9 @@ void QMceCableState::Private::onQueryFinished(QDBusPendingCallWatcher* aWatcher)
     aWatcher->deleteLater();
 }
 
-void QMceCableState::Private::onProxyValidChanged()
+void QMceCableState::Private::onNameOwnerChanged()
 {
-    if (iProxy->valid()) {
+    if (iProxy->hasNameOwner()) {
         queryValue();
     } else {
         setValid(false);