aboutsummaryrefslogtreecommitdiff
path: root/backends/platform
diff options
context:
space:
mode:
authorTarek Soliman2012-02-24 13:23:55 -0600
committerTarek Soliman2012-02-27 13:00:56 -0600
commit6afac4e01eba5c297e99597dd2cb17c2e4732a7e (patch)
treeda3a7473c70f529a7cc399975349607d412eb713 /backends/platform
parentb0f961924a856b71ebffdb834db122145c4c10e5 (diff)
downloadscummvm-rg350-6afac4e01eba5c297e99597dd2cb17c2e4732a7e.tar.gz
scummvm-rg350-6afac4e01eba5c297e99597dd2cb17c2e4732a7e.tar.bz2
scummvm-rg350-6afac4e01eba5c297e99597dd2cb17c2e4732a7e.zip
KEYMAPPER: Rename HardwareKey to HardwareInput
Diffstat (limited to 'backends/platform')
-rw-r--r--backends/platform/android/events.cpp8
-rw-r--r--backends/platform/linuxmoto/hardwarekeys.cpp4
-rw-r--r--backends/platform/linuxmoto/linuxmoto-sdl.h2
-rw-r--r--backends/platform/maemo/maemo-keys.h2
-rw-r--r--backends/platform/maemo/maemo.cpp4
-rw-r--r--backends/platform/maemo/maemo.h2
-rw-r--r--backends/platform/sdl/hardwarekeys.cpp4
-rw-r--r--backends/platform/sdl/sdl.h2
-rw-r--r--backends/platform/webos/webos.cpp8
-rw-r--r--backends/platform/webos/webos.h2
10 files changed, 19 insertions, 19 deletions
diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
index a58b93e3bb..21d2344fa7 100644
--- a/backends/platform/android/events.cpp
+++ b/backends/platform/android/events.cpp
@@ -224,12 +224,12 @@ void OSystem_Android::setupKeymapper() {
Keymapper *mapper = getEventManager()->getKeymapper();
- HardwareKeySet *keySet = new HardwareKeySet();
+ HardwareInputSet *inputSet = new HardwareInputSet();
- keySet->addHardwareKey(
- new HardwareKey("n", KeyState(KEYCODE_n), "n (vk)"));
+ keySet->addHardwareInput(
+ new HardwareInput("n", KeyState(KEYCODE_n), "n (vk)"));
- mapper->registerHardwareKeySet(keySet);
+ mapper->registerHardwareInputSet(inputSet);
Keymap *globalMap = new Keymap(kGlobalKeymapName);
Action *act;
diff --git a/backends/platform/linuxmoto/hardwarekeys.cpp b/backends/platform/linuxmoto/hardwarekeys.cpp
index da093c6508..e1a5757430 100644
--- a/backends/platform/linuxmoto/hardwarekeys.cpp
+++ b/backends/platform/linuxmoto/hardwarekeys.cpp
@@ -106,7 +106,7 @@ static const Mod modifiers[] = {
{ 0, 0, 0, false }
};
-Common::HardwareKeySet *OSystem_LINUXMOTO::getHardwareKeySet() {
- return OSystem_SDL::getHardwareKeySet();
+Common::HardwareInputSet *OSystem_LINUXMOTO::getHardwareInputSet() {
+ return OSystem_SDL::getHardwareInputSet();
}
#endif
diff --git a/backends/platform/linuxmoto/linuxmoto-sdl.h b/backends/platform/linuxmoto/linuxmoto-sdl.h
index 9a0be56e11..27f4e744bc 100644
--- a/backends/platform/linuxmoto/linuxmoto-sdl.h
+++ b/backends/platform/linuxmoto/linuxmoto-sdl.h
@@ -31,7 +31,7 @@ public:
#ifdef ENABLE_KEYMAPPER
// FIXME: This just calls parent methods, is it needed?
- virtual Common::HardwareKeySet *getHardwareKeySet();
+ virtual Common::HardwareInputSet *getHardwareInputSet();
#endif
};
diff --git a/backends/platform/maemo/maemo-keys.h b/backends/platform/maemo/maemo-keys.h
index e1337515a7..ae3a746229 100644
--- a/backends/platform/maemo/maemo-keys.h
+++ b/backends/platform/maemo/maemo-keys.h
@@ -28,7 +28,7 @@
#include "common/keyboard.h"
-#include "backends/keymapper/hardware-key.h"
+#include "backends/keymapper/hardware-input.h"
namespace Common {
diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index a127926eb0..53e88d2286 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -182,8 +182,8 @@ void OSystem_SDL_Maemo::setupIcon() {
}
#ifdef ENABLE_KEYMAPPER
-Common::HardwareKeySet *OSystem_SDL_Maemo::getHardwareKeySet() {
- return new Common::HardwareKeySet(Common::maemoKeys, Common::maemoModifiers);
+Common::HardwareInputSet *OSystem_SDL_Maemo::getHardwareInputSet() {
+ return new Common::HardwareInputSet(Common::maemoKeys, Common::maemoModifiers);
}
Common::Keymap *OSystem_SDL_Maemo::getGlobalKeymap() {
diff --git a/backends/platform/maemo/maemo.h b/backends/platform/maemo/maemo.h
index 4b84ae573a..43bc262ade 100644
--- a/backends/platform/maemo/maemo.h
+++ b/backends/platform/maemo/maemo.h
@@ -42,7 +42,7 @@ public:
virtual void setWindowCaption(const char *caption);
virtual void setupIcon();
#ifdef ENABLE_KEYMAPPER
- virtual Common::HardwareKeySet *getHardwareKeySet();
+ virtual Common::HardwareInputSet *getHardwareInputSet();
virtual Common::Keymap *getGlobalKeymap();
virtual Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() { return _keymapperDefaultBindings; }
#endif
diff --git a/backends/platform/sdl/hardwarekeys.cpp b/backends/platform/sdl/hardwarekeys.cpp
index 5fb4473ebd..0b73bfa467 100644
--- a/backends/platform/sdl/hardwarekeys.cpp
+++ b/backends/platform/sdl/hardwarekeys.cpp
@@ -175,7 +175,7 @@ static const ModifierTableEntry sdlModifiers[] = {
{ 0, 0, 0, false }
};
-Common::HardwareKeySet *OSystem_SDL::getHardwareKeySet() {
- return new HardwareKeySet(sdlKeys, sdlModifiers);
+Common::HardwareInputSet *OSystem_SDL::getHardwareInputSet() {
+ return new HardwareInputSet(sdlKeys, sdlModifiers);
}
#endif
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index 64e63b40a6..51a7b2f577 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -59,7 +59,7 @@ public:
virtual void engineDone();
#endif
#ifdef ENABLE_KEYMAPPER
- virtual Common::HardwareKeySet *getHardwareKeySet();
+ virtual Common::HardwareInputSet *getHardwareInputSet();
#endif
virtual void quit();
virtual void fatalError();
diff --git a/backends/platform/webos/webos.cpp b/backends/platform/webos/webos.cpp
index 710a3f79be..7dd42e5440 100644
--- a/backends/platform/webos/webos.cpp
+++ b/backends/platform/webos/webos.cpp
@@ -52,16 +52,16 @@ void OSystem_SDL_WebOS::initBackend() {
* @return The hardware key set with added webOS specific keys.
*/
#ifdef ENABLE_KEYMAPPER
-HardwareKeySet *OSystem_SDL_WebOS::getHardwareKeySet() {
+HardwareInputSet *OSystem_SDL_WebOS::getHardwareInputSet() {
// Get the original SDL hardware key set
- HardwareKeySet *keySet = OSystem_SDL::getHardwareKeySet();
+ HardwareInputSet *inputSet = OSystem_SDL::getHardwareInputSet();
// Add WebOS specific keys
- keySet->addHardwareKey(new HardwareKey("FORWARD",
+ keySet->addHardwareInput(new HardwareInput("FORWARD",
KeyState((KeyCode) 229, 229, 0), "Forward"));
// Return the modified hardware key set
- return keySet;
+ return inputSet;
}
#endif
diff --git a/backends/platform/webos/webos.h b/backends/platform/webos/webos.h
index 71390a1d2c..8dfa43239c 100644
--- a/backends/platform/webos/webos.h
+++ b/backends/platform/webos/webos.h
@@ -32,7 +32,7 @@ public:
virtual void initBackend();
#ifdef ENABLE_KEYMAPPER
- virtual Common::HardwareKeySet *getHardwareKeySet();
+ virtual Common::HardwareInputSet *getHardwareInputSet();
#endif
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-31 13:05:43 +0000