Move a good chunk of the singleton objects into a new QApplication subclass.
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -18,8 +18,6 @@
 | 
			
		||||
 | 
			
		||||
#include <QVariant>
 | 
			
		||||
 | 
			
		||||
SettingsObject *globalSettings;
 | 
			
		||||
 | 
			
		||||
SettingsObject::SettingsObject(QObject *parent) :
 | 
			
		||||
	QObject(parent)
 | 
			
		||||
{
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user