From a30a9559c749446165ec84e737fe85b44a462584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 18 Dec 2014 02:48:14 +0100
Subject: NOISSUE Fix jar mods for OnesSix

---
 MultiMC.cpp | 31 -------------------------------
 1 file changed, 31 deletions(-)

(limited to 'MultiMC.cpp')

diff --git a/MultiMC.cpp b/MultiMC.cpp
index 9798bfb7..f07fe765 100644
--- a/MultiMC.cpp
+++ b/MultiMC.cpp
@@ -25,7 +25,6 @@
 
 #include "logic/status/StatusChecker.h"
 
-#include "logic/InstanceLauncher.h"
 #include "logic/net/HttpMetaCache.h"
 #include "logic/net/URLConstants.h"
 
@@ -38,8 +37,6 @@
 #include "logic/tools/JVisualVM.h"
 #include "logic/tools/MCEditTool.h"
 
-#include "logic/URNResolver.h"
-
 #include "pathutils.h"
 #include "cmdutils.h"
 #include "logic/settings/INISettingsObject.h"
@@ -83,13 +80,6 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar
 		parser.addShortOpt("dir", 'd');
 		parser.addDocumentation("dir", "use the supplied directory as MultiMC root instead of "
 									   "the binary location (use '.' for current)");
-		// WARNING: disabled until further notice
-		/*
-		// --launch
-		parser.addOption("launch");
-		parser.addShortOpt("launch", 'l');
-		parser.addDocumentation("launch", "tries to launch the given instance", "<inst>");
-*/
 
 		// parse the arguments
 		try
@@ -266,18 +256,6 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar
 		tool->registerSettings(m_settings);
 	}
 
-	// launch instance, if that's what should be done
-	// WARNING: disabled until further notice
-	/*
-	if (!args["launch"].isNull())
-	{
-		if (InstanceLauncher(args["launch"].toString()).launch())
-			m_status = MultiMC::Succeeded;
-		else
-			m_status = MultiMC::Failed;
-		return;
-	}
-*/
 	connect(this, SIGNAL(aboutToQuit()), SLOT(onExit()));
 	m_status = MultiMC::Initialized;
 }
@@ -704,15 +682,6 @@ std::shared_ptr<JavaVersionList> MultiMC::javalist()
 	return m_javalist;
 }
 
-std::shared_ptr<URNResolver> MultiMC::resolver()
-{
-	if (!m_resolver)
-	{
-		m_resolver.reset(new URNResolver());
-	}
-	return m_resolver;
-}
-
 void MultiMC::installUpdates(const QString updateFilesDir, UpdateFlags flags)
 {
 	// if we are going to update on exit, save the params now
-- 
cgit v1.2.3