summaryrefslogtreecommitdiffstats
path: root/logic/JavaChecker.h
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-12-11 03:54:39 +0000
committerSky <git@bunnies.cc>2013-12-11 04:54:00 +0000
commitafa5e14e2074343270ff205e042f102c03dface0 (patch)
tree1b72b755c5b7292742b048aec4b4a77af8dec4ac /logic/JavaChecker.h
parentab69c1b9e6c25e92ded4a6ac6774e468a2e08b7b (diff)
downloadMultiMC-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/JavaChecker.h')
-rw-r--r--logic/JavaChecker.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/logic/JavaChecker.h b/logic/JavaChecker.h
index 34782383..4488da66 100644
--- a/logic/JavaChecker.h
+++ b/logic/JavaChecker.h
@@ -3,21 +3,28 @@
#include <QTimer>
#include <memory>
+class JavaChecker;
+
struct JavaCheckResult
{
+ QString path;
QString mojangPlatform;
QString realPlatform;
+ QString javaVersion;
bool valid = false;
bool is_64bit = false;
};
-typedef std::shared_ptr<QProcess> QProcessPtr;
+typedef std::shared_ptr<QProcess> QProcessPtr;
+typedef std::shared_ptr<JavaChecker> JavaCheckerPtr;
class JavaChecker : public QObject
{
Q_OBJECT
public:
explicit JavaChecker(QObject *parent = 0);
- void performCheck(QString path);
+ void performCheck();
+
+ QString path;
signals:
void checkFinished(JavaCheckResult result);