summaryrefslogtreecommitdiff
path: root/src/input/touch
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-07 16:18:13 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-07 16:18:13 +0300
commit9fe21fcd8883b37bdc30224822e6e42afb35b8f0 (patch)
tree798117abd4dc7e610997d59d530a96ddc1509f53 /src/input/touch
parent4429cb14e9e187edef27aba692a4266733f79c17 (diff)
downloadmanaplus-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.tar.gz
manaplus-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.tar.bz2
manaplus-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.tar.xz
manaplus-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.zip
Replace most static_cast<Type> to shorter versions from defines.
Diffstat (limited to 'src/input/touch')
-rw-r--r--src/input/touch/touchmanager.cpp6
-rw-r--r--src/input/touch/touchmanager.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/input/touch/touchmanager.cpp b/src/input/touch/touchmanager.cpp
index e0c08b16c..5c7de8189 100644
--- a/src/input/touch/touchmanager.cpp
+++ b/src/input/touch/touchmanager.cpp
@@ -328,12 +328,12 @@ bool TouchManager::processEvent(const MouseInput &mouseInput) restrict2
bool TouchManager::isActionActive(const InputActionT index) restrict2 const
{
- if (static_cast<int>(index) < 0 ||
- static_cast<int>(index) >= actionsSize)
+ if (CAST_S32(index) < 0 ||
+ CAST_S32(index) >= actionsSize)
{
return false;
}
- return mActions[static_cast<size_t>(index)];
+ return mActions[CAST_SIZE(index)];
}
void TouchManager::resize(const int width, const int height) restrict2
diff --git a/src/input/touch/touchmanager.h b/src/input/touch/touchmanager.h
index 3e88c4f6a..676167e13 100644
--- a/src/input/touch/touchmanager.h
+++ b/src/input/touch/touchmanager.h
@@ -38,7 +38,7 @@ class MouseInput;
typedef void (*TouchFuncPtr) (const MouseInput &restrict mouseInput);
-const int actionsSize = static_cast<int>(InputAction::TOTAL);
+const int actionsSize = CAST_S32(InputAction::TOTAL);
const int buttonsCount = 12;
struct TouchItem final
@@ -145,10 +145,10 @@ class TouchManager final : public ConfigListener
void setActionActive(const InputActionT index,
const bool value) restrict2
{
- if (static_cast<int>(index) >= 0 &&
- static_cast<int>(index) < actionsSize)
+ if (CAST_S32(index) >= 0 &&
+ CAST_S32(index) < actionsSize)
{
- mActions[static_cast<size_t>(index)] = value;
+ mActions[CAST_SIZE(index)] = value;
}
}