From 30ef016b0a14f36dc480284e2d775295b5501dd4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 8 Apr 2012 19:41:19 +0300
Subject: Move most input code from keyboardconfig to inputmanager.

---
 src/gui/chatwindow.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/gui/chatwindow.cpp')

diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 4040c3ce0..3832e5850 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -27,6 +27,7 @@
 #include "commandhandler.h"
 #include "configuration.h"
 #include "guild.h"
+#include "inputmanager.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
 #include "party.h"
@@ -783,18 +784,18 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event)
         mCurHist = mHistory.end();
         mChatInput->setText("");
     }
-    else if (keyboard.isActionActive(Input::KEY_AUTOCOMPLETE_CHAT) &&
+    else if (inputManager.isActionActive(Input::KEY_AUTOCOMPLETE_CHAT) &&
              mChatInput->getText() != "")
     {
         autoComplete();
         return;
     }
-    else if (keyboard.isActionActive(Input::KEY_DEACTIVATE_CHAT) &&
+    else if (inputManager.isActionActive(Input::KEY_DEACTIVATE_CHAT) &&
              mChatInput->isVisible())
     {
         mChatInput->processVisible(false);
     }
-    else if (keyboard.isActionActive(Input::KEY_CHAT_PREV_HISTORY) &&
+    else if (inputManager.isActionActive(Input::KEY_CHAT_PREV_HISTORY) &&
              mChatInput->isVisible())
     {
         ChatTab *tab = getFocused();
@@ -826,7 +827,7 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event)
                     mChatInput->getText().length()));
         }
     }
-    else if (keyboard.isActionActive(Input::KEY_CHAT_NEXT_HISTORY) &&
+    else if (inputManager.isActionActive(Input::KEY_CHAT_NEXT_HISTORY) &&
              mChatInput->isVisible())
     {
         ChatTab *tab = getFocused();
-- 
cgit v1.2.3-60-g2f50