SCRATCH eliminate InstanceFactory

5 files changed, 14 insertions, 17 deletions

diff --git a/logic/ftb/FTBPlugin.cpp b/logic/ftb/FTBPlugin.cpp
index d9c6fec6..d524e3fd 100644
--- a/logic/ftb/FTBPlugin.cpp
+++ b/logic/ftb/FTBPlugin.cpp
@@ -4,7 +4,6 @@
 #include "OneSixFTBInstance.h"
 #include <logic/BaseInstance.h>
 #include <logic/icons/IconList.h>
-#include <logic/InstanceFactory.h>
 #include <logic/InstanceList.h>
 #include <logic/minecraft/MinecraftVersionList.h>
 #include <logic/settings/INISettingsObject.h>
@@ -134,7 +133,7 @@ QSet<FTBRecord> discoverFTBInstances()
 
 InstancePtr loadInstance(const QString &instDir)
 {
-	auto m_settings = new INISettingsObject(PathCombine(instDir, "instance.cfg"));
+	auto m_settings = std::make_shared<INISettingsObject>(PathCombine(instDir, "instance.cfg"));
 
 	InstancePtr inst;
 
@@ -144,11 +143,11 @@ InstancePtr loadInstance(const QString &instDir)
 
 	if (inst_type == "LegacyFTB")
 	{
-		inst.reset(new LegacyFTBInstance(instDir, m_settings));
+		inst.reset(new LegacyFTBInstance(MMC->settings(), m_settings, instDir));
 	}
 	else if (inst_type == "OneSixFTB")
 	{
-		inst.reset(new OneSixFTBInstance(instDir, m_settings));
+		inst.reset(new OneSixFTBInstance(MMC->settings(), m_settings, instDir));
 	}
 	inst->init();
 	return inst;
@@ -173,19 +172,19 @@ InstancePtr createInstance(MinecraftVersionPtr version, const QString &instDir)
 		return nullptr;
 	}
 
-	auto m_settings = new INISettingsObject(PathCombine(instDir, "instance.cfg"));
+	auto m_settings = std::make_shared<INISettingsObject>(PathCombine(instDir, "instance.cfg"));
 	m_settings->registerSetting("InstanceType", "Legacy");
 
 	if (version->usesLegacyLauncher())
 	{
 		m_settings->set("InstanceType", "LegacyFTB");
-		inst.reset(new LegacyFTBInstance(instDir, m_settings));
+		inst.reset(new LegacyFTBInstance(MMC->settings(),m_settings, instDir));
 		inst->setIntendedVersionId(version->descriptor());
 	}
 	else
 	{
 		m_settings->set("InstanceType", "OneSixFTB");
-		inst.reset(new OneSixFTBInstance(instDir, m_settings));
+		inst.reset(new OneSixFTBInstance(MMC->settings(),m_settings, instDir));
 		inst->setIntendedVersionId(version->descriptor());
 		inst->init();
 	}
@@ -239,7 +238,7 @@ void FTBPlugin::loadInstances(QMap<QString, QString> &groupMap, QList<InstancePt
 			instPtr->setIconKey(iconKey);
 			instPtr->setIntendedVersionId(record.mcVersion);
 			instPtr->setNotes(record.description);
-			if (!InstanceList::continueProcessInstance(instPtr, InstanceFactory::NoCreateError, record.instanceDir, groupMap))
+			if (!InstanceList::continueProcessInstance(instPtr, InstanceList::NoCreateError, record.instanceDir, groupMap))
 				continue;
 			tempList.append(InstancePtr(instPtr));
 		}
@@ -259,7 +258,7 @@ void FTBPlugin::loadInstances(QMap<QString, QString> &groupMap, QList<InstancePt
 				instPtr->setIntendedVersionId(record.mcVersion);
 			}
 			instPtr->setNotes(record.description);
-			if (!InstanceList::continueProcessInstance(instPtr, InstanceFactory::NoCreateError, record.instanceDir, groupMap))
+			if (!InstanceList::continueProcessInstance(instPtr, InstanceList::NoCreateError, record.instanceDir, groupMap))
 				continue;
 			tempList.append(InstancePtr(instPtr));
 		}
diff --git a/logic/ftb/LegacyFTBInstance.cpp b/logic/ftb/LegacyFTBInstance.cpp
index bbc69e2c..43a9b42a 100644
--- a/logic/ftb/LegacyFTBInstance.cpp
+++ b/logic/ftb/LegacyFTBInstance.cpp
@@ -2,8 +2,8 @@
 #include <logic/settings/INISettingsObject.h>
 #include <QDir>
 
-LegacyFTBInstance::LegacyFTBInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) :
-	LegacyInstance(rootDir, settings, parent)
+LegacyFTBInstance::LegacyFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) :
+	LegacyInstance(globalSettings, settings, rootDir)
 {
 }
 
diff --git a/logic/ftb/LegacyFTBInstance.h b/logic/ftb/LegacyFTBInstance.h
index e67549e1..32e85030 100644
--- a/logic/ftb/LegacyFTBInstance.h
+++ b/logic/ftb/LegacyFTBInstance.h
@@ -6,8 +6,7 @@ class LegacyFTBInstance : public LegacyInstance
 {
 	Q_OBJECT
 public:
-	explicit LegacyFTBInstance(const QString &rootDir, SettingsObject *settings,
-							   QObject *parent = 0);
+	explicit LegacyFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
 	virtual QString getStatusbarDescription();
 	virtual QString id() const;
 	virtual void copy(const QDir &newDir);
diff --git a/logic/ftb/OneSixFTBInstance.cpp b/logic/ftb/OneSixFTBInstance.cpp
index 6d64ddd8..8d290a94 100644
--- a/logic/ftb/OneSixFTBInstance.cpp
+++ b/logic/ftb/OneSixFTBInstance.cpp
@@ -11,8 +11,8 @@
 #include "MultiMC.h"
 #include "pathutils.h"
 
-OneSixFTBInstance::OneSixFTBInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) :
-	OneSixInstance(rootDir, settings, parent)
+OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) :
+	OneSixInstance(globalSettings, settings, rootDir)
 {
 }
 
diff --git a/logic/ftb/OneSixFTBInstance.h b/logic/ftb/OneSixFTBInstance.h
index 4a9521e0..2b0e13d5 100644
--- a/logic/ftb/OneSixFTBInstance.h
+++ b/logic/ftb/OneSixFTBInstance.h
@@ -8,8 +8,7 @@ class OneSixFTBInstance : public OneSixInstance
 {
 	Q_OBJECT
 public:
-	explicit OneSixFTBInstance(const QString &rootDir, SettingsObject *settings,
-							QObject *parent = 0);
+	explicit OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
     virtual ~OneSixFTBInstance(){};
 
 	void copy(const QDir &newDir) override;