[Scummvm-cvs-logs] SF.net SVN: scummvm: [23007] scummvm/trunk/backends/wince/CEgui

knakos at users.sourceforge.net knakos at users.sourceforge.net
Sat Jun 10 13:23:48 CEST 2006


Revision: 23007
Author:   knakos
Date:     2006-06-10 04:23:40 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23007&view=rev

Log Message:
-----------
fixed hashmap use

Modified Paths:
--------------
    scummvm/trunk/backends/wince/CEgui/Panel.cpp
    scummvm/trunk/backends/wince/CEgui/Panel.h
    scummvm/trunk/backends/wince/CEgui/ToolbarHandler.h
Modified: scummvm/trunk/backends/wince/CEgui/Panel.cpp
===================================================================
--- scummvm/trunk/backends/wince/CEgui/Panel.cpp	2006-06-10 11:23:00 UTC (rev 23006)
+++ scummvm/trunk/backends/wince/CEgui/Panel.cpp	2006-06-10 11:23:40 UTC (rev 23007)
@@ -33,10 +33,9 @@
 
 
 	bool Panel::add(const String &name, const PanelItem *item) {
-		PanelItem *ni;
-		ni = _itemsMap[name] = (PanelItem*)item;
-		ni->move(_currentItem, _y + 10);
-		ni->setPanel(this);
+		_itemsMap[name] = (PanelItem*)item;
+		_itemsMap[name]->move(_currentItem, _y + 10);
+		_itemsMap[name]->setPanel(this);
 		_currentItem += _interleave;
 
 		return true;

Modified: scummvm/trunk/backends/wince/CEgui/Panel.h
===================================================================
--- scummvm/trunk/backends/wince/CEgui/Panel.h	2006-06-10 11:23:00 UTC (rev 23006)
+++ scummvm/trunk/backends/wince/CEgui/Panel.h	2006-06-10 11:23:40 UTC (rev 23007)
@@ -48,12 +48,8 @@
 		virtual void forceRedraw();
 		virtual bool action(int x, int y, bool pushed);
 	private:
-		struct IgnoreCaseComparator {
-          int operator()(const String& x, const String& y) const {
-			  return scumm_stricmp(x.c_str(), y.c_str()); }
-        };
 
-		typedef HashMap<String, PanelItem*, Common::IgnoreCase_Hash , IgnoreCaseComparator> ItemMap;
+		typedef HashMap<String, PanelItem*, Common::IgnoreCase_Hash , Common::IgnoreCase_EqualTo> ItemMap;
 
 		ItemMap _itemsMap;
 		int _interleave;

Modified: scummvm/trunk/backends/wince/CEgui/ToolbarHandler.h
===================================================================
--- scummvm/trunk/backends/wince/CEgui/ToolbarHandler.h	2006-06-10 11:23:00 UTC (rev 23006)
+++ scummvm/trunk/backends/wince/CEgui/ToolbarHandler.h	2006-06-10 11:23:40 UTC (rev 23007)
@@ -55,12 +55,7 @@
 		virtual ~ToolbarHandler();
 	private:
 
-		struct IgnoreCaseComparator {
-          int operator()(const String& x, const String& y) const {
-			  return scumm_stricmp(x.c_str(), y.c_str()); }
-        };
-
-		HashMap<String, Toolbar*, Common::IgnoreCase_Hash, IgnoreCaseComparator> _toolbarMap;
+		HashMap<String, Toolbar*, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _toolbarMap;
 		String _current;
 		Toolbar *_active;
 		int _offset;


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