From 40a2456646df96e0dd8731ab78cba920a734a8e3 Mon Sep 17 00:00:00 2001
From: Sky <git@bunnies.cc>
Date: Mon, 14 Oct 2013 02:59:21 +0100
Subject: Huge Java detection refactor, version dialogs on first run (no
 JavaPath set) and "auto detect" button

---
 logic/JavaUtils.h | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'logic/JavaUtils.h')

diff --git a/logic/JavaUtils.h b/logic/JavaUtils.h
index 63daac12..e4f777d0 100644
--- a/logic/JavaUtils.h
+++ b/logic/JavaUtils.h
@@ -16,29 +16,25 @@
 #pragma once
 
 #include <QStringList>
-
+#include <QWidget>
+#include <logic/lists/JavaVersionList.h>
 #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();
 
-	std::vector<java_install> FindJavaPaths();
+	QList<JavaVersionPtr> FindJavaPaths();
+	JavaVersionPtr GetDefaultJava();
 
 private:
-	std::vector<java_install> GetDefaultJava();
+
 #if WINDOWS
-	std::vector<java_install> FindJavaFromRegistryKey(DWORD keyType, QString keyName);
+	QList<JavaVersionPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName);
 #endif
 };
-- 
cgit v1.2.3