summaryrefslogtreecommitdiffstats
path: root/gui/MainWindow.h
diff options
context:
space:
mode:
Diffstat (limited to 'gui/MainWindow.h')
-rw-r--r--gui/MainWindow.h12
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);