Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5

Conflicts:
	data/instancemodel.cpp

1 files changed, 40 insertions, 0 deletions

diff --git a/libsettings/src/appsettings.cpp b/libsettings/src/appsettings.cpp
new file mode 100644
index 00000000..8fe9b8ad
--- /dev/null
+++ b/libsettings/src/appsettings.cpp
@@ -0,0 +1,40 @@
+/* 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/appsettings.h"
+
+AppSettings* settings;
+
+SettingsBase::SettingsBase(QObject *parent) :
+	QObject(parent)
+{
+	
+}
+
+AppSettings::AppSettings(QObject *parent) :
+	SettingsBase(parent)
+{
+	
+}
+
+QVariant AppSettings::getValue(const QString& name, QVariant defVal) const
+{
+	return config.value(name, defVal);
+}
+
+void AppSettings::setValue(const QString& name, QVariant val)
+{
+	config.setValue(name, val);
+}