From 1b884d0a9dc28d8bca38fe8756482d991d0ea850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 4 May 2015 01:20:48 +0200
Subject: GH-907 improve Java testing and PermGen deprecation handling

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

(limited to 'logic/java/JavaChecker.h')

diff --git a/logic/java/JavaChecker.h b/logic/java/JavaChecker.h
index e19895f7..29598aa4 100644
--- a/logic/java/JavaChecker.h
+++ b/logic/java/JavaChecker.h
@@ -12,6 +12,7 @@ struct JavaCheckResult
 	QString mojangPlatform;
 	QString realPlatform;
 	QString javaVersion;
+	QString stderr;
 	bool valid = false;
 	bool is_64bit = false;
 	int id;
@@ -26,17 +27,25 @@ public:
 	explicit JavaChecker(QObject *parent = 0);
 	void performCheck();
 
-	QString path;
-	int id;
+	QString m_path;
+	QString m_args;
+	int m_id = 0;
+	int m_minMem = 0;
+	int m_maxMem = 0;
+	int m_permGen = 64;
 
 signals:
 	void checkFinished(JavaCheckResult result);
 private:
 	QProcessPtr process;
 	QTimer killTimer;
+	QString m_stdout;
+	QString m_stderr;
 public
 slots:
 	void timeout();
 	void finished(int exitcode, QProcess::ExitStatus);
 	void error(QProcess::ProcessError);
+	void stdoutReady();
+	void stderrReady();
 };
-- 
cgit v1.2.3