From 25a6eae7f4fb561bbf930be28ee09510b40ebc80 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 8 Apr 2012 16:48:15 +0300
Subject: Move enums from keyboardconfig.h to keydata.h.

---
 src/inputmanager.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/inputmanager.cpp')

diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index 32c4ac1f1..7610acf29 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -52,11 +52,11 @@ bool InputManager::handleEvent(const SDL_Event &event)
     if (event.type == SDL_KEYDOWN)
     {
         if (setupWindow && setupWindow->isVisible() &&
-            keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
+            keyboard.getNewKeyIndex() > Input::KEY_NO_VALUE)
         {
             keyboard.setNewKey(event);
             keyboard.callbackNewKey();
-            keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
+            keyboard.setNewKeyIndex(Input::KEY_NO_VALUE);
             return true;
         }
 
@@ -143,8 +143,8 @@ int InputManager::getInputConditionMask()
     if (!player_node || !player_node->getDisableGameModifiers())
         mask += COND_EMODS;
 
-    if (!keyboard.isActionActive(keyboard.KEY_TARGET)
-        && !keyboard.isActionActive(keyboard.KEY_UNTARGET))
+    if (!keyboard.isActionActive(Input::KEY_TARGET)
+        && !keyboard.isActionActive(Input::KEY_UNTARGET))
     {
         mask += COND_NOTARGET;
     }
@@ -157,6 +157,6 @@ bool InputManager::checkKey(const KeyData *key, int mask)
     if (!key || (key->condition & mask) != key->condition)
         return false;
 
-    return (key->modKeyIndex == KeyboardConfig::KEY_NO_VALUE
+    return (key->modKeyIndex == Input::KEY_NO_VALUE
         || keyboard.isActionActive(key->modKeyIndex));
 }
-- 
cgit v1.2.3-60-g2f50