summaryrefslogtreecommitdiffstats
path: root/logic/minecraft/MinecraftInstance.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/minecraft/MinecraftInstance.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/minecraft/MinecraftInstance.h')
-rw-r--r--logic/minecraft/MinecraftInstance.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/logic/minecraft/MinecraftInstance.h b/logic/minecraft/MinecraftInstance.h
index 9097a2da..a6c786fb 100644
--- a/logic/minecraft/MinecraftInstance.h
+++ b/logic/minecraft/MinecraftInstance.h
@@ -4,7 +4,7 @@
class MinecraftInstance: public BaseInstance
{
public:
- MinecraftInstance(const QString& rootDir, SettingsObject* settings, QObject* parent = 0);
+ MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
virtual ~MinecraftInstance() {};
/// Path to the instance's minecraft directory.