summaryrefslogtreecommitdiff
path: root/src/gui/widgets
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/widgets
parent011d05e7ff9abfc6052951fee954b1c193ea4fff (diff)
downloadmanaverse-3ac81fa84a3d1866c74ccb051c0661329bff774e.tar.gz
manaverse-3ac81fa84a3d1866c74ccb051c0661329bff774e.tar.bz2
manaverse-3ac81fa84a3d1866c74ccb051c0661329bff774e.tar.xz
manaverse-3ac81fa84a3d1866c74ccb051c0661329bff774e.zip
Remove quotes from pragmas.
Diffstat (limited to 'src/gui/widgets')
-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
4 files changed, 15 insertions, 15 deletions
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()