diff options
author | Tarek Soliman | 2012-02-15 00:06:13 -0600 |
---|---|---|
committer | Tarek Soliman | 2012-02-15 10:07:08 -0600 |
commit | 921f602ab8631a9d10e0a173b6b331dbafda564a (patch) | |
tree | bc80e4591e080719e16ac359c15bf5da87291c19 /backends/keymapper | |
parent | dbcd177606818f3b50a4b4700d9789bd0dea862c (diff) | |
download | scummvm-rg350-921f602ab8631a9d10e0a173b6b331dbafda564a.tar.gz scummvm-rg350-921f602ab8631a9d10e0a173b6b331dbafda564a.tar.bz2 scummvm-rg350-921f602ab8631a9d10e0a173b6b331dbafda564a.zip |
JANITORIAL: Fix whitespace in pointer template arg
Diffstat (limited to 'backends/keymapper')
-rw-r--r-- | backends/keymapper/hardware-key.h | 12 | ||||
-rw-r--r-- | backends/keymapper/keymap.cpp | 24 | ||||
-rw-r--r-- | backends/keymapper/keymap.h | 6 | ||||
-rw-r--r-- | backends/keymapper/keymapper.cpp | 2 | ||||
-rw-r--r-- | backends/keymapper/keymapper.h | 4 | ||||
-rw-r--r-- | backends/keymapper/remap-dialog.cpp | 8 |
6 files changed, 28 insertions, 28 deletions
diff --git a/backends/keymapper/hardware-key.h b/backends/keymapper/hardware-key.h index 2b9280516a..071a38968f 100644 --- a/backends/keymapper/hardware-key.h +++ b/backends/keymapper/hardware-key.h @@ -103,7 +103,7 @@ public: HardwareKeySet() { } virtual ~HardwareKeySet() { - List<const HardwareKey*>::const_iterator it; + List<const HardwareKey *>::const_iterator it; for (it = _keys.begin(); it != _keys.end(); it++) delete *it; @@ -115,7 +115,7 @@ public: } const HardwareKey *findHardwareKey(const char *id) const { - List<const HardwareKey*>::const_iterator it; + List<const HardwareKey *>::const_iterator it; for (it = _keys.begin(); it != _keys.end(); it++) { if (strncmp((*it)->hwKeyId, id, HWKEY_ID_SIZE) == 0) @@ -125,7 +125,7 @@ public: } const HardwareKey *findHardwareKey(const KeyState& keystate) const { - List<const HardwareKey*>::const_iterator it; + List<const HardwareKey *>::const_iterator it; for (it = _keys.begin(); it != _keys.end(); it++) { if ((*it)->key == keystate) @@ -134,7 +134,7 @@ public: return 0; } - const List<const HardwareKey*> &getHardwareKeys() const { + const List<const HardwareKey *> &getHardwareKeys() const { return _keys; } @@ -178,7 +178,7 @@ public: private: void checkForKey(const HardwareKey *key) { - List<const HardwareKey*>::iterator it; + List<const HardwareKey *>::iterator it; for (it = _keys.begin(); it != _keys.end(); it++) { if (strncmp((*it)->hwKeyId, key->hwKeyId, HWKEY_ID_SIZE) == 0) @@ -188,7 +188,7 @@ private: } } - List<const HardwareKey*> _keys; + List<const HardwareKey *> _keys; }; } // End of namespace Common diff --git a/backends/keymapper/keymap.cpp b/backends/keymapper/keymap.cpp index 6fc1b1e08d..bd020937eb 100644 --- a/backends/keymapper/keymap.cpp +++ b/backends/keymapper/keymap.cpp @@ -31,7 +31,7 @@ namespace Common { Keymap::Keymap(const Keymap& km) : _actions(km._actions), _keymap(), _configDomain(0) { - List<Action*>::iterator it; + List<Action *>::iterator it; for (it = _actions.begin(); it != _actions.end(); ++it) { const HardwareKey *hwKey = (*it)->getMappedKey(); @@ -43,7 +43,7 @@ Keymap::Keymap(const Keymap& km) : _actions(km._actions), _keymap(), _configDoma } Keymap::~Keymap() { - List<Action*>::iterator it; + List<Action *>::iterator it; for (it = _actions.begin(); it != _actions.end(); ++it) delete *it; @@ -57,7 +57,7 @@ void Keymap::addAction(Action *action) { } void Keymap::registerMapping(Action *action, const HardwareKey *hwKey) { - HashMap<KeyState, Action*>::iterator it; + HashMap<KeyState, Action *>::iterator it; it = _keymap.find(hwKey->key); @@ -82,7 +82,7 @@ Action *Keymap::getAction(const char *id) { } Action *Keymap::findAction(const char *id) { - List<Action*>::iterator it; + List<Action *>::iterator it; for (it = _actions.begin(); it != _actions.end(); ++it) { if (strncmp((*it)->id, id, ACTION_ID_SIZE) == 0) @@ -92,7 +92,7 @@ Action *Keymap::findAction(const char *id) { } const Action *Keymap::findAction(const char *id) const { - List<Action*>::const_iterator it; + List<Action *>::const_iterator it; for (it = _actions.begin(); it != _actions.end(); ++it) { if (strncmp((*it)->id, id, ACTION_ID_SIZE) == 0) @@ -103,7 +103,7 @@ const Action *Keymap::findAction(const char *id) const { } Action *Keymap::getMappedAction(const KeyState& ks) const { - HashMap<KeyState, Action*>::iterator it; + HashMap<KeyState, Action *>::iterator it; it = _keymap.find(ks); @@ -158,7 +158,7 @@ void Keymap::saveMappings() { if (!_configDomain) return; - List<Action*>::const_iterator it; + List<Action *>::const_iterator it; String prefix = KEYMAP_KEY_PREFIX + _name + "_"; for (it = _actions.begin(); it != _actions.end(); ++it) { @@ -179,7 +179,7 @@ void Keymap::saveMappings() { } bool Keymap::isComplete(const HardwareKeySet *hwKeys) { - List<Action*>::iterator it; + List<Action *>::iterator it; bool allMapped = true; uint numberMapped = 0; @@ -201,11 +201,11 @@ bool Keymap::isComplete(const HardwareKeySet *hwKeys) { void Keymap::automaticMapping(HardwareKeySet *hwKeys) { #if 0 //disabling the broken automapper for now // Create copies of action and key lists. - List<Action*> actions(_actions); - List<const HardwareKey*> keys(hwKeys->getHardwareKeys()); + List<Action *> actions(_actions); + List<const HardwareKey *> keys(hwKeys->getHardwareKeys()); - List<Action*>::iterator actIt; - List<const HardwareKey*>::iterator keyIt, selectedKey; + List<Action *>::iterator actIt; + List<const HardwareKey *>::iterator keyIt, selectedKey; // Remove actions and keys from local lists that have already been mapped. actIt = actions.begin(); diff --git a/backends/keymapper/keymap.h b/backends/keymapper/keymap.h index 73f2293653..bbcc4a1926 100644 --- a/backends/keymapper/keymap.h +++ b/backends/keymapper/keymap.h @@ -67,7 +67,7 @@ public: /** * Get the list of all the Actions contained in this Keymap */ - List<Action*>& getActions() { return _actions; } + List<Action *>& getActions() { return _actions; } /** * Find the Action that a key is mapped to @@ -137,8 +137,8 @@ private: String _name; Keymap *_parent; - List<Action*> _actions; - HashMap<KeyState, Action*> _keymap; + List<Action *> _actions; + HashMap<KeyState, Action *> _keymap; ConfigManager::Domain *_configDomain; }; diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp index 10cff9418b..1c83bb877e 100644 --- a/backends/keymapper/keymapper.cpp +++ b/backends/keymapper/keymapper.cpp @@ -217,7 +217,7 @@ bool Keymapper::mapKey(const KeyState& key, bool keyDown) { if (action) _keysDown[key] = action; } else { - HashMap<KeyState, Action*>::iterator it = _keysDown.find(key); + HashMap<KeyState, Action *>::iterator it = _keysDown.find(key); if (it != _keysDown.end()) { action = it->_value; diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h index d2aa89cad6..27e981923b 100644 --- a/backends/keymapper/keymapper.h +++ b/backends/keymapper/keymapper.h @@ -86,7 +86,7 @@ public: /** * Get a list of all registered HardwareKeys */ - const List<const HardwareKey*> &getHardwareKeys() const { + const List<const HardwareKey *> &getHardwareKeys() const { assert(_hardwareKeys); return _hardwareKeys->getHardwareKeys(); } @@ -196,7 +196,7 @@ private: bool _enabled; Stack<MapRecord> _activeMaps; - HashMap<KeyState, Action*> _keysDown; + HashMap<KeyState, Action *> _keysDown; }; diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp index 4b95a1a021..6f5716b306 100644 --- a/backends/keymapper/remap-dialog.cpp +++ b/backends/keymapper/remap-dialog.cpp @@ -323,7 +323,7 @@ void RemapDialog::loadKeymap() { if (!activeKeymaps.empty() && _kmPopUp->getSelected() == 0) { // load active keymaps - List<const HardwareKey*> freeKeys(_keymapper->getHardwareKeys()); + List<const HardwareKey *> freeKeys(_keymapper->getHardwareKeys()); int topIndex = activeKeymaps.size() - 1; @@ -334,7 +334,7 @@ void RemapDialog::loadKeymap() { // add most active keymap's keys Keymapper::MapRecord top = activeKeymaps[topIndex]; - List<Action*>::iterator actIt; + List<Action *>::iterator actIt; debug(3, "RemapDialog::loadKeymap top keymap: %s", top.keymap->getName().c_str()); for (actIt = top.keymap->getActions().begin(); actIt != top.keymap->getActions().end(); ++actIt) { Action *act = *actIt; @@ -351,7 +351,7 @@ void RemapDialog::loadKeymap() { for (int i = topIndex - 1; i >= 0; --i) { Keymapper::MapRecord mr = activeKeymaps[i]; debug(3, "RemapDialog::loadKeymap keymap: %s", mr.keymap->getName().c_str()); - List<const HardwareKey*>::iterator keyIt = freeKeys.begin(); + List<const HardwareKey *>::iterator keyIt = freeKeys.begin(); while (keyIt != freeKeys.end()) { Action *act = mr.keymap->getMappedAction((*keyIt)->key); @@ -373,7 +373,7 @@ void RemapDialog::loadKeymap() { } else if (_kmPopUp->getSelected() != -1) { Keymap *km = _keymapTable[_kmPopUp->getSelectedTag()]; - List<Action*>::iterator it; + List<Action *>::iterator it; for (it = km->getActions().begin(); it != km->getActions().end(); ++it) { ActionInfo info = {*it, false, (*it)->description}; |