From ce99fabe1396ed2956dc7ecb468760ef88f98765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 23 May 2015 16:07:47 +0200 Subject: GH-992 Add a transaction/locking mechanism to settings objects This can cut the FTB loading by ~66% - worth it, but not ideal. Real solution will have to be implemented later. --- logic/settings/SettingsObject.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'logic/settings/SettingsObject.h') diff --git a/logic/settings/SettingsObject.h b/logic/settings/SettingsObject.h index 99782a01..6272d24c 100644 --- a/logic/settings/SettingsObject.h +++ b/logic/settings/SettingsObject.h @@ -22,6 +22,9 @@ #include class Setting; +class SettingsObject; + +typedef std::shared_ptr SettingsObjectPtr; /*! * \brief The SettingsObject handles communicating settings between the application and a @@ -38,6 +41,22 @@ class Setting; class SettingsObject : public QObject { Q_OBJECT +public: + class Lock + { + public: + Lock(SettingsObjectPtr locked) + :m_locked(locked) + { + m_locked->suspendSave(); + } + ~Lock() + { + m_locked->resumeSave(); + } + private: + SettingsObjectPtr m_locked; + }; public: explicit SettingsObject(QObject *parent = 0); virtual ~SettingsObject(); @@ -127,6 +146,8 @@ public: */ virtual bool reload(); + virtual void suspendSave() = 0; + virtual void resumeSave() = 0; signals: /*! * \brief Signal emitted when one of this SettingsObject object's settings changes. @@ -184,6 +205,7 @@ protected: private: QMap> m_settings; +protected: + bool m_suspendSave = false; + bool m_doSave = false; }; - -typedef std::shared_ptr SettingsObjectPtr; -- cgit v1.2.3