diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-11 08:39:35 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-11 08:39:35 +0100 |
| commit | 26a7544325f8fd8939567b270bde9ad1db465f9f (patch) | |
| tree | a901f9bee1cb6ff019b95fa2776b0dd3be1b45c3 /logic/JavaUtils.h | |
| parent | bace3c2eab1effd556ab2c704b26220312e05eb3 (diff) | |
| parent | afa5e14e2074343270ff205e042f102c03dface0 (diff) | |
| download | MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar.gz MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar.lz MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar.xz MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.zip | |
Merge https://github.com/Drayshak/MultiMC5 into develop
Diffstat (limited to 'logic/JavaUtils.h')
| -rw-r--r-- | logic/JavaUtils.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/logic/JavaUtils.h b/logic/JavaUtils.h index 44f576b4..d056cbbe 100644 --- a/logic/JavaUtils.h +++ b/logic/JavaUtils.h @@ -19,21 +19,23 @@ #include <QWidget> #include <osutils.h> - -#include "logic/lists/JavaVersionList.h" +#include "JavaCheckerJob.h" +#include "JavaChecker.h" +#include "lists/JavaVersionList.h" #if WINDOWS #include <windows.h> #endif -class JavaUtils +class JavaUtils : public QObject { + Q_OBJECT public: JavaUtils(); + JavaVersionPtr MakeJavaPtr(QString path, QString id = "unknown", QString arch = "unknown"); QList<JavaVersionPtr> FindJavaPaths(); JavaVersionPtr GetDefaultJava(); -private: #if WINDOWS QList<JavaVersionPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName); |