From 30ef016b0a14f36dc480284e2d775295b5501dd4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 8 Apr 2012 19:41:19 +0300 Subject: Move most input code from keyboardconfig to inputmanager. --- src/gui/widgets/emoteshortcutcontainer.cpp | 3 ++- src/gui/widgets/itemshortcutcontainer.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gui/widgets') diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index f46ee579c..f1f040966 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -25,6 +25,7 @@ #include "configuration.h" #include "emoteshortcut.h" #include "graphics.h" +#include "inputmanager.h" #include "inventory.h" #include "item.h" #include "itemshortcut.h" @@ -117,7 +118,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics) g->drawImage(mBackgroundImg, emoteX, emoteY); // Draw emote keyboard shortcut. - std::string key = keyboard.getKeyValueString( + std::string key = inputManager.getKeyValueString( Input::KEY_EMOTE_1 + i); graphics->setColor(getForegroundColor()); diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 981491dd7..a6f7f60a3 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -25,6 +25,7 @@ #include "configuration.h" #include "graphics.h" #include "inventory.h" +#include "inputmanager.h" #include "item.h" #include "itemshortcut.h" #include "spellshortcut.h" @@ -121,7 +122,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics) g->drawImage(mBackgroundImg, itemX, itemY); // Draw item keyboard shortcut. - std::string key = keyboard.getKeyValueString( + std::string key = inputManager.getKeyValueString( Input::KEY_SHORTCUT_1 + i); graphics->setColor(getForegroundColor()); -- cgit v1.2.3-60-g2f50