diff options
| author | Sky <git@bunnies.cc> | 2013-12-11 03:54:39 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-12-11 04:54:00 +0000 |
| commit | afa5e14e2074343270ff205e042f102c03dface0 (patch) | |
| tree | 1b72b755c5b7292742b048aec4b4a77af8dec4ac /logic/JavaUtils.h | |
| parent | ab69c1b9e6c25e92ded4a6ac6774e468a2e08b7b (diff) | |
| download | MultiMC-afa5e14e2074343270ff205e042f102c03dface0.tar MultiMC-afa5e14e2074343270ff205e042f102c03dface0.tar.gz MultiMC-afa5e14e2074343270ff205e042f102c03dface0.tar.lz MultiMC-afa5e14e2074343270ff205e042f102c03dface0.tar.xz MultiMC-afa5e14e2074343270ff205e042f102c03dface0.zip | |
Better (but unsorted) Java detection
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); |