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/settings/OverrideSetting.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'api/logic/settings/OverrideSetting.cpp')

diff --git a/api/logic/settings/OverrideSetting.cpp b/api/logic/settings/OverrideSetting.cpp
index a3d48e03..1efdebac 100644
--- a/api/logic/settings/OverrideSetting.cpp
+++ b/api/logic/settings/OverrideSetting.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.
@@ -16,39 +16,39 @@
 #include "OverrideSetting.h"
 
 OverrideSetting::OverrideSetting(std::shared_ptr<Setting> other, std::shared_ptr<Setting> gate)
-	: Setting(other->configKeys(), QVariant())
+    : Setting(other->configKeys(), QVariant())
 {
-	Q_ASSERT(other);
-	Q_ASSERT(gate);
-	m_other = other;
-	m_gate = gate;
+    Q_ASSERT(other);
+    Q_ASSERT(gate);
+    m_other = other;
+    m_gate = gate;
 }
 
 bool OverrideSetting::isOverriding() const
 {
-	return m_gate->get().toBool();
+    return m_gate->get().toBool();
 }
 
 QVariant OverrideSetting::defValue() const
 {
-	return m_other->get();
+    return m_other->get();
 }
 
 QVariant OverrideSetting::get() const
 {
-	if(isOverriding())
-	{
-		return Setting::get();
-	}
-	return m_other->get();
+    if(isOverriding())
+    {
+        return Setting::get();
+    }
+    return m_other->get();
 }
 
 void OverrideSetting::reset()
 {
-	Setting::reset();
+    Setting::reset();
 }
 
 void OverrideSetting::set(QVariant value)
 {
-	Setting::set(value);
+    Setting::set(value);
 }
-- 
cgit v1.2.3