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/JavaChecker.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/JavaChecker.h')
-rw-r--r-- | logic/JavaChecker.h | 11 |
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); |