diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-05-04 01:20:48 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-05-04 01:20:48 +0200 |
| commit | 1b884d0a9dc28d8bca38fe8756482d991d0ea850 (patch) | |
| tree | fabe4350a3d64123ad0801fe7c285c2150f9562b /application/pages/InstanceSettingsPage.h | |
| parent | 8e9d5f56b592fd0dd0f54e747a835391a775120d (diff) | |
| download | MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.tar MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.tar.gz MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.tar.lz MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.tar.xz MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.zip | |
GH-907 improve Java testing and PermGen deprecation handling
Diffstat (limited to 'application/pages/InstanceSettingsPage.h')
| -rw-r--r-- | application/pages/InstanceSettingsPage.h | 11 |
1 files changed, 6 insertions, 5 deletions
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; }; |