From 72ed44a52e83d85b9ccaf33567527c3be0c3ad2b Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Sat, 7 Apr 2007 06:04:40 +0000
Subject: [PATCH] Don't use istring, just use a comparison object that ignores
 case.

---
 stepmania/src/SongManager.cpp | 6 +++---
 stepmania/src/SongManager.h   | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index 06c31db1d5..4c50771118 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -222,7 +222,7 @@ void SongManager::LoadStepManiaSongDir( RString sDir, LoadingWindow *ld )
 				   (sDir+sGroupDirName).c_str() );
 		int loaded = 0;
 
-		SongPointerVector& index_entry = m_mapSongGroupIndex[istring(sGroupDirName)];
+		SongPointerVector& index_entry = m_mapSongGroupIndex[sGroupDirName];
 
 		for( unsigned j=0; j< arraySongDirs.size(); ++j )	// for each song dir
 		{
@@ -273,7 +273,7 @@ void SongManager::LoadGroupSymLinks(RString sDir, RString sGroupFolder)
 	vector<RString> arraySymLinks;
 	GetDirListing( sDir+sGroupFolder+"/*.include", arraySymLinks, false );
 	SortRStringArray( arraySymLinks );
-	SongPointerVector& index_entry = m_mapSongGroupIndex[istring(sGroupFolder)];
+	SongPointerVector& index_entry = m_mapSongGroupIndex[sGroupFolder];
 	for( unsigned s=0; s< arraySymLinks.size(); s++ )	// for each symlink in this dir, add it in as a song.
 	{
 		MsdFile		msdF;
@@ -526,7 +526,7 @@ const vector<Song*> &SongManager::GetSongs( const RString &sGroupName ) const
 	
 	if( sGroupName == GROUP_ALL )
 		return m_pSongs;
-	map<istring, SongPointerVector>::const_iterator iter = m_mapSongGroupIndex.find( istring(sGroupName) );
+	map<RString, SongPointerVector, Comp>::const_iterator iter = m_mapSongGroupIndex.find( sGroupName );
 	if ( iter != m_mapSongGroupIndex.end() )
 		return iter->second;
 	return vEmpty;
diff --git a/stepmania/src/SongManager.h b/stepmania/src/SongManager.h
index 645efdab9c..2d40c1345b 100644
--- a/stepmania/src/SongManager.h
+++ b/stepmania/src/SongManager.h
@@ -139,7 +139,9 @@ protected:
 	vector<SongPointerVector> m_vPreferredSongSort;
 	vector<RString>		m_sSongGroupNames;
 	vector<RString>		m_sSongGroupBannerPaths; // each song group may have a banner associated with it
-	map<istring,SongPointerVector> m_mapSongGroupIndex;
+	
+	struct Comp { bool operator()(const RString& s, const RString &t) const { return CompareRStringsAsc(s,t); } };
+	map<RString,SongPointerVector,Comp> m_mapSongGroupIndex;
 
 	vector<Course*>		m_pCourses;
 	vector<Course*>		m_pPopularCourses[NUM_ProfileSlot][NUM_CourseType];