From 9d75ef8bf222b5e6d98327292659ab8530f43981 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sat, 7 Apr 2007 06:13:00 +0000 Subject: [PATCH] While I'm at it, const. --- stepmania/src/SongManager.cpp | 42 +++++++++++++++++------------------ stepmania/src/SongManager.h | 42 +++++++++++++++++------------------ 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 4c50771118..30326b8c72 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -352,7 +352,7 @@ void SongManager::FreeSongs() m_pShuffledSongs.clear(); } -RString SongManager::GetSongGroupBannerPath( RString sSongGroup ) +RString SongManager::GetSongGroupBannerPath( RString sSongGroup ) const { for( unsigned i = 0; i < m_sSongGroupNames.size(); ++i ) { @@ -363,17 +363,17 @@ RString SongManager::GetSongGroupBannerPath( RString sSongGroup ) return RString(); } -void SongManager::GetSongGroupNames( vector &AddTo ) +void SongManager::GetSongGroupNames( vector &AddTo ) const { AddTo.insert(AddTo.end(), m_sSongGroupNames.begin(), m_sSongGroupNames.end() ); } -bool SongManager::DoesSongGroupExist( RString sSongGroup ) +bool SongManager::DoesSongGroupExist( RString sSongGroup ) const { return find( m_sSongGroupNames.begin(), m_sSongGroupNames.end(), sSongGroup ) != m_sSongGroupNames.end(); } -RageColor SongManager::GetSongGroupColor( const RString &sSongGroup ) +RageColor SongManager::GetSongGroupColor( const RString &sSongGroup ) const { for( unsigned i=0; i::const_iterator iter = m_mapCourseGroupToInfo.find( sCourseGroup ); if( iter == m_mapCourseGroupToInfo.end() ) @@ -464,18 +464,18 @@ RString SongManager::GetCourseGroupBannerPath( const RString &sCourseGroup ) } } -void SongManager::GetCourseGroupNames( vector &AddTo ) +void SongManager::GetCourseGroupNames( vector &AddTo ) const { FOREACHM_CONST( RString, CourseGroupInfo, m_mapCourseGroupToInfo, iter ) AddTo.push_back( iter->first ); } -bool SongManager::DoesCourseGroupExist( const RString &sCourseGroup ) +bool SongManager::DoesCourseGroupExist( const RString &sCourseGroup ) const { return m_mapCourseGroupToInfo.find( sCourseGroup ) != m_mapCourseGroupToInfo.end(); } -RageColor SongManager::GetCourseGroupColor( const RString &sCourseGroup ) +RageColor SongManager::GetCourseGroupColor( const RString &sCourseGroup ) const { int iIndex = 0; FOREACHM_CONST( RString, CourseGroupInfo, m_mapCourseGroupToInfo, iter ) @@ -489,7 +489,7 @@ RageColor SongManager::GetCourseGroupColor( const RString &sCourseGroup ) return RageColor(1,1,1,1); } -RageColor SongManager::GetCourseColor( const Course* pCourse ) +RageColor SongManager::GetCourseColor( const Course* pCourse ) const { // Use unlock color if applicable const UnlockEntry *pUE = UNLOCKMAN->FindCourse( pCourse ); @@ -915,7 +915,7 @@ void SongManager::SetPreferences() } } -void SongManager::GetStepsLoadedFromProfile( vector &AddTo, ProfileSlot slot ) +void SongManager::GetStepsLoadedFromProfile( vector &AddTo, ProfileSlot slot ) const { const vector &vSongs = SONGMAN->GetSongs(); FOREACH_CONST( Song*, vSongs, song ) @@ -924,7 +924,7 @@ void SongManager::GetStepsLoadedFromProfile( vector &AddTo, ProfileSlot } } -Song *SongManager::GetSongFromSteps( Steps *pSteps ) +Song *SongManager::GetSongFromSteps( Steps *pSteps ) const { ASSERT( pSteps ); const vector &vSongs = SONGMAN->GetSongs(); @@ -963,7 +963,7 @@ bool SongManager::WasLoadedFromAdditionalCourses( const Course *pCourse ) const return BeginsWith( sDir, ADDITIONAL_COURSES_DIR ); } -void SongManager::GetAllCourses( vector &AddTo, bool bIncludeAutogen ) +void SongManager::GetAllCourses( vector &AddTo, bool bIncludeAutogen ) const { for( unsigned i=0; im_bIsAutogen ) @@ -978,7 +978,7 @@ void SongManager::GetCourses( CourseType ct, vector &AddTo, bool bInclu AddTo.push_back( m_pCourses[i] ); } -void SongManager::GetCoursesInGroup( vector &AddTo, const RString &sCourseGroup, bool bIncludeAutogen ) +void SongManager::GetCoursesInGroup( vector &AddTo, const RString &sCourseGroup, bool bIncludeAutogen ) const { for( unsigned i=0; im_sGroupName == sCourseGroup ) @@ -1175,7 +1175,7 @@ Course* SongManager::GetRandomCourse() return NULL; } -Song* SongManager::GetSongFromDir( RString sDir ) +Song* SongManager::GetSongFromDir( RString sDir ) const { if( sDir.Right(1) != "/" ) sDir += "/"; @@ -1189,7 +1189,7 @@ Song* SongManager::GetSongFromDir( RString sDir ) return NULL; } -Course* SongManager::GetCourseFromPath( RString sPath ) +Course* SongManager::GetCourseFromPath( RString sPath ) const { if( sPath == "" ) return NULL; @@ -1203,7 +1203,7 @@ Course* SongManager::GetCourseFromPath( RString sPath ) return NULL; } -Course* SongManager::GetCourseFromName( RString sName ) +Course* SongManager::GetCourseFromName( RString sName ) const { if( sName == "" ) return NULL; @@ -1233,7 +1233,7 @@ Course* SongManager::GetCourseFromName( RString sName ) * songs in "Songs"; we don't want that. */ -Song *SongManager::FindSong( RString sPath ) +Song *SongManager::FindSong( RString sPath ) const { sPath.Replace( '\\', '/' ); vector bits; @@ -1247,7 +1247,7 @@ Song *SongManager::FindSong( RString sPath ) return NULL; } -Song *SongManager::FindSong( RString sGroup, RString sSong ) +Song *SongManager::FindSong( RString sGroup, RString sSong ) const { // foreach song const vector &vSongs = GetSongs( sGroup.empty()? GROUP_ALL:sGroup ); @@ -1260,7 +1260,7 @@ Song *SongManager::FindSong( RString sGroup, RString sSong ) return NULL; } -Course *SongManager::FindCourse( RString sPath ) +Course *SongManager::FindCourse( RString sPath ) const { sPath.Replace( '\\', '/' ); vector bits; @@ -1274,7 +1274,7 @@ Course *SongManager::FindCourse( RString sPath ) return NULL; } -Course *SongManager::FindCourse( RString sGroup, RString sName ) +Course *SongManager::FindCourse( RString sGroup, RString sName ) const { FOREACH_CONST( Course*, m_pCourses, c ) { diff --git a/stepmania/src/SongManager.h b/stepmania/src/SongManager.h index 2d40c1345b..62f679f3b8 100644 --- a/stepmania/src/SongManager.h +++ b/stepmania/src/SongManager.h @@ -57,17 +57,17 @@ public: void Reload( bool bAllowFastLoad, LoadingWindow *ld=NULL ); // songs, courses, groups - everything. void PreloadSongImages(); - RString GetSongGroupBannerPath( RString sSongGroup ); - void GetSongGroupNames( vector &AddTo ); - bool DoesSongGroupExist( RString sSongGroup ); - RageColor GetSongGroupColor( const RString &sSongGroupName ); - RageColor GetSongColor( const Song* pSong ); + RString GetSongGroupBannerPath( RString sSongGroup ) const; + void GetSongGroupNames( vector &AddTo ) const; + bool DoesSongGroupExist( RString sSongGroup ) const; + RageColor GetSongGroupColor( const RString &sSongGroupName ) const; + RageColor GetSongColor( const Song* pSong ) const; - RString GetCourseGroupBannerPath( const RString &sCourseGroup ); - void GetCourseGroupNames( vector &AddTo ); - bool DoesCourseGroupExist( const RString &sCourseGroup ); - RageColor GetCourseGroupColor( const RString &sCourseGroupName ); - RageColor GetCourseColor( const Course* pCourse ); + RString GetCourseGroupBannerPath( const RString &sCourseGroup ) const; + void GetCourseGroupNames( vector &AddTo ) const; + bool DoesCourseGroupExist( const RString &sCourseGroup ) const; + RageColor GetCourseGroupColor( const RString &sCourseGroupName ) const; + RageColor GetCourseColor( const Course* pCourse ) const; static RString ShortenGroupName( RString sLongGroupName ); @@ -78,10 +78,10 @@ public: void GetPreferredSortSongs( vector &AddTo ) const; const vector &GetPopularSongs( ProfileSlot slot=ProfileSlot_Machine ) const { return m_pPopularSongs[slot]; } const vector &GetPopularCourses( CourseType ct, ProfileSlot slot=ProfileSlot_Machine ) const { return m_pPopularCourses[slot][ct]; } - Song *FindSong( RString sPath ); - Song *FindSong( RString sGroup, RString sSong ); - Course *FindCourse( RString sPath ); - Course *FindCourse( RString sGroup, RString sName ); + Song *FindSong( RString sPath ) const; + Song *FindSong( RString sGroup, RString sSong ) const; + Course *FindCourse( RString sPath ) const; + Course *FindCourse( RString sGroup, RString sName ) const; int GetNumSongs() const; int GetNumUnlockedSongs() const; int GetNumSelectableAndUnlockedSongs() const; @@ -94,22 +94,22 @@ public: Song* GetRandomSong(); Course* GetRandomCourse(); - void GetStepsLoadedFromProfile( vector &AddTo, ProfileSlot slot ); - Song *GetSongFromSteps( Steps *pSteps ); + void GetStepsLoadedFromProfile( vector &AddTo, ProfileSlot slot ) const; + Song *GetSongFromSteps( Steps *pSteps ) const; void DeleteSteps( Steps *pSteps ); // transfers ownership of pSteps bool WasLoadedFromAdditionalSongs( const Song *pSong ) const; bool WasLoadedFromAdditionalCourses( const Course *pCourse ) const; - void GetAllCourses( vector &AddTo, bool bIncludeAutogen ); + void GetAllCourses( vector &AddTo, bool bIncludeAutogen ) const; void GetCourses( CourseType ct, vector &AddTo, bool bIncludeAutogen ) const; - void GetCoursesInGroup( vector &AddTo, const RString &sCourseGroup, bool bIncludeAutogen ); + void GetCoursesInGroup( vector &AddTo, const RString &sCourseGroup, bool bIncludeAutogen ) const; void GetPreferredSortCourses( CourseType ct, vector &AddTo, bool bIncludeAutogen ) const; void GetExtraStageInfo( bool bExtra2, const Style *s, Song*& pSongOut, Steps*& pStepsOut, PlayerOptions *pPlayerOptionsOut, SongOptions *pSongOptionsOut ); - Song* GetSongFromDir( RString sDir ); - Course* GetCourseFromPath( RString sPath ); // path to .crs file, or path to song group dir - Course* GetCourseFromName( RString sName ); + Song* GetSongFromDir( RString sDir ) const; + Course* GetCourseFromPath( RString sPath ) const; // path to .crs file, or path to song group dir + Course* GetCourseFromName( RString sName ) const; void UpdatePopular();