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.h | |
| 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.h')
| -rw-r--r-- | logic/java/JavaUtils.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/logic/java/JavaUtils.h b/logic/java/JavaUtils.h index 78693b37..b671d0a5 100644 --- a/logic/java/JavaUtils.h +++ b/logic/java/JavaUtils.h @@ -20,7 +20,7 @@ #include "JavaCheckerJob.h" #include "JavaChecker.h" -#include "JavaVersionList.h" +#include "JavaInstallList.h" #ifdef Q_OS_WIN #include <windows.h> @@ -34,11 +34,11 @@ class MULTIMC_LOGIC_EXPORT JavaUtils : public QObject public: JavaUtils(); - JavaVersionPtr MakeJavaPtr(QString path, QString id = "unknown", QString arch = "unknown"); + JavaInstallPtr MakeJavaPtr(QString path, QString id = "unknown", QString arch = "unknown"); QList<QString> FindJavaPaths(); - JavaVersionPtr GetDefaultJava(); + JavaInstallPtr GetDefaultJava(); #ifdef Q_OS_WIN - QList<JavaVersionPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName); + QList<JavaInstallPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName); #endif }; |