Huge Java detection refactor, version dialogs on first run (no JavaPath set) and "auto detect" button

This commit is contained in:
Sky
2013-10-14 02:59:21 +01:00
parent 0ae8073d41
commit 40a2456646
13 changed files with 421 additions and 50 deletions

View File

@ -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
};