From 6892c11e9f287dcfb1e698f8f46233a01fb7abb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 7 Sep 2013 04:00:58 +0200
Subject: Move a good chunk of the singleton objects into a new QApplication
 subclass.

---
 depends/classparser/src/javautils.cpp     |  1 -
 depends/settings/include/settingsobject.h | 10 +---------
 depends/settings/src/settingsobject.cpp   |  2 --
 3 files changed, 1 insertion(+), 12 deletions(-)

(limited to 'depends')

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)
 {
-- 
cgit v1.2.3