actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

While I'm at it, const.

Browse Source
This commit is contained in:
Steve Checkoway
2007-04-07 06:13:00 +00:00
parent 72ed44a52e
commit 9d75ef8bf2
2 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongManager.cpp
+21 -21
View File
@@ -352,7 +352,7 @@ void SongManager::FreeSongs()
m_pShuffledSongs.clear(); m_pShuffledSongs.clear();
} }
RString SongManager::GetSongGroupBannerPath( RString sSongGroup ) RString SongManager::GetSongGroupBannerPath( RString sSongGroup ) const
{ {
for( unsigned i = 0; i < m_sSongGroupNames.size(); ++i ) for( unsigned i = 0; i < m_sSongGroupNames.size(); ++i )
{ {
@@ -363,17 +363,17 @@ RString SongManager::GetSongGroupBannerPath( RString sSongGroup )
return RString(); return RString();
} }
void SongManager::GetSongGroupNames( vector<RString> &AddTo ) void SongManager::GetSongGroupNames( vector<RString> &AddTo ) const
{ {
AddTo.insert(AddTo.end(), m_sSongGroupNames.begin(), m_sSongGroupNames.end() ); 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(); 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<m_sSongGroupNames.size(); i++ ) for( unsigned i=0; i<m_sSongGroupNames.size(); i++ )
{ {
@@ -385,7 +385,7 @@ RageColor SongManager::GetSongGroupColor( const RString &sSongGroup )
return RageColor(1,1,1,1); return RageColor(1,1,1,1);
} }
RageColor SongManager::GetSongColor( const Song* pSong ) RageColor SongManager::GetSongColor( const Song* pSong ) const
{ {
ASSERT( pSong ); ASSERT( pSong );
@@ -450,7 +450,7 @@ RageColor SongManager::GetSongColor( const Song* pSong )
} }
} }
RString SongManager::GetCourseGroupBannerPath( const RString &sCourseGroup ) RString SongManager::GetCourseGroupBannerPath( const RString &sCourseGroup ) const
{ {
map<RString, CourseGroupInfo>::const_iterator iter = m_mapCourseGroupToInfo.find( sCourseGroup ); map<RString, CourseGroupInfo>::const_iterator iter = m_mapCourseGroupToInfo.find( sCourseGroup );
if( iter == m_mapCourseGroupToInfo.end() ) if( iter == m_mapCourseGroupToInfo.end() )
@@ -464,18 +464,18 @@ RString SongManager::GetCourseGroupBannerPath( const RString &sCourseGroup )
} }
} }
void SongManager::GetCourseGroupNames( vector<RString> &AddTo ) void SongManager::GetCourseGroupNames( vector<RString> &AddTo ) const
{ {
FOREACHM_CONST( RString, CourseGroupInfo, m_mapCourseGroupToInfo, iter ) FOREACHM_CONST( RString, CourseGroupInfo, m_mapCourseGroupToInfo, iter )
AddTo.push_back( iter->first ); 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(); return m_mapCourseGroupToInfo.find( sCourseGroup ) != m_mapCourseGroupToInfo.end();
} }
RageColor SongManager::GetCourseGroupColor( const RString &sCourseGroup ) RageColor SongManager::GetCourseGroupColor( const RString &sCourseGroup ) const
{ {
int iIndex = 0; int iIndex = 0;
FOREACHM_CONST( RString, CourseGroupInfo, m_mapCourseGroupToInfo, iter ) FOREACHM_CONST( RString, CourseGroupInfo, m_mapCourseGroupToInfo, iter )
@@ -489,7 +489,7 @@ RageColor SongManager::GetCourseGroupColor( const RString &sCourseGroup )
return RageColor(1,1,1,1); return RageColor(1,1,1,1);
} }
RageColor SongManager::GetCourseColor( const Course* pCourse ) RageColor SongManager::GetCourseColor( const Course* pCourse ) const
{ {
// Use unlock color if applicable // Use unlock color if applicable
const UnlockEntry *pUE = UNLOCKMAN->FindCourse( pCourse ); const UnlockEntry *pUE = UNLOCKMAN->FindCourse( pCourse );
@@ -915,7 +915,7 @@ void SongManager::SetPreferences()
} }
} }
void SongManager::GetStepsLoadedFromProfile( vector<Steps*> &AddTo, ProfileSlot slot ) void SongManager::GetStepsLoadedFromProfile( vector<Steps*> &AddTo, ProfileSlot slot ) const
{ {
const vector<Song*> &vSongs = SONGMAN->GetSongs(); const vector<Song*> &vSongs = SONGMAN->GetSongs();
FOREACH_CONST( Song*, vSongs, song ) FOREACH_CONST( Song*, vSongs, song )
@@ -924,7 +924,7 @@ void SongManager::GetStepsLoadedFromProfile( vector<Steps*> &AddTo, ProfileSlot
} }
} }
Song *SongManager::GetSongFromSteps( Steps *pSteps ) Song *SongManager::GetSongFromSteps( Steps *pSteps ) const
{ {
ASSERT( pSteps ); ASSERT( pSteps );
const vector<Song*> &vSongs = SONGMAN->GetSongs(); const vector<Song*> &vSongs = SONGMAN->GetSongs();
@@ -963,7 +963,7 @@ bool SongManager::WasLoadedFromAdditionalCourses( const Course *pCourse ) const
return BeginsWith( sDir, ADDITIONAL_COURSES_DIR ); return BeginsWith( sDir, ADDITIONAL_COURSES_DIR );
} }
void SongManager::GetAllCourses( vector<Course*> &AddTo, bool bIncludeAutogen ) void SongManager::GetAllCourses( vector<Course*> &AddTo, bool bIncludeAutogen ) const
{ {
for( unsigned i=0; i<m_pCourses.size(); i++ ) for( unsigned i=0; i<m_pCourses.size(); i++ )
if( bIncludeAutogen || !m_pCourses[i]->m_bIsAutogen ) if( bIncludeAutogen || !m_pCourses[i]->m_bIsAutogen )
@@ -978,7 +978,7 @@ void SongManager::GetCourses( CourseType ct, vector<Course*> &AddTo, bool bInclu
AddTo.push_back( m_pCourses[i] ); AddTo.push_back( m_pCourses[i] );
} }
void SongManager::GetCoursesInGroup( vector<Course*> &AddTo, const RString &sCourseGroup, bool bIncludeAutogen ) void SongManager::GetCoursesInGroup( vector<Course*> &AddTo, const RString &sCourseGroup, bool bIncludeAutogen ) const
{ {
for( unsigned i=0; i<m_pCourses.size(); i++ ) for( unsigned i=0; i<m_pCourses.size(); i++ )
if( m_pCourses[i]->m_sGroupName == sCourseGroup ) if( m_pCourses[i]->m_sGroupName == sCourseGroup )
@@ -1175,7 +1175,7 @@ Course* SongManager::GetRandomCourse()
return NULL; return NULL;
} }
Song* SongManager::GetSongFromDir( RString sDir ) Song* SongManager::GetSongFromDir( RString sDir ) const
{ {
if( sDir.Right(1) != "/" ) if( sDir.Right(1) != "/" )
sDir += "/"; sDir += "/";
@@ -1189,7 +1189,7 @@ Song* SongManager::GetSongFromDir( RString sDir )
return NULL; return NULL;
} }
Course* SongManager::GetCourseFromPath( RString sPath ) Course* SongManager::GetCourseFromPath( RString sPath ) const
{ {
if( sPath == "" ) if( sPath == "" )
return NULL; return NULL;
@@ -1203,7 +1203,7 @@ Course* SongManager::GetCourseFromPath( RString sPath )
return NULL; return NULL;
} }
Course* SongManager::GetCourseFromName( RString sName ) Course* SongManager::GetCourseFromName( RString sName ) const
{ {
if( sName == "" ) if( sName == "" )
return NULL; return NULL;
@@ -1233,7 +1233,7 @@ Course* SongManager::GetCourseFromName( RString sName )
* songs in "Songs"; we don't want that. * songs in "Songs"; we don't want that.
*/ */
Song *SongManager::FindSong( RString sPath ) Song *SongManager::FindSong( RString sPath ) const
{ {
sPath.Replace( '\\', '/' ); sPath.Replace( '\\', '/' );
vector<RString> bits; vector<RString> bits;
@@ -1247,7 +1247,7 @@ Song *SongManager::FindSong( RString sPath )
return NULL; return NULL;
} }
Song *SongManager::FindSong( RString sGroup, RString sSong ) Song *SongManager::FindSong( RString sGroup, RString sSong ) const
{ {
// foreach song // foreach song
const vector<Song *> &vSongs = GetSongs( sGroup.empty()? GROUP_ALL:sGroup ); const vector<Song *> &vSongs = GetSongs( sGroup.empty()? GROUP_ALL:sGroup );
@@ -1260,7 +1260,7 @@ Song *SongManager::FindSong( RString sGroup, RString sSong )
return NULL; return NULL;
} }
Course *SongManager::FindCourse( RString sPath ) Course *SongManager::FindCourse( RString sPath ) const
{ {
sPath.Replace( '\\', '/' ); sPath.Replace( '\\', '/' );
vector<RString> bits; vector<RString> bits;
@@ -1274,7 +1274,7 @@ Course *SongManager::FindCourse( RString sPath )
return NULL; return NULL;
} }
Course *SongManager::FindCourse( RString sGroup, RString sName ) Course *SongManager::FindCourse( RString sGroup, RString sName ) const
{ {
FOREACH_CONST( Course*, m_pCourses, c ) FOREACH_CONST( Course*, m_pCourses, c )
{ {
stepmania/src/SongManager.h
+21 -21
View File
@@ -57,17 +57,17 @@ public:
void Reload( bool bAllowFastLoad, LoadingWindow *ld=NULL ); // songs, courses, groups - everything. void Reload( bool bAllowFastLoad, LoadingWindow *ld=NULL ); // songs, courses, groups - everything.
void PreloadSongImages(); void PreloadSongImages();
RString GetSongGroupBannerPath( RString sSongGroup ); RString GetSongGroupBannerPath( RString sSongGroup ) const;
void GetSongGroupNames( vector<RString> &AddTo ); void GetSongGroupNames( vector<RString> &AddTo ) const;
bool DoesSongGroupExist( RString sSongGroup ); bool DoesSongGroupExist( RString sSongGroup ) const;
RageColor GetSongGroupColor( const RString &sSongGroupName ); RageColor GetSongGroupColor( const RString &sSongGroupName ) const;
RageColor GetSongColor( const Song* pSong ); RageColor GetSongColor( const Song* pSong ) const;
RString GetCourseGroupBannerPath( const RString &sCourseGroup ); RString GetCourseGroupBannerPath( const RString &sCourseGroup ) const;
void GetCourseGroupNames( vector<RString> &AddTo ); void GetCourseGroupNames( vector<RString> &AddTo ) const;
bool DoesCourseGroupExist( const RString &sCourseGroup ); bool DoesCourseGroupExist( const RString &sCourseGroup ) const;
RageColor GetCourseGroupColor( const RString &sCourseGroupName ); RageColor GetCourseGroupColor( const RString &sCourseGroupName ) const;
RageColor GetCourseColor( const Course* pCourse ); RageColor GetCourseColor( const Course* pCourse ) const;
static RString ShortenGroupName( RString sLongGroupName ); static RString ShortenGroupName( RString sLongGroupName );
@@ -78,10 +78,10 @@ public:
void GetPreferredSortSongs( vector<Song*> &AddTo ) const; void GetPreferredSortSongs( vector<Song*> &AddTo ) const;
const vector<Song*> &GetPopularSongs( ProfileSlot slot=ProfileSlot_Machine ) const { return m_pPopularSongs[slot]; } const vector<Song*> &GetPopularSongs( ProfileSlot slot=ProfileSlot_Machine ) const { return m_pPopularSongs[slot]; }
const vector<Course*> &GetPopularCourses( CourseType ct, ProfileSlot slot=ProfileSlot_Machine ) const { return m_pPopularCourses[slot][ct]; } const vector<Course*> &GetPopularCourses( CourseType ct, ProfileSlot slot=ProfileSlot_Machine ) const { return m_pPopularCourses[slot][ct]; }
Song *FindSong( RString sPath ); Song *FindSong( RString sPath ) const;
Song *FindSong( RString sGroup, RString sSong ); Song *FindSong( RString sGroup, RString sSong ) const;
Course *FindCourse( RString sPath ); Course *FindCourse( RString sPath ) const;
Course *FindCourse( RString sGroup, RString sName ); Course *FindCourse( RString sGroup, RString sName ) const;
int GetNumSongs() const; int GetNumSongs() const;
int GetNumUnlockedSongs() const; int GetNumUnlockedSongs() const;
int GetNumSelectableAndUnlockedSongs() const; int GetNumSelectableAndUnlockedSongs() const;
@@ -94,22 +94,22 @@ public:
Song* GetRandomSong(); Song* GetRandomSong();
Course* GetRandomCourse(); Course* GetRandomCourse();
void GetStepsLoadedFromProfile( vector<Steps*> &AddTo, ProfileSlot slot ); void GetStepsLoadedFromProfile( vector<Steps*> &AddTo, ProfileSlot slot ) const;
Song *GetSongFromSteps( Steps *pSteps ); Song *GetSongFromSteps( Steps *pSteps ) const;
void DeleteSteps( Steps *pSteps ); // transfers ownership of pSteps void DeleteSteps( Steps *pSteps ); // transfers ownership of pSteps
bool WasLoadedFromAdditionalSongs( const Song *pSong ) const; bool WasLoadedFromAdditionalSongs( const Song *pSong ) const;
bool WasLoadedFromAdditionalCourses( const Course *pCourse ) const; bool WasLoadedFromAdditionalCourses( const Course *pCourse ) const;
void GetAllCourses( vector<Course*> &AddTo, bool bIncludeAutogen ); void GetAllCourses( vector<Course*> &AddTo, bool bIncludeAutogen ) const;
void GetCourses( CourseType ct, vector<Course*> &AddTo, bool bIncludeAutogen ) const; void GetCourses( CourseType ct, vector<Course*> &AddTo, bool bIncludeAutogen ) const;
void GetCoursesInGroup( vector<Course*> &AddTo, const RString &sCourseGroup, bool bIncludeAutogen ); void GetCoursesInGroup( vector<Course*> &AddTo, const RString &sCourseGroup, bool bIncludeAutogen ) const;
void GetPreferredSortCourses( CourseType ct, vector<Course*> &AddTo, bool bIncludeAutogen ) const; void GetPreferredSortCourses( CourseType ct, vector<Course*> &AddTo, bool bIncludeAutogen ) const;
void GetExtraStageInfo( bool bExtra2, const Style *s, void GetExtraStageInfo( bool bExtra2, const Style *s,
Song*& pSongOut, Steps*& pStepsOut, PlayerOptions *pPlayerOptionsOut, SongOptions *pSongOptionsOut ); Song*& pSongOut, Steps*& pStepsOut, PlayerOptions *pPlayerOptionsOut, SongOptions *pSongOptionsOut );
Song* GetSongFromDir( RString sDir ); Song* GetSongFromDir( RString sDir ) const;
Course* GetCourseFromPath( RString sPath ); // path to .crs file, or path to song group dir Course* GetCourseFromPath( RString sPath ) const; // path to .crs file, or path to song group dir
Course* GetCourseFromName( RString sName ); Course* GetCourseFromName( RString sName ) const;
void UpdatePopular(); void UpdatePopular();