diff options
| author | Sky <git@bunnies.cc> | 2013-10-14 02:59:21 +0100 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-10-14 03:00:06 +0100 |
| commit | 40a2456646df96e0dd8731ab78cba920a734a8e3 (patch) | |
| tree | c73b382b68c739ab1605eddc095f0cd9a4ca4cc7 /logic/JavaUtils.h | |
| parent | 0ae8073d41de014beb8fd386cfb4713ad86c4766 (diff) | |
| download | MultiMC-40a2456646df96e0dd8731ab78cba920a734a8e3.tar MultiMC-40a2456646df96e0dd8731ab78cba920a734a8e3.tar.gz MultiMC-40a2456646df96e0dd8731ab78cba920a734a8e3.tar.lz MultiMC-40a2456646df96e0dd8731ab78cba920a734a8e3.tar.xz MultiMC-40a2456646df96e0dd8731ab78cba920a734a8e3.zip | |
Huge Java detection refactor, version dialogs on first run (no JavaPath set) and "auto detect" button
Diffstat (limited to 'logic/JavaUtils.h')
| -rw-r--r-- | logic/JavaUtils.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/logic/JavaUtils.h b/logic/JavaUtils.h index 63daac12..e4f777d0 100644 --- a/logic/JavaUtils.h +++ b/logic/JavaUtils.h @@ -16,29 +16,25 @@ #pragma once #include <QStringList> - +#include <QWidget> +#include <logic/lists/JavaVersionList.h> #include "osutils.h" #if WINDOWS #include <windows.h> #endif -#define JI_ID 0 -#define JI_ARCH 1 -#define JI_PATH 2 -#define JI_REC 3 -typedef std::tuple<QString, QString, QString, bool> java_install; - class JavaUtils { public: JavaUtils(); - std::vector<java_install> FindJavaPaths(); + QList<JavaVersionPtr> FindJavaPaths(); + JavaVersionPtr GetDefaultJava(); private: - std::vector<java_install> GetDefaultJava(); + #if WINDOWS - std::vector<java_install> FindJavaFromRegistryKey(DWORD keyType, QString keyName); + QList<JavaVersionPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName); #endif }; |