From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 api/logic/minecraft/Rule.cpp | 108 +++++++++++++++++++++----------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

(limited to 'api/logic/minecraft/Rule.cpp')

diff --git a/api/logic/minecraft/Rule.cpp b/api/logic/minecraft/Rule.cpp
index 43d673c2..cd10504f 100644
--- a/api/logic/minecraft/Rule.cpp
+++ b/api/logic/minecraft/Rule.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,74 +20,74 @@
 
 RuleAction RuleAction_fromString(QString name)
 {
-	if (name == "allow")
-		return Allow;
-	if (name == "disallow")
-		return Disallow;
-	return Defer;
+    if (name == "allow")
+        return Allow;
+    if (name == "disallow")
+        return Disallow;
+    return Defer;
 }
 
 QList<std::shared_ptr<Rule>> rulesFromJsonV4(const QJsonObject &objectWithRules)
 {
-	QList<std::shared_ptr<Rule>> rules;
-	auto rulesVal = objectWithRules.value("rules");
-	if (!rulesVal.isArray())
-		return rules;
+    QList<std::shared_ptr<Rule>> rules;
+    auto rulesVal = objectWithRules.value("rules");
+    if (!rulesVal.isArray())
+        return rules;
 
-	QJsonArray ruleList = rulesVal.toArray();
-	for (auto ruleVal : ruleList)
-	{
-		std::shared_ptr<Rule> rule;
-		if (!ruleVal.isObject())
-			continue;
-		auto ruleObj = ruleVal.toObject();
-		auto actionVal = ruleObj.value("action");
-		if (!actionVal.isString())
-			continue;
-		auto action = RuleAction_fromString(actionVal.toString());
-		if (action == Defer)
-			continue;
+    QJsonArray ruleList = rulesVal.toArray();
+    for (auto ruleVal : ruleList)
+    {
+        std::shared_ptr<Rule> rule;
+        if (!ruleVal.isObject())
+            continue;
+        auto ruleObj = ruleVal.toObject();
+        auto actionVal = ruleObj.value("action");
+        if (!actionVal.isString())
+            continue;
+        auto action = RuleAction_fromString(actionVal.toString());
+        if (action == Defer)
+            continue;
 
-		auto osVal = ruleObj.value("os");
-		if (!osVal.isObject())
-		{
-			// add a new implicit action rule
-			rules.append(ImplicitRule::create(action));
-			continue;
-		}
+        auto osVal = ruleObj.value("os");
+        if (!osVal.isObject())
+        {
+            // add a new implicit action rule
+            rules.append(ImplicitRule::create(action));
+            continue;
+        }
 
-		auto osObj = osVal.toObject();
-		auto osNameVal = osObj.value("name");
-		if (!osNameVal.isString())
-			continue;
-		OpSys requiredOs = OpSys_fromString(osNameVal.toString());
-		QString versionRegex = osObj.value("version").toString();
-		// add a new OS rule
-		rules.append(OsRule::create(action, requiredOs, versionRegex));
-	}
+        auto osObj = osVal.toObject();
+        auto osNameVal = osObj.value("name");
+        if (!osNameVal.isString())
+            continue;
+        OpSys requiredOs = OpSys_fromString(osNameVal.toString());
+        QString versionRegex = osObj.value("version").toString();
+        // add a new OS rule
+        rules.append(OsRule::create(action, requiredOs, versionRegex));
+    }
     return rules;
 }
 
 QJsonObject ImplicitRule::toJson()
 {
-	QJsonObject ruleObj;
-	ruleObj.insert("action", m_result == Allow ? QString("allow") : QString("disallow"));
-	return ruleObj;
+    QJsonObject ruleObj;
+    ruleObj.insert("action", m_result == Allow ? QString("allow") : QString("disallow"));
+    return ruleObj;
 }
 
 QJsonObject OsRule::toJson()
 {
-	QJsonObject ruleObj;
-	ruleObj.insert("action", m_result == Allow ? QString("allow") : QString("disallow"));
-	QJsonObject osObj;
-	{
-		osObj.insert("name", OpSys_toString(m_system));
-		if(!m_version_regexp.isEmpty())
-		{
-			osObj.insert("version", m_version_regexp);
-		}
-	}
-	ruleObj.insert("os", osObj);
-	return ruleObj;
+    QJsonObject ruleObj;
+    ruleObj.insert("action", m_result == Allow ? QString("allow") : QString("disallow"));
+    QJsonObject osObj;
+    {
+        osObj.insert("name", OpSys_toString(m_system));
+        if(!m_version_regexp.isEmpty())
+        {
+            osObj.insert("version", m_version_regexp);
+        }
+    }
+    ruleObj.insert("os", osObj);
+    return ruleObj;
 }
 
-- 
cgit v1.2.3