Fix keymapper compilation

svn-id: r40320

3 files changed, 5 insertions, 5 deletions

diff --git a/backends/keymapper/hardware-key.h b/backends/keymapper/hardware-key.h
index c89c395d33..f42076f75b 100644
--- a/backends/keymapper/hardware-key.h
+++ b/backends/keymapper/hardware-key.h
@@ -74,7 +74,7 @@ class HardwareKeySet {
 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 @@ public:
 	}
 
 	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 @@ public:
 	}
 
 	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);
diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp
index d9933ab500..c6ed0fe024 100644
--- a/backends/keymapper/keymapper.cpp
+++ b/backends/keymapper/keymapper.cpp
@@ -183,7 +183,7 @@ Action *Keymapper::getAction(const KeyState& key) {
 }
 
 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) {
diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp
index e666e9b675..cded6ba5a0 100644
--- a/backends/keymapper/remap-dialog.cpp
+++ b/backends/keymapper/remap-dialog.cpp
@@ -58,7 +58,7 @@ RemapDialog::~RemapDialog() {
 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;
 	}