Simplify main.cpp

Adopt qtaglextras to simplify application code

Bug-AGL: SPEC-1893, SPEC-1754

Change-Id: I1514f4347d07c603d0d7ec4cedea4e359c0468c6
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

diff --git a/app/app.pri b/app/app.pri
index 590c154..f22f540 100644 (file)
--- a/app/app.pri
+++ b/app/app.pri
@@ -1,20 +1,3 @@
 TEMPLATE = app
 
-load(configure)
-
-qtCompileTest(libhomescreen)
-qtCompileTest(qlibwindowmanager)
-
-config_libhomescreen {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += libhomescreen
-    DEFINES += HAVE_LIBHOMESCREEN
-}
-
-config_qlibwindowmanager {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += qlibwindowmanager
-    DEFINES += HAVE_QLIBWINDOWMANAGER
-}
-
 DESTDIR = $${OUT_PWD}/../package/root/bin

diff --git a/app/app.pro b/app/app.pro
index edd08aa..ef4de97 100644 (file)
--- a/app/app.pro
+++ b/app/app.pro
@@ -1,5 +1,5 @@
 TARGET = hvac
-QT = quick qml
+QT = quick qml aglextras
 
 HEADERS += \
     translator.h

diff --git a/app/config.tests/libhomescreen/libhomescreen.cpp b/app/config.tests/libhomescreen/libhomescreen.cpp
deleted file mode 100644 (file)
index d698b05..0000000
--- a/app/config.tests/libhomescreen/libhomescreen.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <libhomescreen.hpp>
-
-int main(int argc,char **argv)
-{
-    LibHomeScreen libHomeScreen;
-    return 0;
-}
-

diff --git a/app/config.tests/libhomescreen/libhomescreen.pro b/app/config.tests/libhomescreen/libhomescreen.pro
deleted file mode 100644 (file)
index 7d43112..0000000
--- a/app/config.tests/libhomescreen/libhomescreen.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = libhomescreen.cpp
-
-CONFIG -= qt
-CONFIG += link_pkgconfig
-PKGCONFIG += libhomescreen

diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp b/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp
deleted file mode 100644 (file)
index bb95c93..0000000
--- a/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <qlibwindowmanager.h>
-
-int main(int argc,char **argv)
-{
-    QLibWindowmanager qwm;
-    return 0;
-}
-

diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro b/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro
deleted file mode 100644 (file)
index cb51d98..0000000
--- a/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = qlibwindowmanager.cpp
-
-CONFIG += qt
-CONFIG += link_pkgconfig
-PKGCONFIG += qlibwindowmanager

diff --git a/app/main.cpp b/app/main.cpp
index 0bfdd52..2fac9ae 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -14,103 +14,18 @@
  * limitations under the License.
  */
 
-#include <QtCore/QDebug>
-#include <QtCore/QCommandLineParser>
-#include <QtCore/QUrlQuery>
-#include <QtGui/QGuiApplication>
+#include <QtAGLExtras/AGLApplication>
 #include <QtQml/QQmlApplicationEngine>
-#include <QtQml/QQmlContext>
-#include <QtQuick/QQuickWindow>
 
 #include "translator.h"
 
-#ifdef HAVE_LIBHOMESCREEN
-#include <libhomescreen.hpp>
-#endif
-#ifdef HAVE_QLIBWINDOWMANAGER
-#include <qlibwindowmanager.h>
-#endif
-
 int main(int argc, char *argv[])
 {
-    QString myname = QString("HVAC");
-
-    QGuiApplication app(argc, argv);
-    app.setApplicationVersion(QStringLiteral("0.1.0"));
-    app.setOrganizationDomain(QStringLiteral("automotivelinux.org"));
-    app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux"));
-
-    QCommandLineParser parser;
-    parser.addPositionalArgument("port", app.translate("main", "port for binding"));
-    parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));
-    parser.addHelpOption();
-    parser.addVersionOption();
-    parser.process(app);
-    QStringList positionalArguments = parser.positionalArguments();
-
+    AGLApplication app(argc, argv);
+    app.setApplicationName("HVAC");
+    app.setupApplicationRole("hvac");
     qmlRegisterType<Translator>("Translator", 1, 0, "Translator");
-
-    QQmlApplicationEngine engine;
-    QQmlContext *context = engine.rootContext();
-    QUrl bindingAddress;
-
-    int port;
-    QString secret;
-    if (positionalArguments.length() == 2) {
-        port = positionalArguments.takeFirst().toInt();
-        secret = positionalArguments.takeFirst();
-        bindingAddress.setScheme(QStringLiteral("ws"));
-        bindingAddress.setHost(QStringLiteral("localhost"));
-        bindingAddress.setPort(port);
-        bindingAddress.setPath(QStringLiteral("/api"));
-        QUrlQuery query;
-        query.addQueryItem(QStringLiteral("token"), secret);
-        bindingAddress.setQuery(query);
-    }
-    context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
-#ifdef HAVE_QLIBWINDOWMANAGER
-    QLibWindowmanager* qwm = new QLibWindowmanager();
-
-    // WindowManager
-    if(qwm->init(port,secret) != 0){
-        exit(EXIT_FAILURE);
-    }
-    AGLScreenInfo screenInfo(qwm->get_scale_factor());
-    engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
-    // Request a surface as described in layers.json windowmanager’s file
-    if (qwm->requestSurface(myname) != 0) {
-        exit(EXIT_FAILURE);
-    }
-    // Create an event callbnewack against an event type. Here a lambda is called when SyncDraw event occurs
-    qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) {
-        fprintf(stderr, "Surface got syncDraw!\n");
-        qwm->endDraw(myname);
-    });
-#endif
-
-#ifdef HAVE_LIBHOMESCREEN
-    LibHomeScreen* hs = new LibHomeScreen();
-
-    // HomeScreen
-    std::string token = secret.toStdString();
-    hs->init(port, token.c_str());
-    // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
-    hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
-        qDebug("Surface %s got tapShortcut\n", myname.toStdString().c_str());
-        qwm->activateSurface(myname);
-    });
-#endif
-
-    engine.load(QUrl(QStringLiteral("qrc:/HVAC.qml")));
-    QObject *root = engine.rootObjects().first();
-    QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-#ifdef HAVE_QLIBWINDOWMANAGER
-    QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
-#else
-    window->resize(1080, 1920 - 218 - 215);
-    window->setVisible(true);
-#endif
-
+    app.load(QUrl(QStringLiteral("qrc:/HVAC.qml")));
     return app.exec();
 }