External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-24 04:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict again

Browse Source
This commit is contained in:
Sebastian-byte
2021-09-12 20:52:56 -05:00
parent 4297eb6389 e2355eb276
commit 871c5b5e38
18 changed files with 83 additions and 970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
launcher/dialogs/LoginDialog.h
View File

@@ -19,7 +19,7 @@
#include <QtWidgets/QRadioButton>
#include <QtCore/QEventLoop>
#include "minecraft/auth/Account.h"
#include "minecraft/auth/MinecraftAccount.h"
namespace Ui
{
@@ -33,7 +33,7 @@ class LoginDialog : public QDialog
public:
~LoginDialog();
static AccountPtr newAccount(QWidget *parent, QString message);
static MinecraftAccountPtr newAccount(QWidget *parent, QString message);
private:
explicit LoginDialog(QWidget *parent = 0);
@@ -54,7 +54,6 @@ slots:
private:
Ui::LoginDialog *ui;
AccountPtr m_account;
QMap<QString, QRadioButton*> m_radioButtons;
MinecraftAccountPtr m_account;
std::shared_ptr<Task> m_loginTask;
};