Port from context properties to singletons

Context properties are deprecated and will be removed in Qt 6.
QML singletons are the better option here, especially given that
UserModel and UserAppsModel already are singletons.

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>

1 files changed, 18 insertions, 3 deletions

diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index c67fa4bef..6b15ddaba 100644
--- a/src/gui/systray.cpp
+++ b/src/gui/systray.cpp
@@ -54,9 +54,24 @@ Systray::Systray()
 {
     _trayEngine->addImportPath("qrc:/qml/theme");
     _trayEngine->addImageProvider("avatars", new ImageProvider);
-    _trayEngine->rootContext()->setContextProperty("userModelBackend", UserModel::instance());
-    _trayEngine->rootContext()->setContextProperty("appsMenuModelBackend", UserAppsModel::instance());
-    _trayEngine->rootContext()->setContextProperty("systrayBackend", this);
+
+    qmlRegisterSingletonType<UserModel>("com.nextcloud.desktopclient", 1, 0, "UserModel",
+        [](QQmlEngine *, QJSEngine *) -> QObject * {
+            return UserModel::instance();
+        }
+    );
+
+    qmlRegisterSingletonType<UserAppsModel>("com.nextcloud.desktopclient", 1, 0, "UserAppsModel",
+        [](QQmlEngine *, QJSEngine *) -> QObject * {
+            return UserAppsModel::instance();
+        }
+    );
+
+    qmlRegisterSingletonType<Systray>("com.nextcloud.desktopclient", 1, 0, "Systray",
+        [](QQmlEngine *, QJSEngine *) -> QObject * {
+            return Systray::instance();
+        }
+    );
 
     connect(UserModel::instance(), &UserModel::newUserSelected,
         this, &Systray::slotNewUserSelected);