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

---
 application/pages/InstanceSettingsPage.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'application/pages/InstanceSettingsPage.h')

diff --git a/application/pages/InstanceSettingsPage.h b/application/pages/InstanceSettingsPage.h
index 60cc1898..55ae69db 100644
--- a/application/pages/InstanceSettingsPage.h
+++ b/application/pages/InstanceSettingsPage.h
@@ -19,7 +19,9 @@
 
 #include "java/JavaChecker.h"
 #include "BaseInstance.h"
+#include <QObjectPtr.h>
 #include "BasePage.h"
+#include "JavaCommon.h"
 #include "MultiMC.h"
 
 class JavaChecker;
@@ -53,21 +55,20 @@ public:
 		return "Instance-settings";
 	}
 	virtual bool shouldDisplay() const;
+
 private slots:
 	void on_javaDetectBtn_clicked();
-
 	void on_javaTestBtn_clicked();
-
 	void on_javaBrowseBtn_clicked();
 
-	void checkFinished(JavaCheckResult result);
-
 	void applySettings();
 	void loadSettings();
 
+	void checkerFinished();
+
 private:
 	Ui::InstanceSettingsPage *ui;
 	BaseInstance *m_instance;
 	SettingsObject *m_settings;
-	std::shared_ptr<JavaChecker> checker;
+	QObjectPtr<JavaCommon::TestCheck> checker;
 };
-- 
cgit v1.2.3