summaryrefslogtreecommitdiff
path: root/src/gui/widgets/tabs/setup_input.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-18 19:47:28 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-18 19:47:28 +0300
commit7da95c7f4da447876458a0b1a17736b9a2865844 (patch)
tree4b6ac0ab5bc32a11234a5363de95d0cfec8cb7d5 /src/gui/widgets/tabs/setup_input.cpp
parent515ce6c1413b5e3da131f3e4997abdc39c003a2c (diff)
downloadplus-7da95c7f4da447876458a0b1a17736b9a2865844.tar.gz
plus-7da95c7f4da447876458a0b1a17736b9a2865844.tar.bz2
plus-7da95c7f4da447876458a0b1a17736b9a2865844.tar.xz
plus-7da95c7f4da447876458a0b1a17736b9a2865844.zip
Move inputaction into separate file.
Diffstat (limited to 'src/gui/widgets/tabs/setup_input.cpp')
-rw-r--r--src/gui/widgets/tabs/setup_input.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 4fae66b47..97aa7421f 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -177,7 +177,7 @@ void Setup_Input::action(const ActionEvent &event)
if (i >= 0 && i < mActionDataSize[selectedData])
{
if (setupActionData[selectedData][i].actionId
- == static_cast<int>(Input::KEY_NO_VALUE))
+ == static_cast<int>(InputAction::NO_VALUE))
{
mAssignKeyButton->setEnabled(false);
mUnassignKeyButton->setEnabled(false);
@@ -215,7 +215,7 @@ void Setup_Input::action(const ActionEvent &event)
inputManager.setNewKeyIndex(ik);
refreshAssignedKey(mKeyList->getSelected());
inputManager.unassignKey();
- inputManager.setNewKeyIndex(static_cast<int>(Input::KEY_NO_VALUE));
+ inputManager.setNewKeyIndex(static_cast<int>(InputAction::NO_VALUE));
}
mAssignKeyButton->setEnabled(true);
}
@@ -260,7 +260,7 @@ void Setup_Input::refreshAssignedKey(const int index)
{
const int selectedData = mKeyListModel->getSelectedData();
const SetupActionData &key = setupActionData[selectedData][index];
- if (key.actionId == static_cast<int>(Input::KEY_NO_VALUE))
+ if (key.actionId == static_cast<int>(InputAction::NO_VALUE))
{
const std::string str(" \342\200\225\342\200\225\342\200\225"
"\342\200\225\342\200\225 ");
@@ -328,7 +328,7 @@ void Setup_Input::keyUnresolved()
if (mKeySetting)
{
newKeyCallback(inputManager.getNewKeyIndex());
- inputManager.setNewKeyIndex(static_cast<int>(Input::KEY_NO_VALUE));
+ inputManager.setNewKeyIndex(static_cast<int>(InputAction::NO_VALUE));
}
}
@@ -355,17 +355,17 @@ void Setup_Input::fixTranslation(SetupActionData *const actionDatas,
void Setup_Input::fixTranslations()
{
- fixTranslation(setupActionData1, static_cast<int>(Input::KEY_SHORTCUT_1),
- static_cast<int>(Input::KEY_SHORTCUT_20), "Item Shortcut %d");
+ fixTranslation(setupActionData1, static_cast<int>(InputAction::SHORTCUT_1),
+ static_cast<int>(InputAction::SHORTCUT_20), "Item Shortcut %d");
- fixTranslation(setupActionData3, static_cast<int>(Input::KEY_EMOTE_1),
- static_cast<int>(Input::KEY_EMOTE_48), "Emote Shortcut %d");
+ fixTranslation(setupActionData3, static_cast<int>(InputAction::EMOTE_1),
+ static_cast<int>(InputAction::EMOTE_48), "Emote Shortcut %d");
- fixTranslation(setupActionData4, static_cast<int>(Input::KEY_OUTFIT_1),
- static_cast<int>(Input::KEY_OUTFIT_48), "Outfit Shortcut %d");
+ fixTranslation(setupActionData4, static_cast<int>(InputAction::OUTFIT_1),
+ static_cast<int>(InputAction::OUTFIT_48), "Outfit Shortcut %d");
fixTranslation(setupActionData7, static_cast<int>(
- Input::KEY_MOVE_TO_POINT_1),
- static_cast<int>(Input::KEY_MOVE_TO_POINT_48),
+ InputAction::MOVE_TO_POINT_1),
+ static_cast<int>(InputAction::MOVE_TO_POINT_48),
"Move to point Shortcut %d");
}