aboutsummaryrefslogtreecommitdiff
path: root/backends/keymapper/hardware-key.h
diff options
context:
space:
mode:
authorStephen Kennedy2008-08-13 11:46:08 +0000
committerStephen Kennedy2008-08-13 11:46:08 +0000
commit532faef82b20802502d54fabb7364c25eb7ac875 (patch)
tree57b65a7a975a926adc9e0a2c2981948fe86d797c /backends/keymapper/hardware-key.h
parent300a1df2b0b801a002d369b5459112c43593e96a (diff)
downloadscummvm-rg350-532faef82b20802502d54fabb7364c25eb7ac875.tar.gz
scummvm-rg350-532faef82b20802502d54fabb7364c25eb7ac875.tar.bz2
scummvm-rg350-532faef82b20802502d54fabb7364c25eb7ac875.zip
Keymapper WIP:
* Improved automatic mapping algorithm * Remap dialog overhaul - now displays active keymap(s) svn-id: r33821
Diffstat (limited to 'backends/keymapper/hardware-key.h')
-rw-r--r--backends/keymapper/hardware-key.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/backends/keymapper/hardware-key.h b/backends/keymapper/hardware-key.h
index 40fb2a0cbd..7ddb4dacd1 100644
--- a/backends/keymapper/hardware-key.h
+++ b/backends/keymapper/hardware-key.h
@@ -71,7 +71,7 @@ public:
HardwareKeySet() {}
virtual ~HardwareKeySet() {
- List<HardwareKey*>::iterator it;
+ List<const HardwareKey*>::iterator it;
for (it = _keys.begin(); it != _keys.end(); it++)
delete *it;
}
@@ -82,7 +82,7 @@ public:
}
const HardwareKey *findHardwareKey(int32 id) const {
- List<HardwareKey*>::iterator it;
+ List<const HardwareKey*>::iterator it;
for (it = _keys.begin(); it != _keys.end(); it++) {
if ((*it)->id == id)
return (*it);
@@ -91,7 +91,7 @@ public:
}
const HardwareKey *findHardwareKey(const KeyState& keystate) const {
- List<HardwareKey*>::iterator it;
+ List<const HardwareKey*>::iterator it;
for (it = _keys.begin(); it != _keys.end(); it++) {
if ((*it)->key == keystate)
return (*it);
@@ -99,7 +99,7 @@ public:
return 0;
}
- List<HardwareKey*> getHardwareKeys() const {
+ List<const HardwareKey*> getHardwareKeys() const {
return _keys;
}
@@ -111,7 +111,7 @@ public:
private:
void checkForKey(HardwareKey *key) {
- List<HardwareKey*>::iterator it;
+ List<const HardwareKey*>::iterator it;
for (it = _keys.begin(); it != _keys.end(); it++) {
if ((*it)->id == key->id)
error("Error adding HardwareKey '%s' - id of %d already in use!", key->description.c_str(), key->id);
@@ -120,7 +120,7 @@ private:
}
}
- List<HardwareKey*> _keys;
+ List<const HardwareKey*> _keys;
};