meson.build: restore compatibility with meson in kirkstone

[apps/homescreen.git] / homescreen / src / statusbarmodel.cpp

diff --git a/homescreen/src/statusbarmodel.cpp b/homescreen/src/statusbarmodel.cpp
index f54a5f4..447466d 100644 (file)
--- a/homescreen/src/statusbarmodel.cpp
+++ b/homescreen/src/statusbarmodel.cpp
@@ -17,10 +17,8 @@
 
 #include "statusbarmodel.h"
 #include "statusbarserver.h"
-
-#include <QtDBus/QDBusConnection>
-
-#include "network.h"
+#include <network.h>
+#include <wifiadapter.h>
 
 class StatusBarModel::Private
 {
@@ -39,9 +37,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;
@@ -64,9 +59,9 @@ StatusBarModel::~StatusBarModel()
     delete d;
 }
 
-void StatusBarModel::init(QUrl &url, QQmlContext *context)
+void StatusBarModel::init(QQmlContext *context)
 {
-    d->network = new Network(url, context);
+    d->network = new Network(false, context);
     context->setContextProperty("network", d->network);
     d->wifi_a = static_cast<WifiAdapter*>(d->network->findAdapter("wifi"));
     Q_CHECK_PTR(d->wifi_a);