aboutsummaryrefslogtreecommitdiffstats
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-21 18:35:17 +0000
commit0f52dc1537fd50cbbd179ee17cc6203900c833b6 (patch)
tree6da54c7c874e6abc0c8cb394e03a1d695030734e
parent217753bff6e40fbc8f6449f1b5e41f15ede2b89b (diff)
Remove DBus interface for StatusBarhalibut_8.0.4halibut/8.0.48.0.4
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>
-rw-r--r--homescreen/src/statusbarmodel.cpp6
-rw-r--r--homescreen/src/statusbarserver.cpp3
-rw-r--r--interfaces/interfaces.pro3
-rw-r--r--interfaces/statusbar.xml38
4 files changed, 1 insertions, 49 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");
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 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<!-- Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. -->
-<node>
- <interface name="org.agl.statusbar">
- <method name="getAvailablePlaceholders">
- <arg name="placeholderIndexes" type="ai" direction="out"/>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;int&gt;"/>
- </method>
- <method name="getStatusText">
- <arg name="placeholderIndex" type="i" direction="in"/>
- <arg name="text" type="s" direction="out"/>
- </method>
- <method name="getStatusIcon">
- <arg name="placeholderIndex" type="i" direction="in"/>
- <arg name="iconURI" type="s" direction="out"/>
- </method>
- <method name="setStatusText">
- <arg name="placeholderIndex" type="i" direction="in"/>
- <arg name="text" type="s" direction="in"/>
- </method>
- <method name="setStatusIcon">
- <arg name="placeholderIndex" type="i" direction="in"/>
- <arg name="iconURI" type="s" direction="in"/>
- </method>
- </interface>
-</node>