summaryrefslogtreecommitdiffstats
path: root/application/dialogs/ProgressDialog.h
diff options
context:
space:
mode:
authorThomas Groman <tgroman@nuegia.net>2019-09-19 00:41:48 -0700
committerThomas Groman <tgroman@nuegia.net>2019-09-19 00:41:48 -0700
commit32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (patch)
tree7be7a2f602e6a5af7bc2db86bef9cf2a659c3d3d /application/dialogs/ProgressDialog.h
parent5fb2c6334e7d5237db11695b4c0ec0f2d1e47c88 (diff)
downloadMultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.gz
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.lz
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.xz
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.zip
merged from 0.6.7 codebase
Diffstat (limited to 'application/dialogs/ProgressDialog.h')
-rw-r--r--application/dialogs/ProgressDialog.h42
1 files changed, 21 insertions, 21 deletions
diff --git a/application/dialogs/ProgressDialog.h b/application/dialogs/ProgressDialog.h
index f27b71e1..a3779e3f 100644
--- a/application/dialogs/ProgressDialog.h
+++ b/application/dialogs/ProgressDialog.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,45 +27,45 @@ class ProgressDialog;
class ProgressDialog : public QDialog
{
- Q_OBJECT
+ Q_OBJECT
public:
- explicit ProgressDialog(QWidget *parent = 0);
- ~ProgressDialog();
+ explicit ProgressDialog(QWidget *parent = 0);
+ ~ProgressDialog();
- void updateSize();
+ void updateSize();
- int execWithTask(Task *task);
- int execWithTask(std::unique_ptr<Task> &&task);
- int execWithTask(std::unique_ptr<Task> &task);
+ int execWithTask(Task *task);
+ int execWithTask(std::unique_ptr<Task> &&task);
+ int execWithTask(std::unique_ptr<Task> &task);
- void setSkipButton(bool present, QString label = QString());
+ void setSkipButton(bool present, QString label = QString());
- Task *getTask();
+ Task *getTask();
public
slots:
- void onTaskStarted();
- void onTaskFailed(QString failure);
- void onTaskSucceeded();
+ void onTaskStarted();
+ void onTaskFailed(QString failure);
+ void onTaskSucceeded();
- void changeStatus(const QString &status);
- void changeProgress(qint64 current, qint64 total);
+ void changeStatus(const QString &status);
+ void changeProgress(qint64 current, qint64 total);
private
slots:
- void on_skipButton_clicked(bool checked);
+ void on_skipButton_clicked(bool checked);
protected:
- virtual void keyPressEvent(QKeyEvent *e);
- virtual void closeEvent(QCloseEvent *e);
+ virtual void keyPressEvent(QKeyEvent *e);
+ virtual void closeEvent(QCloseEvent *e);
private:
- bool handleImmediateResult(QDialog::DialogCode &result);
+ bool handleImmediateResult(QDialog::DialogCode &result);
private:
- Ui::ProgressDialog *ui;
+ Ui::ProgressDialog *ui;
- Task *task;
+ Task *task;
};