diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-01-02 00:35:54 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-01-02 00:35:54 +0100 |
| commit | a008efd24e81441a23ff3e81320ac3522251327e (patch) | |
| tree | f73886925814cc4cfb397be9f8342f7963d8f8d7 /application/pages | |
| parent | 5f57df81109d268c79b34aac799fc7694ec5882a (diff) | |
| download | MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.tar MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.tar.gz MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.tar.lz MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.tar.xz MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.zip | |
GH-1365 rework java version parsing and sorting
Diffstat (limited to 'application/pages')
| -rw-r--r-- | application/pages/InstanceSettingsPage.cpp | 6 | ||||
| -rw-r--r-- | application/pages/global/JavaPage.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
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 <java/JavaVersionList.h> +#include <java/JavaInstallList.h> #include <FileSystem.h> 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<JavaVersion>(vselect.selectedVersion()); + java = std::dynamic_pointer_cast<JavaInstall>(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 <ColumnResizer.h> #include "java/JavaUtils.h" -#include "java/JavaVersionList.h" +#include "java/JavaInstallList.h" #include "settings/SettingsObject.h" #include <FileSystem.h> @@ -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<JavaVersion>(vselect.selectedVersion()); + java = std::dynamic_pointer_cast<JavaInstall>(vselect.selectedVersion()); ui->javaPathTextBox->setText(java->path); } } |