X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fsrc%2Fmain.cpp;h=f103990970e4cfc73bfa0c5bd4e7c8ddabac29aa;hb=66263b2c54d6f34ed57eb422fc51ad80c6f1cc30;hp=c1f951ef004bab3aa794a85cfaee32df4dd4517a;hpb=b0632b0a5cd7e31c79c4a81764ebed329114a983;p=staging%2FHomeScreen.git diff --git a/HomeScreen/src/main.cpp b/HomeScreen/src/main.cpp index c1f951e..f103990 100644 --- a/HomeScreen/src/main.cpp +++ b/HomeScreen/src/main.cpp @@ -14,28 +14,28 @@ * limitations under the License. */ -#include "mainwindow.h" -#include +#include #include #include #include #include +#include "layouthandler.h" +#include "homescreencontrolinterface.h" #include "../src2/applicationlauncher.h" #include "../src2/statusbarmodel.h" -#include "layouthandler.h" #include "../src2/applicationmodel.h" -#include "homescreencontrolinterface.h" +#include "../src2/usermanagement.h" int main(int argc, char *argv[]) { - QApplication a(argc, argv); + QGuiApplication a(argc, argv); // used for application settings (QSettings) QCoreApplication::setOrganizationDomain("LinuxFoundation"); QCoreApplication::setOrganizationName("AutomotiveGradeLinux"); QCoreApplication::setApplicationName("HomeScreen"); - QCoreApplication::setApplicationVersion("0.6.0"); + QCoreApplication::setApplicationVersion("0.7.0"); qDebug("%s, v%s", QCoreApplication::applicationName().toStdString().c_str(), QCoreApplication::applicationVersion().toStdString().c_str()); @@ -47,11 +47,9 @@ int main(int argc, char *argv[]) qmlRegisterType("HomeScreen", 1, 0, "StatusBarModel"); QQmlApplicationEngine engine; - LayoutHandler* layoutHandler = new LayoutHandler(); HomeScreenControlInterface* hsci = new HomeScreenControlInterface(); - // QObject::connect(hsci, SIGNAL(newRequestGetAllSurfacesOfProcess(int)), layoutHandler, SLOT(requestGetAllSurfacesOfProcess(int))); 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))); @@ -61,6 +59,7 @@ int main(int argc, char *argv[]) engine.rootContext()->setContextProperty("layoutHandler", layoutHandler); engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); - + UserManagement userManagement(engine.rootObjects().first()); + Q_UNUSED(userManagement); return a.exec(); }