From 0f52dc1537fd50cbbd179ee17cc6203900c833b6 Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Thu, 14 Nov 2019 21:06:13 -0800 Subject: 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 --- homescreen/src/statusbarmodel.cpp | 6 ------ homescreen/src/statusbarserver.cpp | 3 --- interfaces/interfaces.pro | 3 +-- interfaces/statusbar.xml | 38 -------------------------------------- 4 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 interfaces/statusbar.xml 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 - #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"); diff --git a/interfaces/interfaces.pro b/interfaces/interfaces.pro index 1e30bdd..281eeb8 100644 --- a/interfaces/interfaces.pro +++ b/interfaces/interfaces.pro @@ -25,8 +25,7 @@ SOURCES += \ XMLSOURCES = \ afm_user_daemon.xml \ - appframework.xml \ - statusbar.xml + appframework.xml gen_adaptor_cpp.input = XMLSOURCES gen_adaptor_cpp.commands = \ diff --git a/interfaces/statusbar.xml b/interfaces/statusbar.xml deleted file mode 100644 index ec51be2..0000000 --- a/interfaces/statusbar.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit 1.2.3-korg