summaryrefslogtreecommitdiffstats
path: root/gui/dialogs
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-07-01 01:23:49 +0200
committerPetr Mrázek <peterix@gmail.com>2014-07-01 01:23:49 +0200
commit8b86306d48fff4a6cc9291d00e1211a5e5dc1903 (patch)
treec50b3a924821d9cf7f7ac789616fb9b26b8e2690 /gui/dialogs
parentdd0752e69f33c6092a940091b8a332b18e6be76d (diff)
downloadMultiMC-8b86306d48fff4a6cc9291d00e1211a5e5dc1903.tar
MultiMC-8b86306d48fff4a6cc9291d00e1211a5e5dc1903.tar.gz
MultiMC-8b86306d48fff4a6cc9291d00e1211a5e5dc1903.tar.lz
MultiMC-8b86306d48fff4a6cc9291d00e1211a5e5dc1903.tar.xz
MultiMC-8b86306d48fff4a6cc9291d00e1211a5e5dc1903.zip
Handle a bunch more clang warnings
Diffstat (limited to 'gui/dialogs')
-rw-r--r--gui/dialogs/IconPickerDialog.h3
-rw-r--r--gui/dialogs/ProgressDialog.h4
2 files changed, 7 insertions, 0 deletions
diff --git a/gui/dialogs/IconPickerDialog.h b/gui/dialogs/IconPickerDialog.h
index f00c2388..70951da6 100644
--- a/gui/dialogs/IconPickerDialog.h
+++ b/gui/dialogs/IconPickerDialog.h
@@ -29,7 +29,10 @@ class IconPickerDialog : public QDialog
public:
explicit IconPickerDialog(QWidget *parent = 0);
~IconPickerDialog();
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Woverloaded-virtual"
int exec(QString selection);
+ #pragma clang diagnostic pop
QString selectedIconKey;
protected:
diff --git a/gui/dialogs/ProgressDialog.h b/gui/dialogs/ProgressDialog.h
index fe63a826..45a6238a 100644
--- a/gui/dialogs/ProgressDialog.h
+++ b/gui/dialogs/ProgressDialog.h
@@ -34,7 +34,11 @@ public:
void updateSize();
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Woverloaded-virtual"
int exec(ProgressProvider *task);
+ #pragma clang diagnostic pop
+
void setSkipButton(bool present, QString label = QString());
ProgressProvider *getTask();