summaryrefslogtreecommitdiffstats
path: root/depends/settings/include
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-09-07 04:00:58 +0200
committerPetr Mrázek <peterix@gmail.com>2013-09-07 04:00:58 +0200
commit6892c11e9f287dcfb1e698f8f46233a01fb7abb6 (patch)
treeee94607e92bcf39faef7f35842499fafbb2e270f /depends/settings/include
parent3f30055afe757637ae865b2adc7cf021edd9b8b5 (diff)
downloadMultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.tar
MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.tar.gz
MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.tar.lz
MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.tar.xz
MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.zip
Move a good chunk of the singleton objects into a new QApplication subclass.
Diffstat (limited to 'depends/settings/include')
-rw-r--r--depends/settings/include/settingsobject.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/depends/settings/include/settingsobject.h b/depends/settings/include/settingsobject.h
index a2f03699..e8bf5c83 100644
--- a/depends/settings/include/settingsobject.h
+++ b/depends/settings/include/settingsobject.h
@@ -13,8 +13,7 @@
* limitations under the License.
*/
-#ifndef SETTINGSOBJECT_H
-#define SETTINGSOBJECT_H
+#pragma once
#include <QObject>
#include <QMap>
@@ -183,10 +182,3 @@ protected:
private:
QMap<QString, Setting *> m_settings;
};
-
-/*!
- * \brief A global settings object.
- */
-LIBSETTINGS_EXPORT extern SettingsObject *globalSettings;
-
-#endif // SETTINGSOBJECT_H