diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-11-26 17:18:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2019-11-26 17:18:13 +0000 |
| commit | 7dcc687d179c645f4ccf7fffdb507e18b8d562c4 (patch) | |
| tree | 2dc9c2fd48855e78fdf290442e230416c66f0cba /homescreen/src | |
| parent | 86c947e1adde60ee372a5ee6031068d42bcfaa65 (diff) | |
| parent | 50b01fcd85e314c830a310bac33ddf2312674633 (diff) | |
Merge "Remove DBus interface for StatusBar"icefish_8.99.4icefish_8.99.3icefish_8.99.2icefish/8.99.4icefish/8.99.3icefish/8.99.28.99.48.99.38.99.2
Diffstat (limited to 'homescreen/src')
| -rw-r--r-- | homescreen/src/statusbarmodel.cpp | 6 | ||||
| -rw-r--r-- | homescreen/src/statusbarserver.cpp | 3 |
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"); |