summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-23 15:43:15 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-23 15:43:33 +0300
commite252f8d84e9b9c69bc02c128be5141407e928117 (patch)
treef42c3865f9aaecac710c029dcc8976887aa38d82 /src/gui/widgets
parent00d118d22446b52fd7453d934869996b32693c71 (diff)
downloadmanaplus-e252f8d84e9b9c69bc02c128be5141407e928117.tar.gz
manaplus-e252f8d84e9b9c69bc02c128be5141407e928117.tar.bz2
manaplus-e252f8d84e9b9c69bc02c128be5141407e928117.tar.xz
manaplus-e252f8d84e9b9c69bc02c128be5141407e928117.zip
Fix compilation with gcc 4.4 or older.
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 9648b97c0..c4c15a303 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -332,8 +332,8 @@ void DropDown::keyPressed(KeyEvent& event)
return;
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_SELECT:
@@ -364,7 +364,7 @@ void DropDown::keyPressed(KeyEvent& event)
default:
return;
}
- PRAGMA("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 8235aab2b..d2f51afe5 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.
- PRAGMA("GCC diagnostic push")
- PRAGMA("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;
}
- PRAGMA("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 abb03a1ca..13cb07da9 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -257,8 +257,8 @@ void TextBox::keyPressed(KeyEvent& event)
const Key &key = event.getKey();
const InputActionT action = event.getActionId();
- PRAGMA("GCC diagnostic push")
- PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45("GCC diagnostic push")
+ PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
switch (action)
{
case InputAction::GUI_LEFT:
@@ -432,7 +432,7 @@ void TextBox::keyPressed(KeyEvent& event)
break;
}
}
- PRAGMA("GCC diagnostic pop")
+ PRAGMA45("GCC diagnostic pop")
adjustSize();
scrollToCaret();
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 34c088540..4060f8d1a 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -396,8 +396,8 @@ void TextField::keyPressed(KeyEvent &event)
bool TextField::handleNormalKeys(const InputActionT action, bool &consumed)
{
- PRAGMA("GCC diagnostic push")
- PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45("GCC diagnostic push")
+ PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
switch (action)
{
case InputAction::GUI_LEFT:
@@ -477,14 +477,14 @@ bool TextField::handleNormalKeys(const InputActionT action, bool &consumed)
default:
break;
}
- PRAGMA("GCC diagnostic pop")
+ PRAGMA45("GCC diagnostic pop")
return true;
}
void TextField::handleCtrlKeys(const InputActionT action, bool &consumed)
{
- PRAGMA("GCC diagnostic push")
- PRAGMA("GCC diagnostic ignored \"-Wswitch-enum\"")
+ PRAGMA45("GCC diagnostic push")
+ PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"")
switch (action)
{
case InputAction::GUI_LEFT:
@@ -575,7 +575,7 @@ void TextField::handleCtrlKeys(const InputActionT action, bool &consumed)
default:
break;
}
- PRAGMA("GCC diagnostic pop")
+ PRAGMA45("GCC diagnostic pop")
}
void TextField::moveCaretBack()