Report of Forgerock work

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

diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp
index 215e7c6..641c38f 100644 (file)
--- a/homescreen/src/main.cpp
+++ b/homescreen/src/main.cpp
@@ -26,10 +26,9 @@
 #include "applicationlauncher.h"
 #include "statusbarmodel.h"
 #include "applicationmodel.h"
+#include "usermanagement.h"
 #include "appinfo.h"
 #include "afm_user_daemon_proxy.h"
-#include "mastervolume.h"
-#include "paclient.h"
 
 // XXX: We want this DBus connection to be shared across the different
 // QML objects, is there another way to do this, a nice way, perhaps?
@@ -79,26 +78,18 @@ int main(int argc, char *argv[])
         qInstallMessageHandler(noOutput);
     }
 
-    // Fire up PA client QThread
-    QThread* pat = new QThread;
-    PaClient* client = new PaClient();
-    client->moveToThread(pat);
-    pat->start();
-
     qDBusRegisterMetaType<AppInfo>();
     qDBusRegisterMetaType<QList<AppInfo> >();
 
     qmlRegisterType<ApplicationLauncher>("HomeScreen", 1, 0, "ApplicationLauncher");
     qmlRegisterType<ApplicationModel>("Home", 1, 0, "ApplicationModel");
     qmlRegisterType<StatusBarModel>("HomeScreen", 1, 0, "StatusBarModel");
-    qmlRegisterType<MasterVolume>("MasterVolume", 1, 0, "MasterVolume");
 
     QQmlApplicationEngine engine;
 
     LayoutHandler* layoutHandler = new LayoutHandler();
 
     HomeScreenControlInterface* hsci = new HomeScreenControlInterface();
-
     QObject::connect(hsci, SIGNAL(newRequestGetSurfaceStatus(int)), layoutHandler, SLOT(requestGetSurfaceStatus(int)));
     QObject::connect(hsci, SIGNAL(newRequestsToBeVisibleApp(int)), layoutHandler, SLOT(makeMeVisible(int)));
     QObject::connect(hsci, SIGNAL(newRequestRenderSurfaceToArea(int, int)), layoutHandler, SLOT(requestRenderSurfaceToArea(int,int)));
@@ -108,15 +99,7 @@ int main(int argc, char *argv[])
     engine.rootContext()->setContextProperty("layoutHandler", layoutHandler);
 
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
-
-    QList<QObject *> mobjs = engine.rootObjects();
-    MasterVolume *mv = mobjs.first()->findChild<MasterVolume *>("mv");
-    engine.rootContext()->setContextProperty("MasterVolume", mv);
-    QObject::connect(mv, SIGNAL(sliderVolumeChanged(int)), client, SLOT(incDecVolume(int)));
-    QObject::connect(client, SIGNAL(volumeExternallyChanged(int)), mv, SLOT(changeExternalVolume(int)));
-
-    // Initalize PA client
-    client->init();
-
+    UserManagement userManagement(engine.rootObjects().first());
+    Q_UNUSED(userManagement);
     return a.exec();
 }