From 53e98f562f3c74681f9d0d8703813729c5ef4c9e Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 27 Aug 2015 18:55:17 +0300 Subject: [PATCH] Still merge fixes... --HG-- branch : develop --- src/app/core/vapplication.cpp | 2 +- src/app/core/vapplication.h | 10 ++++------ src/app/main.cpp | 15 +++++++++++++++ src/app/mainwindow.h | 2 -- src/app/mainwindowsnogui.cpp | 3 +++ 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/app/core/vapplication.cpp b/src/app/core/vapplication.cpp index 3e5aee6b2..bf6e5224c 100644 --- a/src/app/core/vapplication.cpp +++ b/src/app/core/vapplication.cpp @@ -48,7 +48,7 @@ #include #include #include -#include + Q_LOGGING_CATEGORY(vApp, "v.application") diff --git a/src/app/core/vapplication.h b/src/app/core/vapplication.h index 61f624e30..a99aaf41f 100644 --- a/src/app/core/vapplication.h +++ b/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; }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/main.cpp b/src/app/main.cpp index b1e26a258..6b4179f98 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -30,6 +30,12 @@ #include "core/vapplication.h" #include // 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 +#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. diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h index f76e31b77..7e39c52c9 100644 --- a/src/app/mainwindow.h +++ b/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" diff --git a/src/app/mainwindowsnogui.cpp b/src/app/mainwindowsnogui.cpp index a69d2e551..ba353bddd 100644 --- a/src/app/mainwindowsnogui.cpp +++ b/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"