From f8650e3965582a57c3d0ccb5f234e6229051b16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 26 Apr 2015 23:04:50 +0200 Subject: NOISSUE eliminate ProgressProvider --- application/dialogs/LoginDialog.cpp | 8 ++++---- application/dialogs/ProgressDialog.cpp | 4 ++-- application/dialogs/ProgressDialog.h | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'application/dialogs') diff --git a/application/dialogs/LoginDialog.cpp b/application/dialogs/LoginDialog.cpp index 3af5c702..7e0f7df8 100644 --- a/application/dialogs/LoginDialog.cpp +++ b/application/dialogs/LoginDialog.cpp @@ -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(); } diff --git a/application/dialogs/ProgressDialog.cpp b/application/dialogs/ProgressDialog.cpp index 61ebaa28..9a437d7a 100644 --- a/application/dialogs/ProgressDialog.cpp +++ b/application/dialogs/ProgressDialog.cpp @@ -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; } diff --git a/application/dialogs/ProgressDialog.h b/application/dialogs/ProgressDialog.h index d5153680..fb80d0ce 100644 --- a/application/dialogs/ProgressDialog.h +++ b/application/dialogs/ProgressDialog.h @@ -17,7 +17,7 @@ #include -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; }; -- cgit v1.2.3