VKEYBD: Slight cleanup in ImageMap code.

scummvm · Jan 3, 2012 · d0ddd29 · d0ddd29
1 parent c98a123
commit d0ddd29
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/backends/vkeybd/image-map.cpp b/backends/vkeybd/image-map.cpp
@@ -53,19 +53,18 @@ void ImageMap::removeArea(const String &id) {
 }
 
 void ImageMap::removeAllAreas() {
-	HashMap<String, Polygon *>::iterator it;
-	for (it = _areas.begin(); it != _areas.end(); ++it) {
+	for (AreaMap::iterator it = _areas.begin(); it != _areas.end(); ++it) {
 		delete it->_value;
 	}
 	_areas.clear();
 }
 
 String ImageMap::findMapArea(int16 x, int16 y) {
-	HashMap<String, Polygon *>::iterator it;
-	for (it = _areas.begin(); it != _areas.end(); ++it) {
+	for (AreaMap::iterator it = _areas.begin(); it != _areas.end(); ++it) {
 		if (it->_value->contains(x, y))
 			return it->_key;
 	}
+
 	return String();
 }
 

diff --git a/backends/vkeybd/image-map.h b/backends/vkeybd/image-map.h
@@ -35,9 +35,7 @@ namespace Common {
 struct Polygon;
 
 class ImageMap {
-
 public:
-
 	~ImageMap();
 
 	Polygon *createArea(const String &id);
@@ -46,7 +44,8 @@ class ImageMap {
 	String findMapArea(int16 x, int16 y);
 
 protected:
-	HashMap<String, Polygon *> _areas;
+	typedef HashMap<String, Polygon *> AreaMap;
+	AreaMap _areas;
 };