diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-20 01:32:38 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-20 01:32:38 +0100 |
| commit | 222d3c0dc5a8b8a9e93b9368e964cda7becc7f02 (patch) | |
| tree | 9ab4538f2e80847874a7c9a5c7c2dbc099cb8cae /logic/OneSixUpdate.h | |
| parent | 48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0 (diff) | |
| parent | 3a3c9ac9515447941d383f2c4fe4b0225fdd8252 (diff) | |
| download | PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.tar.gz PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.tar.bz2 PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.zip | |
Merge branch 'release-0.2'
Diffstat (limited to 'logic/OneSixUpdate.h')
| -rw-r--r-- | logic/OneSixUpdate.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/logic/OneSixUpdate.h b/logic/OneSixUpdate.h index 00b769c7..bc717a94 100644 --- a/logic/OneSixUpdate.h +++ b/logic/OneSixUpdate.h @@ -21,7 +21,6 @@ #include "logic/net/NetJob.h" #include "logic/tasks/Task.h" -#include "logic/JavaChecker.h" class MinecraftVersion; class BaseInstance; @@ -50,10 +49,6 @@ slots: void assetsFinished(); void assetsFailed(); - void checkJavaOnline(); - void checkFinishedOnline(JavaCheckResult result); - void checkFinishedOffline(JavaCheckResult result); - // extract the appropriate libraries void prepareForLaunch(); @@ -65,7 +60,4 @@ private: std::shared_ptr<MinecraftVersion> targetVersion; BaseInstance *m_inst = nullptr; bool m_only_prepare = false; - std::shared_ptr<JavaChecker> checker; - - bool java_is_64bit = false; }; |