summaryrefslogtreecommitdiffstats
path: root/logic/OneSixInstance.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/OneSixInstance.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/OneSixInstance.h')
-rw-r--r--logic/OneSixInstance.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/logic/OneSixInstance.h b/logic/OneSixInstance.h
index d6593d1b..75e2dd3d 100644
--- a/logic/OneSixInstance.h
+++ b/logic/OneSixInstance.h
@@ -25,8 +25,7 @@ class OneSixInstance : public MinecraftInstance, public BasePageProvider
{
Q_OBJECT
public:
- explicit OneSixInstance(const QString &rootDir, SettingsObject *settings,
- QObject *parent = 0);
+ explicit OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
virtual ~OneSixInstance(){};
virtual void init();