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 /logic/java/JavaUtils.cpp | |
| 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 'logic/java/JavaUtils.cpp')
| -rw-r--r-- | logic/java/JavaUtils.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/logic/java/JavaUtils.cpp b/logic/java/JavaUtils.cpp index 7c3cc2a1..9dfb7897 100644 --- a/logic/java/JavaUtils.cpp +++ b/logic/java/JavaUtils.cpp @@ -23,15 +23,15 @@ #include <QDebug> #include "java/JavaUtils.h" #include "java/JavaCheckerJob.h" -#include "java/JavaVersionList.h" +#include "java/JavaInstallList.h" JavaUtils::JavaUtils() { } -JavaVersionPtr JavaUtils::MakeJavaPtr(QString path, QString id, QString arch) +JavaInstallPtr JavaUtils::MakeJavaPtr(QString path, QString id, QString arch) { - JavaVersionPtr javaVersion(new JavaVersion()); + JavaInstallPtr javaVersion(new JavaInstall()); javaVersion->id = id; javaVersion->arch = arch; @@ -40,9 +40,9 @@ JavaVersionPtr JavaUtils::MakeJavaPtr(QString path, QString id, QString arch) return javaVersion; } -JavaVersionPtr JavaUtils::GetDefaultJava() +JavaInstallPtr JavaUtils::GetDefaultJava() { - JavaVersionPtr javaVersion(new JavaVersion()); + JavaInstallPtr javaVersion(new JavaInstall()); javaVersion->id = "java"; javaVersion->arch = "unknown"; @@ -52,9 +52,9 @@ JavaVersionPtr JavaUtils::GetDefaultJava() } #if WINDOWS -QList<JavaVersionPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString keyName) +QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString keyName) { - QList<JavaVersionPtr> javas; + QList<JavaInstallPtr> javas; QString archType = "unknown"; if (keyType == KEY_WOW64_64KEY) @@ -114,7 +114,7 @@ QList<JavaVersionPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString &valueSz); // Now, we construct the version object and add it to the list. - JavaVersionPtr javaVersion(new JavaVersion()); + JavaInstallPtr javaVersion(new JavaInstall()); javaVersion->id = subKeyName; javaVersion->arch = archType; @@ -137,15 +137,15 @@ QList<JavaVersionPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString QList<QString> JavaUtils::FindJavaPaths() { - QList<JavaVersionPtr> java_candidates; + QList<JavaInstallPtr> java_candidates; - QList<JavaVersionPtr> JRE64s = this->FindJavaFromRegistryKey( + QList<JavaInstallPtr> JRE64s = this->FindJavaFromRegistryKey( KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment"); - QList<JavaVersionPtr> JDK64s = this->FindJavaFromRegistryKey( + QList<JavaInstallPtr> JDK64s = this->FindJavaFromRegistryKey( KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Development Kit"); - QList<JavaVersionPtr> JRE32s = this->FindJavaFromRegistryKey( + QList<JavaInstallPtr> JRE32s = this->FindJavaFromRegistryKey( KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment"); - QList<JavaVersionPtr> JDK32s = this->FindJavaFromRegistryKey( + QList<JavaInstallPtr> JDK32s = this->FindJavaFromRegistryKey( KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit"); java_candidates.append(JRE64s); @@ -159,7 +159,7 @@ QList<QString> JavaUtils::FindJavaPaths() java_candidates.append(MakeJavaPtr(this->GetDefaultJava()->path)); QList<QString> candidates; - for(JavaVersionPtr java_candidate : java_candidates) + for(JavaInstallPtr java_candidate : java_candidates) { if(!candidates.contains(java_candidate->path)) { |