From e252f8d84e9b9c69bc02c128be5141407e928117 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 23 Feb 2016 15:43:15 +0300 Subject: Fix compilation with gcc 4.4 or older. --- src/gui/windows/charcreatedialog.cpp | 6 +++--- src/gui/windows/charselectdialog.cpp | 6 +++--- src/gui/windows/chatwindow.cpp | 6 +++--- src/gui/windows/killstats.cpp | 6 +++--- src/gui/windows/ministatuswindow.cpp | 6 +++--- src/gui/windows/quitdialog.cpp | 6 +++--- src/gui/windows/serverdialog.cpp | 6 +++--- src/gui/windows/statuswindow.cpp | 6 +++--- src/gui/windows/whoisonline.cpp | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 6f88b8388..b172f788c 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -823,8 +823,8 @@ void CharCreateDialog::updatePlayer() void CharCreateDialog::keyPressed(KeyEvent &event) { const InputActionT actionId = event.getActionId(); - PRAGMA("GCC diagnostic push") - PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45("GCC diagnostic push") + PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") switch (actionId) { case InputAction::GUI_CANCEL: @@ -836,7 +836,7 @@ void CharCreateDialog::keyPressed(KeyEvent &event) default: break; } - PRAGMA("GCC diagnostic pop") + PRAGMA45("GCC diagnostic pop") } void CharCreateDialog::setButtonsPosition(const int w, const int h) diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 6ecee2257..95bb964d1 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -337,8 +337,8 @@ void CharSelectDialog::use(const int selected) void CharSelectDialog::keyPressed(KeyEvent &event) { const InputActionT actionId = event.getActionId(); - PRAGMA("GCC diagnostic push") - PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45("GCC diagnostic push") + PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") switch (actionId) { case InputAction::GUI_CANCEL: @@ -428,7 +428,7 @@ void CharSelectDialog::keyPressed(KeyEvent &event) default: break; } - PRAGMA("GCC diagnostic pop") + PRAGMA45("GCC diagnostic pop") } /** diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 7a4867441..b4b73ff23 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -979,8 +979,8 @@ void ChatWindow::attributeChanged(const AttributesT id, { if (!mShowBattleEvents) return; - PRAGMA("GCC diagnostic push") - PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45("GCC diagnostic push") + PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") switch (id) { case Attributes::EXP: @@ -1003,7 +1003,7 @@ void ChatWindow::attributeChanged(const AttributesT id, default: break; }; - PRAGMA("GCC diagnostic pop") + PRAGMA45("GCC diagnostic pop") } void ChatWindow::addInputText(const std::string &text, const bool space) diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp index 22d977723..0269f9fcb 100644 --- a/src/gui/windows/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -405,8 +405,8 @@ void KillStats::attributeChanged(const AttributesT id, const int oldVal, const int newVal) { - PRAGMA("GCC diagnostic push") - PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45("GCC diagnostic push") + PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") switch (id) { case Attributes::EXP: @@ -438,5 +438,5 @@ void KillStats::attributeChanged(const AttributesT id, default: break; } - PRAGMA("GCC diagnostic pop") + PRAGMA45("GCC diagnostic pop") } diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 7168846a0..267401707 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -270,8 +270,8 @@ void MiniStatusWindow::attributeChanged(const AttributesT id, const int oldVal A_UNUSED, const int newVal A_UNUSED) { - PRAGMA("GCC diagnostic push") - PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45("GCC diagnostic push") + PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") switch (id) { case Attributes::HP: @@ -296,7 +296,7 @@ void MiniStatusWindow::attributeChanged(const AttributesT id, default: break; } - PRAGMA("GCC diagnostic pop") + PRAGMA45("GCC diagnostic pop") } void MiniStatusWindow::updateStatus() diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index 4049d74fc..cda477346 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -205,8 +205,8 @@ void QuitDialog::keyPressed(KeyEvent &event) const InputActionT actionId = event.getActionId(); int dir = 0; - PRAGMA("GCC diagnostic push") - PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45("GCC diagnostic push") + PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") switch (actionId) { case InputAction::GUI_SELECT: @@ -225,7 +225,7 @@ void QuitDialog::keyPressed(KeyEvent &event) default: break; } - PRAGMA("GCC diagnostic pop") + PRAGMA45("GCC diagnostic pop") if (dir != 0) { diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index b326e2f91..158d5909e 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -310,8 +310,8 @@ void ServerDialog::action(const ActionEvent &event) void ServerDialog::keyPressed(KeyEvent &event) { - PRAGMA("GCC diagnostic push") - PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45("GCC diagnostic push") + PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") switch (event.getActionId()) { case InputAction::GUI_CANCEL: @@ -356,7 +356,7 @@ void ServerDialog::keyPressed(KeyEvent &event) default: break; } - PRAGMA("GCC diagnostic pop") + PRAGMA45("GCC diagnostic pop") if (!event.isConsumed()) mServersList->keyPressed(event); } diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index c2f54bfd1..979da2859 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -309,8 +309,8 @@ void StatusWindow::attributeChanged(const AttributesT id, const int oldVal A_UNUSED, const int newVal) { - PRAGMA("GCC diagnostic push") - PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45("GCC diagnostic push") + PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") switch (id) { case Attributes::HP: @@ -370,7 +370,7 @@ void StatusWindow::attributeChanged(const AttributesT id, default: break; } - PRAGMA("GCC diagnostic pop") + PRAGMA45("GCC diagnostic pop") } void StatusWindow::setPointsNeeded(const AttributesT id, diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index bde463d74..2698ef918 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -565,8 +565,8 @@ int WhoIsOnline::downloadThread(void *ptr) if ((res = curl_easy_perform(curl)) != 0) { wio->mDownloadStatus = UPDATE_ERROR; - PRAGMA("GCC diagnostic push") - PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45("GCC diagnostic push") + PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") switch (res) { case CURLE_COULDNT_CONNECT: @@ -577,7 +577,7 @@ int WhoIsOnline::downloadThread(void *ptr) << url.c_str() << std::endl; break; } - PRAGMA("GCC diagnostic pop") + PRAGMA45("GCC diagnostic pop") attempts++; curl_easy_cleanup(curl); curl_slist_free_all(pHeaders); -- cgit v1.2.3-60-g2f50