summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-05 17:10:59 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-05 17:27:52 +0300
commit3ac81fa84a3d1866c74ccb051c0661329bff774e (patch)
tree4226baddf64a667a2f2d77d445b894fe7bb29578 /src/gui
parent011d05e7ff9abfc6052951fee954b1c193ea4fff (diff)
downloadmv-3ac81fa84a3d1866c74ccb051c0661329bff774e.tar.gz
mv-3ac81fa84a3d1866c74ccb051c0661329bff774e.tar.bz2
mv-3ac81fa84a3d1866c74ccb051c0661329bff774e.tar.xz
mv-3ac81fa84a3d1866c74ccb051c0661329bff774e.zip
Remove quotes from pragmas.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/sdlinput.cpp12
-rw-r--r--src/gui/widgets/dropdown.cpp6
-rw-r--r--src/gui/widgets/tabs/setup_colors.cpp6
-rw-r--r--src/gui/widgets/textbox.cpp6
-rw-r--r--src/gui/widgets/textfield.cpp12
-rw-r--r--src/gui/windows/charcreatedialog.cpp6
-rw-r--r--src/gui/windows/charselectdialog.cpp6
-rw-r--r--src/gui/windows/chatwindow.cpp6
-rw-r--r--src/gui/windows/killstats.cpp6
-rw-r--r--src/gui/windows/ministatuswindow.cpp6
-rw-r--r--src/gui/windows/quitdialog.cpp6
-rw-r--r--src/gui/windows/serverdialog.cpp6
-rw-r--r--src/gui/windows/statuswindow.cpp6
-rw-r--r--src/gui/windows/whoisonline.cpp6
14 files changed, 48 insertions, 48 deletions
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index 7b0d7dca9..3dfa5d6d6 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -333,8 +333,8 @@ int SDLInput::convertKeyCharacter(const SDL_Event &event)
int value = keysym.unicode;
#endif
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45(GCC diagnostic push)
+ PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
switch (keysym.sym)
{
case SDLK_TAB:
@@ -496,12 +496,12 @@ int SDLInput::convertKeyCharacter(const SDL_Event &event)
default:
break;
}
- PRAGMA45("GCC diagnostic pop")
+ PRAGMA45(GCC diagnostic pop)
if (!(CAST_U32(keysym.mod) & KMOD_NUM))
{
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45(GCC diagnostic push)
+ PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
switch (keysym.sym)
{
case SDLK_KP0:
@@ -537,7 +537,7 @@ int SDLInput::convertKeyCharacter(const SDL_Event &event)
default:
break;
}
- PRAGMA45("GCC diagnostic pop")
+ PRAGMA45(GCC diagnostic pop)
}
return value;
}
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 05ca7124f..6e6d56652 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -334,8 +334,8 @@ void DropDown::keyPressed(KeyEvent& event)
return;
const InputActionT actionId = event.getActionId();
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45(GCC diagnostic push)
+ PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
switch (actionId)
{
case InputAction::GUI_SELECT:
@@ -366,7 +366,7 @@ void DropDown::keyPressed(KeyEvent& event)
default:
return;
}
- PRAGMA45("GCC diagnostic pop")
+ PRAGMA45(GCC diagnostic pop)
event.consume();
}
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index d2f51afe5..d4440d0f1 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -288,8 +288,8 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED)
// probably need combite both switches and add all mssing color ids.
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45(GCC diagnostic push)
+ PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
switch (type)
{
case UserColorId::AIR_COLLISION_HIGHLIGHT:
@@ -364,7 +364,7 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED)
mGradDelaySlider->setScale(20, 100);
break;
}
- PRAGMA45("GCC diagnostic pop")
+ PRAGMA45(GCC diagnostic pop)
if (grad != GradientType::STATIC && grad != GradientType::PULSE)
{ // If nonstatic color, don't display the current, but the committed
// color at the sliders
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index 91218d41a..c9720072f 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -259,8 +259,8 @@ void TextBox::keyPressed(KeyEvent& event)
const Key &key = event.getKey();
const InputActionT action = event.getActionId();
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45(GCC diagnostic push)
+ PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
switch (action)
{
case InputAction::GUI_LEFT:
@@ -434,7 +434,7 @@ void TextBox::keyPressed(KeyEvent& event)
break;
}
}
- PRAGMA45("GCC diagnostic pop")
+ PRAGMA45(GCC diagnostic pop)
adjustSize();
scrollToCaret();
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index d02cd2541..9f64b56cd 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -398,8 +398,8 @@ void TextField::keyPressed(KeyEvent &event)
bool TextField::handleNormalKeys(const InputActionT action, bool &consumed)
{
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45(GCC diagnostic push)
+ PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
switch (action)
{
case InputAction::GUI_LEFT:
@@ -479,14 +479,14 @@ bool TextField::handleNormalKeys(const InputActionT action, bool &consumed)
default:
break;
}
- PRAGMA45("GCC diagnostic pop")
+ PRAGMA45(GCC diagnostic pop)
return true;
}
void TextField::handleCtrlKeys(const InputActionT action, bool &consumed)
{
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45(GCC diagnostic push)
+ PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
switch (action)
{
case InputAction::GUI_LEFT:
@@ -577,7 +577,7 @@ void TextField::handleCtrlKeys(const InputActionT action, bool &consumed)
default:
break;
}
- PRAGMA45("GCC diagnostic pop")
+ PRAGMA45(GCC diagnostic pop)
}
void TextField::moveCaretBack()
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 028e8cbab..01132aa86 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -825,8 +825,8 @@ void CharCreateDialog::updatePlayer()
void CharCreateDialog::keyPressed(KeyEvent &event)
{
const InputActionT actionId = event.getActionId();
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45(GCC diagnostic push)
+ PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
switch (actionId)
{
case InputAction::GUI_CANCEL:
@@ -838,7 +838,7 @@ void CharCreateDialog::keyPressed(KeyEvent &event)
default:
break;
}
- PRAGMA45("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 95bb964d1..c71d0eb52 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();
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("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;
}
- PRAGMA45("GCC diagnostic pop")
+ PRAGMA45(GCC diagnostic pop)
}
/**
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index fe20fe935..b3a0ced78 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -994,8 +994,8 @@ void ChatWindow::attributeChanged(const AttributesT id,
{
if (!mShowBattleEvents)
return;
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45(GCC diagnostic push)
+ PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
switch (id)
{
case Attributes::EXP:
@@ -1018,7 +1018,7 @@ void ChatWindow::attributeChanged(const AttributesT id,
default:
break;
};
- PRAGMA45("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 0269f9fcb..0be2044ae 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)
{
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("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;
}
- PRAGMA45("GCC diagnostic pop")
+ PRAGMA45(GCC diagnostic pop)
}
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index 6dd427a98..6bf43d216 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)
{
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("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;
}
- PRAGMA45("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 cda477346..c1901c5a2 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;
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("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;
}
- PRAGMA45("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 f03d28f03..dac370887 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -306,8 +306,8 @@ void ServerDialog::action(const ActionEvent &event)
void ServerDialog::keyPressed(KeyEvent &event)
{
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45(GCC diagnostic push)
+ PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
switch (event.getActionId())
{
case InputAction::GUI_CANCEL:
@@ -352,7 +352,7 @@ void ServerDialog::keyPressed(KeyEvent &event)
default:
break;
}
- PRAGMA45("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 e2c65f827..cc50c719e 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -310,8 +310,8 @@ void StatusWindow::attributeChanged(const AttributesT id,
const int oldVal A_UNUSED,
const int newVal)
{
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45(GCC diagnostic push)
+ PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
switch (id)
{
case Attributes::HP:
@@ -371,7 +371,7 @@ void StatusWindow::attributeChanged(const AttributesT id,
default:
break;
}
- PRAGMA45("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 2698ef918..0bc7e3703 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;
- PRAGMA45("GCC diagnostic push")
- PRAGMA45("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;
}
- PRAGMA45("GCC diagnostic pop")
+ PRAGMA45(GCC diagnostic pop)
attempts++;
curl_easy_cleanup(curl);
curl_slist_free_all(pHeaders);