Merge of src and src2 folder

[staging/HomeScreen.git] / HomeScreen / src / main.cpp

diff --git a/HomeScreen/src/main.cpp b/HomeScreen/src/main.cpp
index 3cf8e8c..a4235de 100644 (file)
--- a/HomeScreen/src/main.cpp
+++ b/HomeScreen/src/main.cpp
@@ -14,30 +14,45 @@
  * limitations under the License.
  */
 
-#include "mainwindow.h"
-#include <QApplication>
+#include <QGuiApplication>
+#include <QCommandLineParser>
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
 #include <QtQml/qqml.h>
 
-#include "../src2/applicationlauncher.h"
-#include "../src2/statusbarmodel.h"
 #include "layouthandler.h"
-#include "../src2/applicationmodel.h"
 #include "homescreencontrolinterface.h"
+#include "applicationlauncher.h"
+#include "statusbarmodel.h"
+#include "applicationmodel.h"
+
+void noOutput(QtMsgType, const QMessageLogContext &, const QString &)
+{
+}
 
 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");
+
+    QCommandLineParser parser;
+    parser.setApplicationDescription("AGL HomeScreen - see wwww... for more details");
+    parser.addHelpOption();
+    parser.addVersionOption();
+    QCommandLineOption quietOption(QStringList() << "q" << "quiet",
+        QCoreApplication::translate("main", "Be quiet. No outputs."));
+    parser.addOption(quietOption);
+    parser.process(a);
 
-    qDebug("%s, v%s", QCoreApplication::applicationName().toStdString().c_str(), QCoreApplication::applicationVersion().toStdString().c_str());
+    if (parser.isSet(quietOption))
+    {
+        qInstallMessageHandler(noOutput);
+    }
 
     qDBusRegisterMetaType<AppInfo>();
     qDBusRegisterMetaType<QList<AppInfo> >();
@@ -51,7 +66,6 @@ int main(int argc, char *argv[])
     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)));