aboutsummaryrefslogtreecommitdiffstats
path: root/homescreen
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2019-11-14 21:06:13 -0800
committerMatt Ranostay <matt.ranostay@konsulko.com>2019-11-15 01:32:34 -0800
commit50b01fcd85e314c830a310bac33ddf2312674633 (patch)
tree5dc05aca293ca575f095ec7564599e43fff56942 /homescreen
parent0bdd39b247661c1a0406d450d578d4ff3fd171b0 (diff)
Remove DBus interface for StatusBar
This is no longer used directly by the Settings app UI, and should be removed to avoid future use. Interfacing should be done with afb if possible. Bug-AGL: SPEC-2964 Change-Id: I0c52b8e05b8fe2d874d939c55c326f7f82466750 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
Diffstat (limited to 'homescreen')
-rw-r--r--homescreen/src/statusbarmodel.cpp6
-rw-r--r--homescreen/src/statusbarserver.cpp3
2 files changed, 0 insertions, 9 deletions
diff --git a/homescreen/src/statusbarmodel.cpp b/homescreen/src/statusbarmodel.cpp
index f54a5f4..1e8be6f 100644
--- a/homescreen/src/statusbarmodel.cpp
+++ b/homescreen/src/statusbarmodel.cpp
@@ -17,9 +17,6 @@
#include "statusbarmodel.h"
#include "statusbarserver.h"
-
-#include <QtDBus/QDBusConnection>
-
#include "network.h"
class StatusBarModel::Private
@@ -39,9 +36,6 @@ public:
StatusBarModel::Private::Private(StatusBarModel *parent)
: q(parent)
{
- QDBusConnection dbus = QDBusConnection::sessionBus();
- dbus.registerObject("/StatusBar", &server);
- dbus.registerService("org.agl.homescreen");
connect(&server, &StatusBarServer::statusIconChanged, [&](int placeholderIndex, const QString &icon) {
if (placeholderIndex < 0 || StatusBarServer::SupportedCount <= placeholderIndex) return;
if (iconList[placeholderIndex] == icon) return;
diff --git a/homescreen/src/statusbarserver.cpp b/homescreen/src/statusbarserver.cpp
index 805c582..3cb6b17 100644
--- a/homescreen/src/statusbarserver.cpp
+++ b/homescreen/src/statusbarserver.cpp
@@ -16,7 +16,6 @@
*/
#include "statusbarserver.h"
-#include "statusbar_adaptor.h"
class StatusBarServer::Private
{
@@ -24,11 +23,9 @@ public:
Private(StatusBarServer *parent);
QString texts[SupportedCount];
QString icons[SupportedCount];
- StatusbarAdaptor adaptor;
};
StatusBarServer::Private::Private(StatusBarServer *parent)
- : adaptor(parent)
{
icons[0] = QStringLiteral("qrc:/images/Status/HMI_Status_Wifi_NoBars-01.png");
icons[1] = QStringLiteral("qrc:/images/Status/HMI_Status_Bluetooth_Inactive-01.png");