[Scummvm-cvs-logs] SF.net SVN: scummvm:[35970] scummvm/trunk/backends/keymapper
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Jan 21 02:26:04 CET 2009
Revision: 35970
http://scummvm.svn.sourceforge.net/scummvm/?rev=35970&view=rev
Author: fingolfin
Date: 2009-01-21 01:26:04 +0000 (Wed, 21 Jan 2009)
Log Message:
-----------
Some cleanup / code simplification
Modified Paths:
--------------
scummvm/trunk/backends/keymapper/keymap.h
scummvm/trunk/backends/keymapper/keymapper.cpp
scummvm/trunk/backends/keymapper/keymapper.h
scummvm/trunk/backends/keymapper/remap-dialog.cpp
Modified: scummvm/trunk/backends/keymapper/keymap.h
===================================================================
--- scummvm/trunk/backends/keymapper/keymap.h 2009-01-20 23:50:07 UTC (rev 35969)
+++ scummvm/trunk/backends/keymapper/keymap.h 2009-01-21 01:26:04 UTC (rev 35970)
@@ -49,7 +49,7 @@
: public UnaryFunction<KeyState, uint> {
uint operator()(const KeyState &val) const {
- return (uint)(val.keycode * (val.flags << 1));
+ return (uint)val.keycode | ((uint)val.flags << 24);
}
};
Modified: scummvm/trunk/backends/keymapper/keymapper.cpp
===================================================================
--- scummvm/trunk/backends/keymapper/keymapper.cpp 2009-01-20 23:50:07 UTC (rev 35969)
+++ scummvm/trunk/backends/keymapper/keymapper.cpp 2009-01-21 01:26:04 UTC (rev 35970)
@@ -32,22 +32,21 @@
namespace Common {
void Keymapper::Domain::addKeymap(Keymap *map) {
- KeymapMap::iterator it = _keymaps.find(map->getName());
- if (it != _keymaps.end())
- delete _keymaps[map->getName()];
- _keymaps[map->getName()] = map;
+ iterator it = find(map->getName());
+ if (it != end())
+ delete it->_value;
+ setVal(map->getName(), map);
}
void Keymapper::Domain::deleteAllKeyMaps() {
- KeymapMap::iterator it;
- for (it = _keymaps.begin(); it != _keymaps.end(); it++)
+ for (iterator it = begin(); it != end(); it++)
delete it->_value;
- _keymaps.clear();
+ clear();
}
Keymap *Keymapper::Domain::getKeymap(const String& name) {
- KeymapMap::iterator it = _keymaps.find(name);
- if (it != _keymaps.end())
+ iterator it = find(name);
+ if (it != end())
return it->_value;
else
return 0;
@@ -149,8 +148,8 @@
}
bool Keymapper::mapKey(const KeyState& key, bool keyDown) {
- if (!_enabled) return false;
- if (_activeMaps.empty()) return false;
+ if (!_enabled || _activeMaps.empty())
+ return false;
Action *action = 0;
if (keyDown) {
Modified: scummvm/trunk/backends/keymapper/keymapper.h
===================================================================
--- scummvm/trunk/backends/keymapper/keymapper.h 2009-01-20 23:50:07 UTC (rev 35969)
+++ scummvm/trunk/backends/keymapper/keymapper.h 2009-01-21 01:26:04 UTC (rev 35970)
@@ -49,10 +49,8 @@
};
/* Nested class that represents a set of keymaps */
- class Domain {
- typedef HashMap<String, Keymap*,
- IgnoreCase_Hash, IgnoreCase_EqualTo> KeymapMap;
-
+ class Domain : public HashMap<String, Keymap*,
+ IgnoreCase_Hash, IgnoreCase_EqualTo> {
public:
Domain() : _configDomain(0) {}
~Domain() {
@@ -72,16 +70,8 @@
Keymap *getKeymap(const String& name);
- typedef KeymapMap::iterator iterator;
- typedef KeymapMap::const_iterator const_iterator;
- iterator begin() { return _keymaps.begin(); }
- const_iterator begin() const { return _keymaps.begin(); }
- iterator end() { return _keymaps.end(); }
- const_iterator end() const { return _keymaps.end(); }
- uint32 count() { return _keymaps.size(); }
private:
ConfigManager::Domain *_configDomain;
- KeymapMap _keymaps;
};
Keymapper(EventManager *eventMan);
Modified: scummvm/trunk/backends/keymapper/remap-dialog.cpp
===================================================================
--- scummvm/trunk/backends/keymapper/remap-dialog.cpp 2009-01-20 23:50:07 UTC (rev 35969)
+++ scummvm/trunk/backends/keymapper/remap-dialog.cpp 2009-01-21 01:26:04 UTC (rev 35970)
@@ -67,17 +67,17 @@
Keymapper::Domain *_gameKeymaps = 0;
int keymapCount = 0;
- if (_globalKeymaps->count() == 0)
+ if (_globalKeymaps->empty())
_globalKeymaps = 0;
else
- keymapCount += _globalKeymaps->count();
+ keymapCount += _globalKeymaps->size();
if (ConfMan.getActiveDomain() != 0) {
_gameKeymaps = &_keymapper->getGameDomain();
- if (_gameKeymaps->count() == 0)
+ if (_gameKeymaps->empty())
_gameKeymaps = 0;
else
- keymapCount += _gameKeymaps->count();
+ keymapCount += _gameKeymaps->size();
}
_keymapTable = (Keymap **)malloc(sizeof(Keymap*) * keymapCount);
@@ -85,7 +85,8 @@
Keymapper::Domain::iterator it;
uint32 idx = 0;
if (_globalKeymaps) {
- if (divider) _kmPopUp->appendEntry("");
+ if (divider)
+ _kmPopUp->appendEntry("");
for (it = _globalKeymaps->begin(); it != _globalKeymaps->end(); it++) {
_kmPopUp->appendEntry(it->_value->getName() + " (Global)", idx);
_keymapTable[idx++] = it->_value;
@@ -93,7 +94,8 @@
divider = true;
}
if (_gameKeymaps) {
- if (divider) _kmPopUp->appendEntry("");
+ if (divider)
+ _kmPopUp->appendEntry("");
for (it = _gameKeymaps->begin(); it != _gameKeymaps->end(); it++) {
_kmPopUp->appendEntry(it->_value->getName() + " (Game)", idx);
_keymapTable[idx++] = it->_value;
@@ -110,10 +112,8 @@
void RemapDialog::close() {
_kmPopUp->clearEntries();
- if (_keymapTable) {
- free(_keymapTable);
- _keymapTable = 0;
- }
+ free(_keymapTable);
+ _keymapTable = 0;
if (_changes)
ConfMan.flushToDisk();
Dialog::close();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list