From a008efd24e81441a23ff3e81320ac3522251327e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 2 Jan 2016 00:35:54 +0100 Subject: GH-1365 rework java version parsing and sorting --- application/pages/InstanceSettingsPage.cpp | 6 +++--- application/pages/global/JavaPage.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'application/pages') diff --git a/application/pages/InstanceSettingsPage.cpp b/application/pages/InstanceSettingsPage.cpp index a23d7c22..2922e469 100644 --- a/application/pages/InstanceSettingsPage.cpp +++ b/application/pages/InstanceSettingsPage.cpp @@ -9,7 +9,7 @@ #include "JavaCommon.h" #include "MultiMC.h" -#include +#include #include InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent) @@ -170,7 +170,7 @@ void InstanceSettingsPage::loadSettings() void InstanceSettingsPage::on_javaDetectBtn_clicked() { - JavaVersionPtr java; + JavaInstallPtr java; VersionSelectDialog vselect(MMC->javalist().get(), tr("Select a Java version"), this, true); vselect.setResizeOn(2); @@ -178,7 +178,7 @@ void InstanceSettingsPage::on_javaDetectBtn_clicked() if (vselect.result() == QDialog::Accepted && vselect.selectedVersion()) { - java = std::dynamic_pointer_cast(vselect.selectedVersion()); + java = std::dynamic_pointer_cast(vselect.selectedVersion()); ui->javaPathTextBox->setText(java->path); } } diff --git a/application/pages/global/JavaPage.cpp b/application/pages/global/JavaPage.cpp index 1c33a9ff..82103e23 100644 --- a/application/pages/global/JavaPage.cpp +++ b/application/pages/global/JavaPage.cpp @@ -25,7 +25,7 @@ #include #include "java/JavaUtils.h" -#include "java/JavaVersionList.h" +#include "java/JavaInstallList.h" #include "settings/SettingsObject.h" #include @@ -93,14 +93,14 @@ void JavaPage::loadSettings() void JavaPage::on_javaDetectBtn_clicked() { - JavaVersionPtr java; + JavaInstallPtr java; VersionSelectDialog vselect(MMC->javalist().get(), tr("Select a Java version"), this, true); vselect.exec(); if (vselect.result() == QDialog::Accepted && vselect.selectedVersion()) { - java = std::dynamic_pointer_cast(vselect.selectedVersion()); + java = std::dynamic_pointer_cast(vselect.selectedVersion()); ui->javaPathTextBox->setText(java->path); } } -- cgit v1.2.3