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

NOISSUE eliminate ProgressProvider

Browse Source
This commit is contained in:
Petr Mrázek
2015-04-26 23:04:50 +02:00
parent 84549ed807
commit f8650e3965
32 changed files with 80 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/dialogs/LoginDialog.cpp
View File

@ -44,11 +44,11 @@ void LoginDialog::accept()
// Setup the login task and start it
m_account = MojangAccount::createFromUsername(ui->userTextBox->text());
m_loginTask = m_account->login(nullptr, ui->passTextBox->text());
connect(m_loginTask.get(), &ProgressProvider::failed, this, &LoginDialog::onTaskFailed);
connect(m_loginTask.get(), &ProgressProvider::succeeded, this,
connect(m_loginTask.get(), &Task::failed, this, &LoginDialog::onTaskFailed);
connect(m_loginTask.get(), &Task::succeeded, this,
&LoginDialog::onTaskSucceeded);
connect(m_loginTask.get(), &ProgressProvider::status, this, &LoginDialog::onTaskStatus);
connect(m_loginTask.get(), &ProgressProvider::progress, this, &LoginDialog::onTaskProgress);
connect(m_loginTask.get(), &Task::status, this, &LoginDialog::onTaskStatus);
connect(m_loginTask.get(), &Task::progress, this, &LoginDialog::onTaskProgress);
m_loginTask->start();
}

4
application/dialogs/ProgressDialog.cpp
View File

@ -54,7 +54,7 @@ void ProgressDialog::updateSize()
resize(QSize(480, minimumSizeHint().height()));
}
int ProgressDialog::exec(ProgressProvider *task)
int ProgressDialog::exec(Task *task)
{
this->task = task;
@ -74,7 +74,7 @@ int ProgressDialog::exec(ProgressProvider *task)
return QDialog::Accepted;
}
ProgressProvider *ProgressDialog::getTask()
Task *ProgressDialog::getTask()
{
return task;
}

10
application/dialogs/ProgressDialog.h
View File

@ -17,7 +17,7 @@
#include <QDialog>
class ProgressProvider;
class Task;
namespace Ui
{
@ -34,11 +34,11 @@ public:
void updateSize();
int exec(ProgressProvider *task);
int exec(Task *task);
void setSkipButton(bool present, QString label = QString());
ProgressProvider *getTask();
Task *getTask();
public
slots:
@ -49,7 +49,7 @@ slots:
void changeStatus(const QString &status);
void changeProgress(qint64 current, qint64 total);
private
slots:
void on_skipButton_clicked(bool checked);
@ -61,5 +61,5 @@ protected:
private:
Ui::ProgressDialog *ui;
ProgressProvider *task;
Task *task;
};