From 2f812cb95986ccdd2b1c1bc857c2cff6de822a9c Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Thu, 20 Dec 2018 18:03:51 -0800 Subject: settings: remove dbus outdated code and references Bluetooth and WiFi status icons are set in the Homescreen now by listening to respective binding events. DBus calls to Homescreen to set status icons is no longer needed or should be used by any new section. Change-Id: Ia5b0bd828fd2a46d9ed20ec49d128540e354eb95 Signed-off-by: Matt Ranostay --- app/main.cpp | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'app/main.cpp') diff --git a/app/main.cpp b/app/main.cpp index 2c8c01b..3b39810 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -19,8 +19,6 @@ #include #include #include -#include -#include #include #include #include @@ -31,23 +29,6 @@ #include #include -class DBus : public QObject -{ - Q_OBJECT -public: - DBus(QObject *parent = nullptr) - : QObject(parent) - , interface("org.agl.homescreen", "/StatusBar", "org.agl.statusbar", QDBusConnection::sessionBus()) - {} - - Q_INVOKABLE void setStatusIcon(int index, const QString &url) { - interface.call("setStatusIcon", index, url); - } - -private: - QDBusInterface interface; -}; - int main(int argc, char *argv[]) { QString graphic_role = QString("settings"); // defined in layers.json in window manager @@ -133,8 +114,6 @@ int main(int argc, char *argv[]) qWarning() << aglversion.errorString(); } - DBus dbus; - engine.rootContext()->setContextProperty("dbus", &dbus); engine.rootContext()->setContextProperty("bluetooth", new Bluetooth(bindingAddressWS)); engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo); engine.load(QUrl(QStringLiteral("qrc:/Settings.qml"))); @@ -144,5 +123,3 @@ int main(int argc, char *argv[]) return app.exec(); } - -#include "main.moc" -- cgit 1.2.3-korg