CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/peterix/MultiMC5

Browse Source
This commit is contained in:
Andrew
2013-03-13 13:25:24 -05:00
parent f0cb300d04 46f93311af
commit 8864c7ebdc
24 changed files with 3585 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmultimc/include/appsettings.h
View File

@ -18,11 +18,11 @@
#include <QObject>
#include <basicsettingsobject.h>
#include <inisettingsobject.h>
#include "libmmc_config.h"
class LIBMULTIMC_EXPORT AppSettings : public BasicSettingsObject
class LIBMULTIMC_EXPORT AppSettings : public INISettingsObject
{
Q_OBJECT
public:

8
libmultimc/include/logintask.h
View File

@ -30,20 +30,20 @@ class LIBMULTIMC_EXPORT LoginTask : public Task
{
Q_OBJECT
public:
explicit LoginTask(const UserInfo& uInfo, QObject *parent = 0);
explicit LoginTask(const UserInfo& uInfo, QString inst, QObject *parent = 0);
public slots:
void processNetReply(QNetworkReply* reply);
signals:
void loginComplete(LoginResponse loginResponse);
void loginFailed(const QString& errorMsg);
void loginComplete(QString inst, LoginResponse loginResponse);
void loginFailed(QString inst, const QString& errorMsg);
protected:
void executeTask();
QNetworkReply* netReply;
QString inst;
UserInfo uInfo;
};