From 856aad9aea556aafd2ddd9645352b81f4cd2af53 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 23 Feb 2016 14:57:20 +0300 Subject: Add pragmas for disable -Wswitch-bool in some places. --- src/gui/windows/charcreatedialog.cpp | 3 +++ src/gui/windows/charselectdialog.cpp | 3 +++ src/gui/windows/chatwindow.cpp | 3 +++ src/gui/windows/killstats.cpp | 3 +++ src/gui/windows/ministatuswindow.cpp | 3 +++ src/gui/windows/quitdialog.cpp | 3 +++ src/gui/windows/serverdialog.cpp | 3 +++ src/gui/windows/statuswindow.cpp | 3 +++ src/gui/windows/whoisonline.cpp | 3 +++ 9 files changed, 27 insertions(+) (limited to 'src/gui/windows') diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index f9500465d..6f88b8388 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -823,6 +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\"") switch (actionId) { case InputAction::GUI_CANCEL: @@ -834,6 +836,7 @@ void CharCreateDialog::keyPressed(KeyEvent &event) default: break; } + PRAGMA("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 19a61cc10..6ecee2257 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -337,6 +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\"") switch (actionId) { case InputAction::GUI_CANCEL: @@ -426,6 +428,7 @@ void CharSelectDialog::keyPressed(KeyEvent &event) default: break; } + PRAGMA("GCC diagnostic pop") } /** diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 6066170d2..7a4867441 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -979,6 +979,8 @@ void ChatWindow::attributeChanged(const AttributesT id, { if (!mShowBattleEvents) return; + PRAGMA("GCC diagnostic push") + PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"") switch (id) { case Attributes::EXP: @@ -1001,6 +1003,7 @@ void ChatWindow::attributeChanged(const AttributesT id, default: break; }; + PRAGMA("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 9a712fd21..22d977723 100644 --- a/src/gui/windows/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -405,6 +405,8 @@ void KillStats::attributeChanged(const AttributesT id, const int oldVal, const int newVal) { + PRAGMA("GCC diagnostic push") + PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"") switch (id) { case Attributes::EXP: @@ -436,4 +438,5 @@ void KillStats::attributeChanged(const AttributesT id, default: break; } + PRAGMA("GCC diagnostic pop") } diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index b8e321dcf..7168846a0 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -270,6 +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\"") switch (id) { case Attributes::HP: @@ -294,6 +296,7 @@ void MiniStatusWindow::attributeChanged(const AttributesT id, default: break; } + PRAGMA("GCC diagnostic pop") } void MiniStatusWindow::updateStatus() diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index ff12795d4..4049d74fc 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -205,6 +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\"") switch (actionId) { case InputAction::GUI_SELECT: @@ -223,6 +225,7 @@ void QuitDialog::keyPressed(KeyEvent &event) default: break; } + PRAGMA("GCC diagnostic pop") if (dir != 0) { diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index b52793f05..b326e2f91 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -310,6 +310,8 @@ void ServerDialog::action(const ActionEvent &event) void ServerDialog::keyPressed(KeyEvent &event) { + PRAGMA("GCC diagnostic push") + PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"") switch (event.getActionId()) { case InputAction::GUI_CANCEL: @@ -354,6 +356,7 @@ void ServerDialog::keyPressed(KeyEvent &event) default: break; } + PRAGMA("GCC diagnostic pop") if (!event.isConsumed()) mServersList->keyPressed(event); } diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 599d8115d..c2f54bfd1 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -309,6 +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\"") switch (id) { case Attributes::HP: @@ -368,6 +370,7 @@ void StatusWindow::attributeChanged(const AttributesT id, default: break; } + PRAGMA("GCC diagnostic pop") } void StatusWindow::setPointsNeeded(const AttributesT id, diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index 3c68adac1..bde463d74 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -565,6 +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\"") switch (res) { case CURLE_COULDNT_CONNECT: @@ -575,6 +577,7 @@ int WhoIsOnline::downloadThread(void *ptr) << url.c_str() << std::endl; break; } + PRAGMA("GCC diagnostic pop") attempts++; curl_easy_cleanup(curl); curl_slist_free_all(pHeaders); -- cgit v1.2.3-60-g2f50