Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

1 files changed, 0 insertions, 53 deletions

diff --git a/depends/settings/src/setting.cpp b/depends/settings/src/setting.cpp
deleted file mode 100644
index 899463dc..00000000
--- a/depends/settings/src/setting.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/* 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 "include/setting.h"
-#include "include/settingsobject.h"
-
-Setting::Setting(QString id, QVariant defVal, QObject *parent)
-	: QObject(parent), m_id(id), m_defVal(defVal)
-{
-}
-
-QVariant Setting::get() const
-{
-	SettingsObject *sbase = qobject_cast<SettingsObject *>(parent());
-	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);
-}