diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-07-01 01:23:49 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-07-01 01:23:49 +0200 |
| commit | 8b86306d48fff4a6cc9291d00e1211a5e5dc1903 (patch) | |
| tree | c50b3a924821d9cf7f7ac789616fb9b26b8e2690 /gui | |
| parent | dd0752e69f33c6092a940091b8a332b18e6be76d (diff) | |
| download | MultiMC-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')
| -rw-r--r-- | gui/dialogs/IconPickerDialog.h | 3 | ||||
| -rw-r--r-- | gui/dialogs/ProgressDialog.h | 4 | ||||
| -rw-r--r-- | gui/pages/ScreenshotsPage.h | 2 | ||||
| -rw-r--r-- | gui/pages/VersionPage.cpp | 6 |
4 files changed, 8 insertions, 7 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(); diff --git a/gui/pages/ScreenshotsPage.h b/gui/pages/ScreenshotsPage.h index 4098e5e4..78307f6a 100644 --- a/gui/pages/ScreenshotsPage.h +++ b/gui/pages/ScreenshotsPage.h @@ -27,7 +27,7 @@ namespace Ui class ScreenshotsPage; } -class ScreenShot; +struct ScreenShot; class ScreenshotList; class ImgurAlbumCreation; diff --git a/gui/pages/VersionPage.cpp b/gui/pages/VersionPage.cpp index 34599111..d3df5b46 100644 --- a/gui/pages/VersionPage.cpp +++ b/gui/pages/VersionPage.cpp @@ -214,10 +214,7 @@ void VersionPage::on_moveLibraryUpBtn_clicked() try { const int row = ui->libraryTreeView->selectionModel()->selectedRows().first().row(); - const int newRow = 0; m_version->move(row, InstanceVersion::MoveUp); - // ui->libraryTreeView->selectionModel()->setCurrentIndex(m_version->index(newRow), - // QItemSelectionModel::ClearAndSelect); } catch (MMCError &e) { @@ -234,10 +231,7 @@ void VersionPage::on_moveLibraryDownBtn_clicked() try { const int row = ui->libraryTreeView->selectionModel()->selectedRows().first().row(); - const int newRow = 0; m_version->move(row, InstanceVersion::MoveDown); - // ui->libraryTreeView->selectionModel()->setCurrentIndex(m_version->index(newRow), - // QItemSelectionModel::ClearAndSelect); } catch (MMCError &e) { |