From afa5e14e2074343270ff205e042f102c03dface0 Mon Sep 17 00:00:00 2001
From: Sky <git@bunnies.cc>
Date: Wed, 11 Dec 2013 03:54:39 +0000
Subject: Better (but unsorted) Java detection

---
 logic/JavaChecker.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'logic/JavaChecker.h')

diff --git a/logic/JavaChecker.h b/logic/JavaChecker.h
index 34782383..4488da66 100644
--- a/logic/JavaChecker.h
+++ b/logic/JavaChecker.h
@@ -3,21 +3,28 @@
 #include <QTimer>
 #include <memory>
 
+class JavaChecker;
+
 struct JavaCheckResult
 {
+	QString path;
 	QString mojangPlatform;
 	QString realPlatform;
+	QString javaVersion;
 	bool valid = false;
 	bool is_64bit = false;
 };
-typedef std::shared_ptr<QProcess> QProcessPtr;
 
+typedef std::shared_ptr<QProcess> QProcessPtr;
+typedef std::shared_ptr<JavaChecker> JavaCheckerPtr;
 class JavaChecker : public QObject
 {
 	Q_OBJECT
 public:
 	explicit JavaChecker(QObject *parent = 0);
-	void performCheck(QString path);
+	void performCheck();
+
+	QString path;
 
 signals:
 	void checkFinished(JavaCheckResult result);
-- 
cgit v1.2.3