summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/setupitem.cpp14
-rw-r--r--src/gui/widgets/sliderlist.cpp5
-rw-r--r--src/gui/widgets/tabbedarea.cpp6
3 files changed, 14 insertions, 11 deletions
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index efa96136f..d9071aec4 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -324,17 +324,18 @@ void SetupItemTextField::action(const gcn::ActionEvent &event)
if (!mTextField)
return;
- if (event.getId() == mWidget->getActionEventId())
+ const std::string &eventId = event.getId();
+ if (eventId == mWidget->getActionEventId())
{
fromWidget();
}
- else if (event.getId() == mEventName + "_EDIT")
+ else if (eventId == mEventName + "_EDIT")
{
mEditDialog = new EditDialog(mText, mTextField->getText(),
mEventName + "_EDIT_OK");
mEditDialog->addActionListener(this);
}
- else if (event.getId() == mEventName + "_EDIT_OK")
+ else if (eventId == mEventName + "_EDIT_OK")
{
mTextField->setText(mEditDialog->getMsg());
mEditDialog = nullptr;
@@ -449,17 +450,18 @@ void SetupItemIntTextField::action(const gcn::ActionEvent &event)
if (!mTextField)
return;
- if (event.getId() == mWidget->getActionEventId())
+ const std::string &eventId = event.getId();
+ if (eventId == mWidget->getActionEventId())
{
fromWidget();
}
- else if (event.getId() == mEventName + "_EDIT")
+ else if (eventId == mEventName + "_EDIT")
{
mEditDialog = new EditDialog(mText, mTextField->getText(),
mEventName + "_EDIT_OK");
mEditDialog->addActionListener(this);
}
- else if (event.getId() == mEventName + "_EDIT_OK")
+ else if (eventId == mEventName + "_EDIT_OK")
{
mTextField->setValue(atoi(mEditDialog->getMsg().c_str()));
mEditDialog = nullptr;
diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp
index 55cda4d26..70734b707 100644
--- a/src/gui/widgets/sliderlist.cpp
+++ b/src/gui/widgets/sliderlist.cpp
@@ -145,13 +145,14 @@ void SliderList::action(const gcn::ActionEvent &event)
if (!mListModel)
return;
- if (event.getId() == mPrevEventId)
+ const std::string &eventId = event.getId();
+ if (eventId == mPrevEventId)
{
mSelectedIndex --;
if (mSelectedIndex < 0)
mSelectedIndex = mListModel->getNumberOfElements() - 1;
}
- else if (event.getId() == mNextEventId)
+ else if (eventId == mNextEventId)
{
mSelectedIndex ++;
if (mSelectedIndex >= mListModel->getNumberOfElements())
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index b0999fbd4..82f7b82e4 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -524,18 +524,18 @@ void TabbedArea::action(const gcn::ActionEvent& actionEvent)
}
else
{
- if (actionEvent.getId() == "shift_left")
+ const std::string &eventId = actionEvent.getId();
+ if (eventId == "shift_left")
{
if (mTabScrollIndex)
--mTabScrollIndex;
}
- else if (actionEvent.getId() == "shift_right")
+ else if (eventId == "shift_right")
{
if (mTabScrollIndex < mTabs.size() - 1)
++mTabScrollIndex;
}
adjustTabPositions();
-
updateArrowEnableState();
}
}