From 17c98655f86f8ea41c4528e3fc25d12388a36861 Mon Sep 17 00:00:00 2001
From: Sky <git@bunnies.cc>
Date: Sun, 6 Oct 2013 19:54:52 +0100
Subject: First draft of multiple Java installation detection on Windows

---
 logic/JavaUtils.h | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'logic/JavaUtils.h')

diff --git a/logic/JavaUtils.h b/logic/JavaUtils.h
index fef2a1bf..63daac12 100644
--- a/logic/JavaUtils.h
+++ b/logic/JavaUtils.h
@@ -17,10 +17,28 @@
 
 #include <QStringList>
 
+#include "osutils.h"
+
+#if WINDOWS
+	#include <windows.h>
+#endif
+
+#define JI_ID 0
+#define JI_ARCH 1
+#define JI_PATH 2
+#define JI_REC 3
+typedef std::tuple<QString, QString, QString, bool> java_install;
+
 class JavaUtils
 {
 public:
 	JavaUtils();
 
-	QStringList FindJavaPath();
+	std::vector<java_install> FindJavaPaths();
+
+private:
+	std::vector<java_install> GetDefaultJava();
+#if WINDOWS
+	std::vector<java_install> FindJavaFromRegistryKey(DWORD keyType, QString keyName);
+#endif
 };
-- 
cgit v1.2.3