Use a typedef in ImageCollection

Author: xezon

GeneralsMD/Code/GameEngine/Include/GameClient/Image.h

@@ -116,6 +116,7 @@ friend class ImageCollection;
 //-------------------------------------------------------------------------------------------------
 class ImageCollection : public SubsystemInterface
 {
+	typedef std::map<NameKeyType, Image *> ImageMap;
 
 public:
 
@@ -136,14 +137,14 @@ class ImageCollection : public SubsystemInterface
   /// enumerates the list of existing images
   Image *Enum(unsigned index)
   {
-    for (std::map<unsigned,Image *>::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
+    for (ImageMap::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
       if (!index--)
         return i->second;
     return NULL;
   }
 
 protected:
-  std::map<unsigned,Image *> m_imageMap;  ///< maps named keys to images
+  ImageMap m_imageMap;  ///< maps named keys to images
 };
 
 // INLINING ///////////////////////////////////////////////////////////////////////////////////////

GeneralsMD/Code/GameEngine/Source/GameClient/System/Image.cpp

@@ -204,7 +204,7 @@ ImageCollection::ImageCollection( void )
 //-------------------------------------------------------------------------------------------------
 ImageCollection::~ImageCollection( void )
 {
-  for (std::map<unsigned,Image *>::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
+  for (ImageMap::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
     deleteInstance(i->second);
 }
 
@@ -221,7 +221,7 @@ void ImageCollection::addImage( Image *image )
 //-------------------------------------------------------------------------------------------------
 const Image *ImageCollection::findImageByName( const char* name ) const
 {
-  std::map<unsigned,Image *>::const_iterator i=m_imageMap.find(TheNameKeyGenerator->nameToLowercaseKey(name));
+  ImageMap::const_iterator i=m_imageMap.find(TheNameKeyGenerator->nameToLowercaseKey(name));
   return i==m_imageMap.end()?NULL:i->second;
 }