summaryrefslogtreecommitdiff
path: root/src/gui/widgets/setuptouchitem.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-31 00:19:18 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-31 00:19:18 +0300
commit694e07d193e7c5758a7d672b45668651b034003d (patch)
tree20a4aec8dee2b3b5475db9f3667e797fb43c603b /src/gui/widgets/setuptouchitem.cpp
parentc9a84749b3b71d4df6cc3b9b488d60dc4a013a20 (diff)
downloadmanaverse-694e07d193e7c5758a7d672b45668651b034003d.tar.gz
manaverse-694e07d193e7c5758a7d672b45668651b034003d.tar.bz2
manaverse-694e07d193e7c5758a7d672b45668651b034003d.tar.xz
manaverse-694e07d193e7c5758a7d672b45668651b034003d.zip
Convert InputAction enum into strong typed enum.
Diffstat (limited to 'src/gui/widgets/setuptouchitem.cpp')
-rw-r--r--src/gui/widgets/setuptouchitem.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp
index 8d1b63dd7..eb8741abc 100644
--- a/src/gui/widgets/setuptouchitem.cpp
+++ b/src/gui/widgets/setuptouchitem.cpp
@@ -100,7 +100,7 @@ void SetupActionDropDown::createControls()
mDropDown->addActionListener(mParent);
mDropDown->setWidth(mWidth);
mDropDown->setSelected(mModel->getSelectionFromAction(
- atoi(mValue.c_str())));
+ static_cast<InputActionT>(atoi(mValue.c_str()))));
mWidget = mDropDown;
fixFirstItemSize(mLabel);
@@ -118,8 +118,8 @@ void SetupActionDropDown::fromWidget()
if (!mDropDown || !mModel)
return;
- mValue = toString(mModel->getActionFromSelection(
- mDropDown->getSelected()));
+ mValue = toString(static_cast<int>(mModel->getActionFromSelection(
+ mDropDown->getSelected())));
}
void SetupActionDropDown::toWidget()
@@ -128,5 +128,5 @@ void SetupActionDropDown::toWidget()
return;
mDropDown->setSelected(mModel->getSelectionFromAction(
- atoi(mValue.c_str())));
+ static_cast<InputActionT>(atoi(mValue.c_str()))));
}