summaryrefslogtreecommitdiff
path: root/src/inputmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-07-18 01:51:36 +0300
committerAndrei Karas <akaras@inbox.ru>2012-07-18 01:51:36 +0300
commitf0e95132f27ceb901fbd779fafc798a1f67a06a6 (patch)
tree52ee9ab21f4e01c2c8ae70b86841b0138349645d /src/inputmanager.cpp
parent7e0a97d2521b9ce57003176e82a0b5564aa003c2 (diff)
downloadmanaplus-f0e95132f27ceb901fbd779fafc798a1f67a06a6.tar.gz
manaplus-f0e95132f27ceb901fbd779fafc798a1f67a06a6.tar.bz2
manaplus-f0e95132f27ceb901fbd779fafc798a1f67a06a6.tar.xz
manaplus-f0e95132f27ceb901fbd779fafc798a1f67a06a6.zip
Another warning fixes.
Diffstat (limited to 'src/inputmanager.cpp')
-rw-r--r--src/inputmanager.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index 9f07d1fe9..02612ff42 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -259,8 +259,8 @@ bool InputManager::hasConflicts(int &key1, int &key2)
&& mKey[i].values[i2].value == mKey[j].values[j2].value
&& mKey[i].values[i2].type == mKey[j].values[j2].type)
{
- key1 = i;
- key2 = j;
+ key1 = static_cast<int>(i);
+ key2 = static_cast<int>(j);
return true;
}
}
@@ -377,7 +377,7 @@ void InputManager::addActionKey(int action, int type, int val)
|| (key.values[i].type == type
&& key.values[i].value == val))
{
- idx = i;
+ idx = static_cast<int>(i);
break;
}
}
@@ -614,7 +614,7 @@ void InputManager::updateKeyActionMap(KeyToActionMap &actionMap,
{
const KeyItem &ki = key.values[i2];
if (ki.type == type && ki.value != -1)
- actionMap[ki.value].push_back(i);
+ actionMap[ki.value].push_back(static_cast<int>(i));
}
}
if (keyData[i].configField && (keyData[i].grp & Input::GRP_GUICHAN))
@@ -623,7 +623,7 @@ void InputManager::updateKeyActionMap(KeyToActionMap &actionMap,
{
const KeyItem &ki = key.values[i2];
if (ki.type == type && ki.value != -1)
- idMap[ki.value] = i;
+ idMap[ki.value] = static_cast<int>(i);
}
}
if (keyData[i].configField && (keyData[i].grp & Input::GRP_REPEAT))
@@ -678,7 +678,7 @@ int InputManager::getKeyIndex(int value, int grp, int type) const
&& (grp & keyData[i].grp) != 0
&& key.values[i2].type == type)
{
- return i;
+ return static_cast<int>(i);
}
}
}