summaryrefslogtreecommitdiff
path: root/src/inputmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-10 03:12:42 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-10 03:12:42 +0300
commit9df03a10b72b7e8c3b5bcf9cc7b595dc9fc17835 (patch)
tree9f46ecd1e8d1e6511ed4a9b8f489c39228f3cfa4 /src/inputmanager.cpp
parent2556c72eea6a7d28d543d991e5d5c519726028f0 (diff)
downloadmv-9df03a10b72b7e8c3b5bcf9cc7b595dc9fc17835.tar.gz
mv-9df03a10b72b7e8c3b5bcf9cc7b595dc9fc17835.tar.bz2
mv-9df03a10b72b7e8c3b5bcf9cc7b595dc9fc17835.tar.xz
mv-9df03a10b72b7e8c3b5bcf9cc7b595dc9fc17835.zip
Rename settings tab keyboard to input.
Diffstat (limited to 'src/inputmanager.cpp')
-rw-r--r--src/inputmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index 6ae93b88e..3f4904abe 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -33,7 +33,7 @@
#include "gui/npcdialog.h"
#include "gui/npcpostdialog.h"
#include "gui/setup.h"
-#include "gui/setup_keyboard.h"
+#include "gui/setup_input.h"
#include "gui/textdialog.h"
#include "gui/tradewindow.h"
@@ -62,7 +62,7 @@ class KeyFunctor
InputManager::InputManager() :
- mSetupKey(nullptr),
+ mSetupInput(nullptr),
mNewKeyIndex(Input::KEY_NO_VALUE)
{
}
@@ -243,7 +243,7 @@ bool InputManager::hasConflicts(int &key1, int &key2)
void InputManager::callbackNewKey()
{
- mSetupKey->newKeyCallback(mNewKeyIndex);
+ mSetupInput->newKeyCallback(mNewKeyIndex);
}
bool InputManager::isActionActive(int index) const