[Scummvm-cvs-logs] SF.net SVN: scummvm:[40320] scummvm/trunk/backends/keymapper

[sev at users.sourceforge.net]

Revision: 40320
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40320&view=rev
Author:   sev
Date:     2009-05-05 10:54:56 +0000 (Tue, 05 May 2009)

Log Message:
-----------
Fix keymapper compilation

Modified Paths:
--------------
    scummvm/trunk/backends/keymapper/hardware-key.h
    scummvm/trunk/backends/keymapper/keymapper.cpp
    scummvm/trunk/backends/keymapper/remap-dialog.cpp

Modified: scummvm/trunk/backends/keymapper/hardware-key.h
===================================================================
--- scummvm/trunk/backends/keymapper/hardware-key.h	2009-05-05 10:18:11 UTC (rev 40319)
+++ scummvm/trunk/backends/keymapper/hardware-key.h	2009-05-05 10:54:56 UTC (rev 40320)
@@ -74,7 +74,7 @@
 public:
 
 	virtual ~HardwareKeySet() {
-		List<const HardwareKey*>::iterator it;
+		List<const HardwareKey*>::const_iterator it;
 		for (it = _keys.begin(); it != _keys.end(); it++)
 			delete *it;
 	}
@@ -85,7 +85,7 @@
 	}
 
 	const HardwareKey *findHardwareKey(const char *id) const {
-		List<const HardwareKey*>::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)
 				return (*it);
@@ -94,7 +94,7 @@
 	}
 
 	const HardwareKey *findHardwareKey(const KeyState& keystate) const {
-		List<const HardwareKey*>::iterator it;
+		List<const HardwareKey*>::const_iterator it;
 		for (it = _keys.begin(); it != _keys.end(); it++) {
 			if ((*it)->key == keystate)
 				return (*it);

Modified: scummvm/trunk/backends/keymapper/keymapper.cpp
===================================================================
--- scummvm/trunk/backends/keymapper/keymapper.cpp	2009-05-05 10:18:11 UTC (rev 40319)
+++ scummvm/trunk/backends/keymapper/keymapper.cpp	2009-05-05 10:54:56 UTC (rev 40320)
@@ -183,7 +183,7 @@
 }
 
 void Keymapper::executeAction(const Action *action, bool keyDown) {
-	List<Event>::iterator it;
+	List<Event>::const_iterator it;
 	for (it = action->events.begin(); it != action->events.end(); ++it) {
 		Event evt = *it;
 		switch (evt.type) {

Modified: scummvm/trunk/backends/keymapper/remap-dialog.cpp
===================================================================
--- scummvm/trunk/backends/keymapper/remap-dialog.cpp	2009-05-05 10:18:11 UTC (rev 40319)
+++ scummvm/trunk/backends/keymapper/remap-dialog.cpp	2009-05-05 10:54:56 UTC (rev 40320)
@@ -58,7 +58,7 @@
 void RemapDialog::open() {
 	bool divider = false;
 	const Stack<Keymapper::MapRecord> &activeKeymaps = _keymapper->getActiveStack();
-	if (!activeKeymaps.size() > 0) {
+	if (!(activeKeymaps.size() > 0)) {
 		_kmPopUp->appendEntry(activeKeymaps.top().keymap->getName() + " (Active)");
 		divider = true;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.