X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=67a6e9e3beb00c4e3fb7d32cb50f0fc8148d7632;hb=5ba4327b148f81852c6e2a53bc51ab07b238602e;hp=ea727c609f7a77c2a623b0de1091688a443c1693;hpb=e79d82c88e350e6b882158624363b82fe3e2d91a;p=apps%2Fonscreenapp.git

diff --git a/app/main.cpp b/app/main.cpp
index ea727c6..67a6e9e 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -16,19 +16,14 @@
 
 #include <QGuiApplication>
 #include <QCommandLineParser>
-#include <QtGui/QBitmap>
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
-#include <QtQml/qqml.h>
 #include <QQuickWindow>
 #include <QtQuickControls2/QQuickStyle>
 
 #include "eventhandler.h"
 
-using namespace std;
-
-static EventHandler* eventHandler;
 
 int main(int argc, char *argv[])
 {
@@ -59,10 +54,9 @@ int main(int argc, char *argv[])
 
     HMI_DEBUG(APP_ID, "port = %d, token = %s", port, token.toStdString().c_str());
 
-    eventHandler = new EventHandler();
-    eventHandler->init(port, token.toStdString().c_str());
-
     QQmlApplicationEngine engine;
+    EventHandler *eventHandler = new EventHandler();
+    eventHandler->init(port, token.toStdString().c_str());
     engine.rootContext()->setContextProperty("eventHandler", eventHandler);
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
     if (engine.rootObjects().isEmpty()) {
@@ -72,13 +66,10 @@ int main(int argc, char *argv[])
 
     QObject *root = engine.rootObjects().first();
     QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-
-    eventHandler->setQuickWindow(window);
     QObject::connect(eventHandler, SIGNAL(signalLoader(QVariant)), window, SLOT(qmlLoader(QVariant)));
     QObject::connect(eventHandler, SIGNAL(signalOnScreenParameter(QVariant)), window, SLOT(qmlOnScreenParameter(QVariant)));
 
     HMI_DEBUG(APP_ID, "Launched!");
-
     return app.exec();
 }