From 205b8d6411c133f38dc5d11c8235ba0a45cd5760 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 14 Feb 2006 11:06:20 +0000
Subject: [PATCH] cleanup, remove ASMHClass::LogMessageNumbers

---
 stepmania/src/ScreenMessage.cpp | 39 ++++++++++-----------------------
 stepmania/src/ScreenMessage.h   |  7 +++---
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/stepmania/src/ScreenMessage.cpp b/stepmania/src/ScreenMessage.cpp
index 6e2fc00fb8..f9245d8f20 100644
--- a/stepmania/src/ScreenMessage.cpp
+++ b/stepmania/src/ScreenMessage.cpp
@@ -1,49 +1,32 @@
 #include "global.h"
 #include "ScreenMessage.h"
 #include "RageLog.h"
+#include "Foreach.h"
 
 ASMHClass AutoScreenMessageHandler;
 
-ScreenMessage ASMHClass::ToMessageNumber( const RString &Name )
+ScreenMessage ASMHClass::ToMessageNumber( const RString &sName )
 {
-	//If uninitilized, initilize the map.  We KNOW it will be NULL
-	if ( m_pScreenMessages == NULL )
+	if( m_pScreenMessages == NULL )
 	{
-		m_pScreenMessages = new map < RString, ScreenMessage >;
+		m_pScreenMessages = new map<RString, ScreenMessage>;
 		m_iCurScreenMessage = SM_User;
 	}
 
-	//If the ScreenMessage doesn't exist yet, create it
-	if ( m_pScreenMessages->find( Name ) == m_pScreenMessages->end() )
+	if( m_pScreenMessages->find( sName ) == m_pScreenMessages->end() )
 	{
 		m_iCurScreenMessage = ScreenMessage((int)m_iCurScreenMessage + 1);
-		(*m_pScreenMessages)[ Name ] = m_iCurScreenMessage;
+		(*m_pScreenMessages)[sName] = m_iCurScreenMessage;
 	}
 
-	return (*m_pScreenMessages)[Name];
+	return (*m_pScreenMessages)[sName];
 }
 
-void ASMHClass::LogMessageNumbers( )
+RString	ASMHClass::NumberToString( ScreenMessage SM ) const
 {
-	map < RString, ScreenMessage >::iterator iter;
-
-	//Log all ScreenMessages currently in the map
-
-	LOG->Trace( "Current ScreenMessage: %d  -- SM_User: %d", m_iCurScreenMessage, SM_User );
-    for ( iter = m_pScreenMessages->begin(); iter != m_pScreenMessages->end(); iter++ )
-		LOG->Trace( "ScreenMessage: %3d: %s", iter->second, (*iter).first.c_str() );
-}
-
-RString	ASMHClass::NumberToString( ScreenMessage SM )
-{
-	map < RString, ScreenMessage >::iterator iter;
-
-	//Log all ScreenMessages currently in the map
-
-	LOG->Trace( "Current ScreenMessage: %d  -- SM_User: %d", m_iCurScreenMessage, SM_User );
-    for ( iter = m_pScreenMessages->begin(); iter != m_pScreenMessages->end(); iter++ )
-		if ( SM == iter->second )
-			return (*iter).first;
+	FOREACHM( RString, ScreenMessage, *m_pScreenMessages, it )
+		if( SM == it->second )
+			return (*it).first;
 
 	return RString();
 }
diff --git a/stepmania/src/ScreenMessage.h b/stepmania/src/ScreenMessage.h
index 8b7ce3f7db..26b663c4da 100644
--- a/stepmania/src/ScreenMessage.h
+++ b/stepmania/src/ScreenMessage.h
@@ -46,15 +46,14 @@ enum ScreenMessage {
 	SM_Invalid = 999999
 };
 
-//AutoScreenMessageHandler Class
 class ASMHClass
 {
 public:
 	ScreenMessage ToMessageNumber( const RString & Name );
-	RString	NumberToString( ScreenMessage SM );
-	void LogMessageNumbers();
+	RString	NumberToString( ScreenMessage SM ) const;
+
 private:
-	map < RString, ScreenMessage > *m_pScreenMessages;
+	map<RString, ScreenMessage> *m_pScreenMessages;
 	ScreenMessage m_iCurScreenMessage;
 };