From efa8e26a3f3f7ba5e536cd10e86303b4fe1baba0 Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Sat, 15 Feb 2014 14:19:35 +0100
Subject: Profiler support. Currently JProfiler and JVisualVM are implemented.

---
 MultiMC.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'MultiMC.h')

diff --git a/MultiMC.h b/MultiMC.h
index 638a442f..69bfb4a4 100644
--- a/MultiMC.h
+++ b/MultiMC.h
@@ -22,6 +22,7 @@ class UpdateChecker;
 class NotificationChecker;
 class NewsChecker;
 class StatusChecker;
+class BaseProfilerFactory;
 
 #if defined(MMC)
 #undef MMC
@@ -127,6 +128,12 @@ public:
 
 	std::shared_ptr<JavaVersionList> javalist();
 
+	QMap<QString, std::shared_ptr<BaseProfilerFactory>> profilers()
+	{
+		return m_profilers;
+	}
+	std::shared_ptr<BaseProfilerFactory> currentProfiler();
+
 	void installUpdates(const QString updateFilesDir, UpdateFlags flags = None);
 
 	/*!
@@ -198,6 +205,7 @@ private:
 	std::shared_ptr<ForgeVersionList> m_forgelist;
 	std::shared_ptr<MinecraftVersionList> m_minecraftlist;
 	std::shared_ptr<JavaVersionList> m_javalist;
+	QMap<QString, std::shared_ptr<BaseProfilerFactory>> m_profilers;
 	QsLogging::DestinationPtr m_fileDestination;
 	QsLogging::DestinationPtr m_debugDestination;
 
-- 
cgit v1.2.3


From 8219dbf612f4e6f603d304348fc388e364602f98 Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Sat, 15 Feb 2014 22:26:44 +0100
Subject: Underp. Don't depend on OneSix. Nicer "menu" style choosing.

---
 MultiMC.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'MultiMC.h')

diff --git a/MultiMC.h b/MultiMC.h
index 69bfb4a4..854de59b 100644
--- a/MultiMC.h
+++ b/MultiMC.h
@@ -132,7 +132,6 @@ public:
 	{
 		return m_profilers;
 	}
-	std::shared_ptr<BaseProfilerFactory> currentProfiler();
 
 	void installUpdates(const QString updateFilesDir, UpdateFlags flags = None);
 
-- 
cgit v1.2.3


From 616c37269053bc4f111792dbb9374cc119a58339 Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Sun, 16 Feb 2014 10:46:14 +0100
Subject: Fix more stuff. Detached tools, only MCEdit for now.

---
 MultiMC.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'MultiMC.h')

diff --git a/MultiMC.h b/MultiMC.h
index 854de59b..753ab3b4 100644
--- a/MultiMC.h
+++ b/MultiMC.h
@@ -23,6 +23,7 @@ class NotificationChecker;
 class NewsChecker;
 class StatusChecker;
 class BaseProfilerFactory;
+class BaseDetachedToolFactory;
 
 #if defined(MMC)
 #undef MMC
@@ -132,6 +133,10 @@ public:
 	{
 		return m_profilers;
 	}
+	QMap<QString, std::shared_ptr<BaseDetachedToolFactory>> tools()
+	{
+		return m_tools;
+	}
 
 	void installUpdates(const QString updateFilesDir, UpdateFlags flags = None);
 
@@ -205,6 +210,7 @@ private:
 	std::shared_ptr<MinecraftVersionList> m_minecraftlist;
 	std::shared_ptr<JavaVersionList> m_javalist;
 	QMap<QString, std::shared_ptr<BaseProfilerFactory>> m_profilers;
+	QMap<QString, std::shared_ptr<BaseDetachedToolFactory>> m_tools;
 	QsLogging::DestinationPtr m_fileDestination;
 	QsLogging::DestinationPtr m_debugDestination;
 
-- 
cgit v1.2.3