diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-07 04:00:58 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-07 04:00:58 +0200 |
| commit | 6892c11e9f287dcfb1e698f8f46233a01fb7abb6 (patch) | |
| tree | ee94607e92bcf39faef7f35842499fafbb2e270f /depends | |
| parent | 3f30055afe757637ae865b2adc7cf021edd9b8b5 (diff) | |
| download | MultiMC-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')
| -rw-r--r-- | depends/classparser/src/javautils.cpp | 1 | ||||
| -rw-r--r-- | depends/settings/include/settingsobject.h | 10 | ||||
| -rw-r--r-- | depends/settings/src/settingsobject.cpp | 2 |
3 files changed, 1 insertions, 12 deletions
diff --git a/depends/classparser/src/javautils.cpp b/depends/classparser/src/javautils.cpp index 4a359031..3a5c6934 100644 --- a/depends/classparser/src/javautils.cpp +++ b/depends/classparser/src/javautils.cpp @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "multimc_pragma.h" #include "classfile.h" #include "javautils.h" 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 diff --git a/depends/settings/src/settingsobject.cpp b/depends/settings/src/settingsobject.cpp index bf7b8825..2ca544ad 100644 --- a/depends/settings/src/settingsobject.cpp +++ b/depends/settings/src/settingsobject.cpp @@ -18,8 +18,6 @@ #include <QVariant> -SettingsObject *globalSettings; - SettingsObject::SettingsObject(QObject *parent) : QObject(parent) { |