Still merge fixes...

--HG--
branch : develop

src/app/core/vapplication.cpp

@@ -48,7 +48,7 @@
 #include <QMessageBox>
 #include <QThread>
 #include <QDateTime>
-#include <iostream>
+
 
 Q_LOGGING_CATEGORY(vApp, "v.application")
 

src/app/core/vapplication.h

@@ -88,12 +88,6 @@ public:
 #endif // defined(Q_OS_WIN) && defined(Q_CC_GNU)
     bool static CheckGUI();
 
-    virtual void OpenSettings() Q_DECL_OVERRIDE;
-    VSettings *ValentinaSettings();
-
-
-
-    const VCommandLinePtr     CommandLine() const;
 private slots:
 #if defined(Q_OS_WIN) && defined(Q_CC_GNU)
     void               CleanGist() const;
@@ -126,6 +120,10 @@ private:
     void               CreateLogDir()const;
     void               BeginLogging();
     void               ClearOldLogs()const;
+
+private:
+    //moved to the end of class so merge should go
+    const VCommandLinePtr     CommandLine() const;
 };
 
 //---------------------------------------------------------------------------------------------------------------------

src/app/main.cpp

@@ -30,6 +30,12 @@
 #include "core/vapplication.h"
 #include <QMessageBox> // For QT_REQUIRE_VERSION
 
+//not needed that include, added to allow merge go
+#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
+#   include "../../libs/vmisc/backport/qcommandlineparser.h"
+#else
+#   include <QCommandLineParser>
+#endif
 // Lock producing random attribute order in XML
  // https://stackoverflow.com/questions/27378143/qt-5-produce-random-attribute-order-in-xml
  extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed;
@@ -55,7 +61,16 @@ int main(int argc, char *argv[])
     MainWindow w;
     app.setWindowIcon(QIcon(":/icon/64x64/icon64x64.png"));
     app.setMainWindow(&w);
+#ifdef STUPID_MERGE
+    QCommandLineParser parser;
+    parser.setApplicationDescription(QCoreApplication::translate("main", "Pattern making program."));
+    parser.addHelpOption();
+    // Process the actual command line arguments given by the user
+    parser.process(app);
+    QStringList args = parser.positionalArguments();
 
+
+#endif
     auto args = app.CommandLine()->OptInputFileNames();
 
     //Before we load pattern show window.

src/app/mainwindow.h

@@ -30,8 +30,6 @@
 #define MAINWINDOW_H
 
 #include "mainwindowsnogui.h"
-#include "../vpatterndb/vcontainer.h"
-#include "../vobj/vobjpaintdevice.h"
 #include "../libs/vwidgets/vmaingraphicsview.h"
 #include "../libs/vtools/dialogs/tooldialogs.h"
 #include "dialogs/dialogs.h"

src/app/mainwindowsnogui.cpp

@@ -28,6 +28,9 @@
 
 #include "mainwindowsnogui.h"
 #include "core/vapplication.h"
+#include "../vpatterndb/vcontainer.h"
+#include "../vobj/vobjpaintdevice.h"
+
 #include "../libs/vpatterndb/vcontainer.h"
 #include "../libs/vobj/vobjpaintdevice.h"
 #include "../libs/vpatterndb/vcontainer.h"