diff options
| author | Andrew <forkk@forkk.net> | 2013-11-20 18:31:15 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-11-20 18:31:15 -0600 |
| commit | abf8408911c057d8aafe90790f5d2f5de0e1d97c (patch) | |
| tree | b6b77a485702c0a7ac45b5b96d6b8b0f41c14af7 /gui/MainWindow.h | |
| parent | 03652b01d2ec8a7c54fb39dd8ed660f0bbc2fa2a (diff) | |
| download | MultiMC-abf8408911c057d8aafe90790f5d2f5de0e1d97c.tar MultiMC-abf8408911c057d8aafe90790f5d2f5de0e1d97c.tar.gz MultiMC-abf8408911c057d8aafe90790f5d2f5de0e1d97c.tar.lz MultiMC-abf8408911c057d8aafe90790f5d2f5de0e1d97c.tar.xz MultiMC-abf8408911c057d8aafe90790f5d2f5de0e1d97c.zip | |
Nuke and pave the old login system
Also, account list now saves profile lists.
Diffstat (limited to 'gui/MainWindow.h')
| -rw-r--r-- | gui/MainWindow.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gui/MainWindow.h b/gui/MainWindow.h index b89aab7c..c0fcc385 100644 --- a/gui/MainWindow.h +++ b/gui/MainWindow.h @@ -21,6 +21,8 @@ #include "logic/net/LoginTask.h" #include "logic/BaseInstance.h" +#include "logic/auth/MojangAccount.h" + class QToolButton; class LabeledToolButton; class QLabel; @@ -104,8 +106,12 @@ slots: void on_actionEditInstNotes_triggered(); void doLogin(const QString &errorMsg = ""); - void doLogin(QString username, QString password); - void doAutoLogin(); + + /*! + * Launches the given instance with the given account. + * This function assumes that the given account has a valid, usable access token. + */ + void launchInstance(BaseInstance* instance, MojangAccountPtr account); void onLoginComplete(); @@ -137,8 +143,6 @@ slots: void startTask(Task *task); - void launchInstance(BaseInstance *inst, LoginResponse response); - protected: bool eventFilter(QObject *obj, QEvent *ev); void setCatBackground(bool enabled); |