Move settings lib into the main code, fixing error logging in it.

1 files changed, 53 insertions, 0 deletions

diff --git a/logic/settings/Setting.cpp b/logic/settings/Setting.cpp
new file mode 100644
index 00000000..5bdfe0fc
--- /dev/null
+++ b/logic/settings/Setting.cpp
@@ -0,0 +1,53 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "Setting.h"
+#include "logic/settings/SettingsObject.h"
+
+Setting::Setting(QStringList synonyms, QVariant defVal)
+	: QObject(), m_synonyms(synonyms), m_defVal(defVal)
+{
+}
+
+QVariant Setting::get() const
+{
+	SettingsObject *sbase = m_storage;
+	if (!sbase)
+	{
+		return defValue();
+	}
+	else
+	{
+		QVariant test = sbase->retrieveValue(*this);
+		if (!test.isValid())
+			return defValue();
+		return test;
+	}
+}
+
+QVariant Setting::defValue() const
+{
+	return m_defVal;
+}
+
+void Setting::set(QVariant value)
+{
+	emit SettingChanged(*this, value);
+}
+
+void Setting::reset()
+{
+	emit settingReset(*this);
+}