summaryrefslogtreecommitdiffstats
path: root/logic/BaseInstance.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-02-01 03:08:25 +0100
committerPetr Mrázek <peterix@gmail.com>2015-04-12 20:57:16 +0200
commit154d19bb74f4c5fc1519aa40cd9dfd20244273a1 (patch)
tree1074077466171fa02ebc50e19ee0fc2257710401 /logic/BaseInstance.h
parentc088d3bef0e18c6cd90db15720841705d53c754d (diff)
downloadMultiMC-154d19bb74f4c5fc1519aa40cd9dfd20244273a1.tar
MultiMC-154d19bb74f4c5fc1519aa40cd9dfd20244273a1.tar.gz
MultiMC-154d19bb74f4c5fc1519aa40cd9dfd20244273a1.tar.lz
MultiMC-154d19bb74f4c5fc1519aa40cd9dfd20244273a1.tar.xz
MultiMC-154d19bb74f4c5fc1519aa40cd9dfd20244273a1.zip
SCRATCH eliminate InstanceFactory
Diffstat (limited to 'logic/BaseInstance.h')
-rw-r--r--logic/BaseInstance.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h
index cbac701c..cd1dcdf0 100644
--- 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