SCRATCH eliminate InstanceFactory

2015-02-01 03:08:25 +01:00
parent c088d3bef0
commit 154d19bb74
23 changed files with 205 additions and 303 deletions
--- a/logic/BaseInstance.h
+++ b/logic/BaseInstance.h
@ -51,7 +51,7 @@ class BaseInstance : public QObject, public std::enable_shared_from_this<BaseIns
 	Q_OBJECT
 protected:
 	/// no-touchy!
-	BaseInstance(const QString &rootDir, SettingsObject *settings, QObject *parent = 0);
+	BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);

 public:
 	/// virtual destructor to make sure the destruction is COMPLETE