diff options
| author | Andrew <forkk@forkk.net> | 2013-11-04 19:58:56 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-11-04 19:58:56 -0600 |
| commit | 5083a6a8090fa03d3c1800c1f9588079ca11e9f9 (patch) | |
| tree | 7c2e88c7184a7f5acf5e7a03be5c5f0bf6904113 /logic/OneSixUpdate.h | |
| parent | dc3b0fcb2b74aeede37b08216b203cab284f7fce (diff) | |
| parent | bb7e8985f6d189de0acac6a1c3033cb16378c1fb (diff) | |
| download | PrismLauncher-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.gz PrismLauncher-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.bz2 PrismLauncher-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'logic/OneSixUpdate.h')
| -rw-r--r-- | logic/OneSixUpdate.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/logic/OneSixUpdate.h b/logic/OneSixUpdate.h index 7c6fce1b..e5f553c7 100644 --- a/logic/OneSixUpdate.h +++ b/logic/OneSixUpdate.h @@ -3,7 +3,7 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software @@ -18,10 +18,10 @@ #include <QObject> #include <QList> #include <QUrl> -#include "net/NetJob.h" -#include "tasks/Task.h" -#include "BaseUpdate.h" +#include "logic/net/NetJob.h" +#include "logic/tasks/Task.h" +#include "logic/BaseUpdate.h" class MinecraftVersion; class BaseInstance; @@ -32,22 +32,21 @@ class OneSixUpdate : public BaseUpdate public: explicit OneSixUpdate(BaseInstance *inst, QObject *parent = 0); virtual void executeTask(); - -private slots: + +private +slots: void versionFileStart(); void versionFileFinished(); void versionFileFailed(); - + void jarlibStart(); void jarlibFinished(); void jarlibFailed(); - + private: NetJobPtr specificVersionDownloadJob; NetJobPtr jarlibDownloadJob; - + // target version, determined during this task std::shared_ptr<MinecraftVersion> targetVersion; }; - - |