summaryrefslogtreecommitdiff
path: root/src/gui/models
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/models
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/models')
-rw-r--r--src/gui/models/touchactionmodel.cpp8
-rw-r--r--src/gui/models/touchactionmodel.h10
2 files changed, 10 insertions, 8 deletions
diff --git a/src/gui/models/touchactionmodel.cpp b/src/gui/models/touchactionmodel.cpp
index d9cced32a..7daff84ca 100644
--- a/src/gui/models/touchactionmodel.cpp
+++ b/src/gui/models/touchactionmodel.cpp
@@ -68,16 +68,16 @@ TouchActionsModel::TouchActionsModel() :
}
}
-int TouchActionsModel::getActionFromSelection(const int sel) const
+InputActionT TouchActionsModel::getActionFromSelection(const int sel) const
{
if (sel < 0 || sel > static_cast<signed int>(mActionId.size()))
- return -1;
+ return InputAction::NO_VALUE;
return mActionId[sel];
}
-int TouchActionsModel::getSelectionFromAction(const int action) const
+int TouchActionsModel::getSelectionFromAction(const InputActionT action) const
{
- const std::map<int, int>::const_iterator it
+ const std::map<InputActionT, int>::const_iterator it
= mActionToSelection.find(action);
if (it == mActionToSelection.end())
return 0;
diff --git a/src/gui/models/touchactionmodel.h b/src/gui/models/touchactionmodel.h
index 287232aae..05234907c 100644
--- a/src/gui/models/touchactionmodel.h
+++ b/src/gui/models/touchactionmodel.h
@@ -21,6 +21,8 @@
#ifndef GUI_MODELS_TOUCHACTIONMODEL_H
#define GUI_MODELS_TOUCHACTIONMODEL_H
+#include "enums/input/inputaction.h"
+
#include "gui/models/namesmodel.h"
#include "gui/widgets/setupitem.h"
@@ -35,13 +37,13 @@ class TouchActionsModel final : public NamesModel
~TouchActionsModel()
{ }
- int getActionFromSelection(const int sel) const;
+ InputActionT getActionFromSelection(const int sel) const;
- int getSelectionFromAction(const int action) const;
+ int getSelectionFromAction(const InputActionT action) const;
private:
- std::vector<int> mActionId;
- std::map<int, int> mActionToSelection;
+ std::vector<InputActionT> mActionId;
+ std::map<InputActionT, int> mActionToSelection;
};
#endif // GUI_MODELS_TOUCHACTIONMODEL_H