diff options
| author | Sky <git@bunnies.cc> | 2013-11-06 17:02:23 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-11-06 17:02:23 +0000 |
| commit | 7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a (patch) | |
| tree | 2753d1ee11dad2cf1c4ce1e8a28ead92214f2f1c /logic/net/LoginTask.h | |
| parent | dc3b0fcb2b74aeede37b08216b203cab284f7fce (diff) | |
| parent | bba4ed5ab2c98c3d60a141d6a089a49716753615 (diff) | |
| download | PrismLauncher-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.gz PrismLauncher-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.bz2 PrismLauncher-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.zip | |
Merge branch 'develop'
Diffstat (limited to 'logic/net/LoginTask.h')
| -rw-r--r-- | logic/net/LoginTask.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/logic/net/LoginTask.h b/logic/net/LoginTask.h index aa925999..26ac0808 100644 --- a/logic/net/LoginTask.h +++ b/logic/net/LoginTask.h @@ -45,7 +45,8 @@ public: return result; } -protected slots: +protected +slots: void legacyLogin(); void processLegacyReply(QNetworkReply *reply); void parseLegacyReply(QByteArray data); @@ -56,7 +57,8 @@ protected slots: void parseYggdrasilReply(QByteArray data); QString parseYggdrasilError(QNetworkReply *reply); - void processReply(QNetworkReply *reply, std::function<void(LoginTask*, QByteArray)>, std::function<QString(LoginTask*, QNetworkReply*)>); + void processReply(QNetworkReply *reply, std::function<void(LoginTask *, QByteArray)>, + std::function<QString(LoginTask *, QNetworkReply *)>); protected: void executeTask(); |