summaryrefslogtreecommitdiffstats
path: root/depends/settings/include/basicsettingsobject.h
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-11-04 19:58:56 -0600
committerAndrew <forkk@forkk.net>2013-11-04 19:58:56 -0600
commit5083a6a8090fa03d3c1800c1f9588079ca11e9f9 (patch)
tree7c2e88c7184a7f5acf5e7a03be5c5f0bf6904113 /depends/settings/include/basicsettingsobject.h
parentdc3b0fcb2b74aeede37b08216b203cab284f7fce (diff)
parentbb7e8985f6d189de0acac6a1c3033cb16378c1fb (diff)
downloadMultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar
MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.gz
MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.lz
MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.xz
MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.zip
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'depends/settings/include/basicsettingsobject.h')
-rw-r--r--depends/settings/include/basicsettingsobject.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/depends/settings/include/basicsettingsobject.h b/depends/settings/include/basicsettingsobject.h
index b7e5851d..387a3646 100644
--- a/depends/settings/include/basicsettingsobject.h
+++ b/depends/settings/include/basicsettingsobject.h
@@ -3,7 +3,7 @@
* 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
@@ -13,8 +13,7 @@
* limitations under the License.
*/
-#ifndef BASICSETTINGSOBJECT_H
-#define BASICSETTINGSOBJECT_H
+#pragma once
#include <QObject>
#include <QSettings>
@@ -31,14 +30,13 @@ class LIBSETTINGS_EXPORT BasicSettingsObject : public SettingsObject
Q_OBJECT
public:
explicit BasicSettingsObject(QObject *parent = 0);
-
-protected slots:
+
+protected
+slots:
virtual void changeSetting(const Setting &setting, QVariant value);
-
+
protected:
virtual QVariant retrieveValue(const Setting &setting);
-
+
QSettings config;
};
-
-#endif // BASICSETTINGSOBJECT_H