From 02479396f25de53672aac08a5198947665668bc9 Mon Sep 17 00:00:00 2001
From: Skycoder42 <Skycoder42@users.noreply.github.com>
Date: Sun, 15 Jul 2018 11:49:04 +0200
Subject: [PATCH] make bootstrapped compatible

---
 src/mvvmcore/message.cpp                      |  2 +-
 tools/settingsgenerator/main.cpp              |  2 +-
 tools/settingsgenerator/qpmx.json             |  2 +-
 tools/settingsgenerator/settingsgenerator.cpp | 20 +++++++++----------
 tools/settingsgenerator/settingsgenerator.pro |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/mvvmcore/message.cpp b/src/mvvmcore/message.cpp
index 8fd3b24..ebee8c6 100644
--- a/src/mvvmcore/message.cpp
+++ b/src/mvvmcore/message.cpp
@@ -398,7 +398,7 @@ void ProgressControl::setProgress(int progress)
 void ProgressControl::setProgress(double progressPercent)
 {
 	Q_ASSERT_X(progressPercent >= 0.0 && progressPercent <= 1.0, Q_FUNC_INFO, "progressPercent must be in the range [0.0,1.0]");
-	setProgress(static_cast<int>(qRound((d->maximum - d->minimum) * progressPercent + d->minimum)));
+	setProgress(qRound((d->maximum - d->minimum) * progressPercent + d->minimum));
 }
 
 // ------------- Private Implementation -------------
diff --git a/tools/settingsgenerator/main.cpp b/tools/settingsgenerator/main.cpp
index cebd1b6..7197ad1 100644
--- a/tools/settingsgenerator/main.cpp
+++ b/tools/settingsgenerator/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 		};
 		generator.process(parser.value(QStringLiteral("in")));
 		return EXIT_SUCCESS;
-	} catch (const QException &e) {
+	} catch (SettingsGenerator::Exception &e) {
 		qCritical() << e.what();
 		return EXIT_FAILURE;
 	}
diff --git a/tools/settingsgenerator/qpmx.json b/tools/settingsgenerator/qpmx.json
index 3b2e020..f79e0b9 100644
--- a/tools/settingsgenerator/qpmx.json
+++ b/tools/settingsgenerator/qpmx.json
@@ -3,7 +3,7 @@
         {
             "package": "de.skycoder42.qxmlcodegen",
             "provider": "qpm",
-            "version": "1.1.3"
+            "version": "1.1.4"
         }
     ],
     "license": {
diff --git a/tools/settingsgenerator/settingsgenerator.cpp b/tools/settingsgenerator/settingsgenerator.cpp
index 65bc96f..54af0a6 100644
--- a/tools/settingsgenerator/settingsgenerator.cpp
+++ b/tools/settingsgenerator/settingsgenerator.cpp
@@ -154,7 +154,7 @@ void SettingsGenerator::readEntry(QXmlStreamReader &reader, SettingsConfigBase::
 			NodeType nNode;
 			nNode.key = key;
 			cGrp->contentNodes.append(std::move(nNode));
-			nGrp = &(std::get<NodeType>(cGrp->contentNodes.last()));
+			nGrp = &(nonstd::get<NodeType>(cGrp->contentNodes.last()));
 		}
 		cGrp = nGrp;
 	}
@@ -165,7 +165,7 @@ void SettingsGenerator::readEntry(QXmlStreamReader &reader, SettingsConfigBase::
 		EntryType nEntry;
 		nEntry.key = entryKey;
 		cGrp->contentNodes.append(std::move(nEntry));
-		eGrp = &(std::get<EntryType>(cGrp->contentNodes.last()));
+		eGrp = &(nonstd::get<EntryType>(cGrp->contentNodes.last()));
 	} else if(!isEntry) {
 		EntryType nEntry;
 		nEntry.key = entryKey;
@@ -187,16 +187,16 @@ SettingsGeneratorBase::NodeContentGroup *SettingsGenerator::findContentGroup(Set
 		*isEntry = false;
 	for(auto &cNode : cGrp->contentNodes) {
 		if(nonstd::holds_alternative<NodeType>(cNode)) {
-			if(std::get<NodeType>(cNode).key == key)
-				return &(std::get<NodeType>(cNode));
+			if(nonstd::get<NodeType>(cNode).key == key)
+				return &(nonstd::get<NodeType>(cNode));
 		} else if(nonstd::holds_alternative<EntryType>(cNode)) {
-			if(std::get<EntryType>(cNode).key == key) {
+			if(nonstd::get<EntryType>(cNode).key == key) {
 				if(isEntry)
 					*isEntry = true;
-				return &(std::get<EntryType>(cNode));
+				return &(nonstd::get<EntryType>(cNode));
 			}
 		} else if(nonstd::holds_alternative<NodeContentGroup>(cNode)) {
-			auto res = findContentGroup(&(std::get<NodeContentGroup>(cNode)), key);
+			auto res = findContentGroup(&(nonstd::get<NodeContentGroup>(cNode)), key);
 			if(res)
 				return res;
 		}
@@ -209,12 +209,12 @@ SettingsGeneratorBase::NodeContentGroup *SettingsGenerator::replaceNodeByEntry(S
 {
 	for(auto &cNode : cGrp->contentNodes) {
 		if(nonstd::holds_alternative<NodeType>(cNode)) {
-			if(&std::get<NodeType>(cNode) == node) {
+			if(&nonstd::get<NodeType>(cNode) == node) {
 				cNode = std::move(entry);
-				return &(std::get<EntryType>(cNode));
+				return &(nonstd::get<EntryType>(cNode));
 			}
 		} else if(nonstd::holds_alternative<NodeContentGroup>(cNode)) {
-			auto res = replaceNodeByEntry(&(std::get<NodeContentGroup>(cNode)), node, std::move(entry));
+			auto res = replaceNodeByEntry(&(nonstd::get<NodeContentGroup>(cNode)), node, std::move(entry));
 			if(res)
 				return res;
 		}
diff --git a/tools/settingsgenerator/settingsgenerator.pro b/tools/settingsgenerator/settingsgenerator.pro
index 513f000..7e7a01d 100644
--- a/tools/settingsgenerator/settingsgenerator.pro
+++ b/tools/settingsgenerator/settingsgenerator.pro
@@ -16,12 +16,12 @@ DEFINES += "BUNDLE_PREFIX=\\\"$$BUNDLE_PREFIX\\\""
 
 HEADERS += \
 	settingsgenerator.h \
-    settingstranslator.h
+	settingstranslator.h
 
 SOURCES += \
 	main.cpp \
 	settingsgenerator.cpp \
-    settingstranslator.cpp
+	settingstranslator.cpp
 
 XML_SCHEMA_DEFINITIONS += \
 	qsettingsgenerator.xsd \