From cb5bf9720de5bcf88448aca0cbc8a8b94aa6f4fe Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 2 Feb 2006 23:52:28 +0000 Subject: [PATCH] const RString & for easier debug stepping --- stepmania/src/NotesLoader.cpp | 4 ++-- stepmania/src/NotesLoader.h | 8 ++++---- stepmania/src/NotesLoaderBMS.cpp | 4 ++-- stepmania/src/NotesLoaderBMS.h | 4 ++-- stepmania/src/NotesLoaderDWI.cpp | 6 +++--- stepmania/src/NotesLoaderDWI.h | 8 ++++---- stepmania/src/NotesLoaderKSF.cpp | 4 ++-- stepmania/src/NotesLoaderKSF.h | 4 ++-- stepmania/src/NotesLoaderSM.cpp | 10 +++++----- stepmania/src/NotesLoaderSM.h | 16 ++++++++-------- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/stepmania/src/NotesLoader.cpp b/stepmania/src/NotesLoader.cpp index c87f876641..d439c65d5f 100644 --- a/stepmania/src/NotesLoader.cpp +++ b/stepmania/src/NotesLoader.cpp @@ -3,14 +3,14 @@ #include "NoteTypes.h" #include "GameManager.h" -bool NotesLoader::Loadable( RString sPath ) +bool NotesLoader::Loadable( const RString &sPath ) { vector list; GetApplicableFiles( sPath, list ); return !list.empty(); } -void NotesLoader::GetMainAndSubTitlesFromFullTitle( const RString sFullTitle, RString &sMainTitleOut, RString &sSubTitleOut ) +void NotesLoader::GetMainAndSubTitlesFromFullTitle( const RString &sFullTitle, RString &sMainTitleOut, RString &sSubTitleOut ) { const RString sLeftSeps[] = { " -", " ~", " (", " [", "\t" }; diff --git a/stepmania/src/NotesLoader.h b/stepmania/src/NotesLoader.h index 1e95381084..9f7d8b6c73 100644 --- a/stepmania/src/NotesLoader.h +++ b/stepmania/src/NotesLoader.h @@ -11,17 +11,17 @@ class Song; class NotesLoader { protected: - virtual void GetApplicableFiles( RString sPath, vector &out )=0; + virtual void GetApplicableFiles( const RString &sPath, vector &out )=0; set BlacklistedImages; public: virtual ~NotesLoader() { } const set &GetBlacklistedImages() const { return BlacklistedImages; } - static void GetMainAndSubTitlesFromFullTitle( const RString sFullTitle, RString &sMainTitleOut, RString &sSubTitleOut ); - virtual bool LoadFromDir( RString sPath, Song &out ) = 0; + static void GetMainAndSubTitlesFromFullTitle( const RString &sFullTitle, RString &sMainTitleOut, RString &sSubTitleOut ); + virtual bool LoadFromDir( const RString &sPath, Song &out ) = 0; virtual void TidyUpData( Song &song, bool cache ) { } - bool Loadable( RString sPath ); + bool Loadable( const RString &sPath ); }; #endif diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp index 645ba05eb9..e9d909bc92 100644 --- a/stepmania/src/NotesLoaderBMS.cpp +++ b/stepmania/src/NotesLoaderBMS.cpp @@ -512,7 +512,7 @@ bool BMSLoader::LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNa return true; } -void BMSLoader::GetApplicableFiles( RString sPath, vector &out ) +void BMSLoader::GetApplicableFiles( const RString &sPath, vector &out ) { GetDirListing( sPath + RString("*.bms"), out ); GetDirListing( sPath + RString("*.bme"), out ); @@ -845,7 +845,7 @@ void BMSLoader::SetTimeSigAdjustments( const MeasureToTimeSig_t &sigs, Song *pOu } } -bool BMSLoader::LoadFromDir( RString sDir, Song &out ) +bool BMSLoader::LoadFromDir( const RString &sDir, Song &out ) { LOG->Trace( "Song::LoadFromBMSDir(%s)", sDir.c_str() ); diff --git a/stepmania/src/NotesLoaderBMS.h b/stepmania/src/NotesLoaderBMS.h index 84657de954..b34a061e29 100644 --- a/stepmania/src/NotesLoaderBMS.h +++ b/stepmania/src/NotesLoaderBMS.h @@ -32,8 +32,8 @@ class BMSLoader: public NotesLoader map m_mapWavIdToKeysoundIndex; public: - void GetApplicableFiles( RString sPath, vector &out ); - bool LoadFromDir( RString sDir, Song &out ); + void GetApplicableFiles( const RString &sPath, vector &out ); + bool LoadFromDir( const RString &sDir, Song &out ); }; #endif diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp index a36db285de..13db465f25 100644 --- a/stepmania/src/NotesLoaderDWI.cpp +++ b/stepmania/src/NotesLoaderDWI.cpp @@ -359,7 +359,7 @@ float DWILoader::ParseBrokenDWITimestamp(const RString &arg1, const RString &arg return HHMMSSToSeconds( arg1+":"+arg2+":"+arg3 ); } -bool DWILoader::LoadFromDWIFile( RString sPath, Song &out ) +bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out ) { LOG->Trace( "Song::LoadFromDWIFile(%s)", sPath.c_str() ); m_sLoadingFile = sPath; @@ -536,12 +536,12 @@ bool DWILoader::LoadFromDWIFile( RString sPath, Song &out ) return true; } -void DWILoader::GetApplicableFiles( RString sPath, vector &out ) +void DWILoader::GetApplicableFiles( const RString &sPath, vector &out ) { GetDirListing( sPath + RString("*.dwi"), out ); } -bool DWILoader::LoadFromDir( RString sPath, Song &out ) +bool DWILoader::LoadFromDir( const RString &sPath, Song &out ) { vector aFileNames; GetApplicableFiles( sPath, aFileNames ); diff --git a/stepmania/src/NotesLoaderDWI.h b/stepmania/src/NotesLoaderDWI.h index da4c6e1f2a..86466a6efe 100644 --- a/stepmania/src/NotesLoaderDWI.h +++ b/stepmania/src/NotesLoaderDWI.h @@ -19,16 +19,16 @@ class DWILoader: public NotesLoader RString sStepData2, Steps &out ); - bool LoadFromDWIFile( RString sPath, Song &out ); + bool LoadFromDWIFile( const RString &sPath, Song &out ); static float ParseBrokenDWITimestamp(const RString &arg1, const RString &arg2, const RString &arg3); static bool Is192( const RString &str, size_t pos ); RString m_sLoadingFile; public: - void GetApplicableFiles( RString sPath, vector &out ); - bool Loadable( RString sPath ); - bool LoadFromDir( RString sPath, Song &out ); + void GetApplicableFiles( const RString &sPath, vector &out ); + bool Loadable( const RString &sPath ); + bool LoadFromDir( const RString &sPath, Song &out ); }; #endif diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp index cd0b7b1047..ca0ed43d65 100644 --- a/stepmania/src/NotesLoaderKSF.cpp +++ b/stepmania/src/NotesLoaderKSF.cpp @@ -220,7 +220,7 @@ bool KSFLoader::LoadFromKSFFile( const RString &sPath, Steps &out, const Song &s return true; } -void KSFLoader::GetApplicableFiles( RString sPath, vector &out ) +void KSFLoader::GetApplicableFiles( const RString &sPath, vector &out ) { GetDirListing( sPath + RString("*.ksf"), out ); } @@ -342,7 +342,7 @@ bool KSFLoader::LoadGlobalData( const RString &sPath, Song &out ) return true; } -bool KSFLoader::LoadFromDir( RString sDir, Song &out ) +bool KSFLoader::LoadFromDir( const RString &sDir, Song &out ) { LOG->Trace( "Song::LoadFromKSFDir(%s)", sDir.c_str() ); diff --git a/stepmania/src/NotesLoaderKSF.h b/stepmania/src/NotesLoaderKSF.h index 316c779c10..f6fc1cda70 100644 --- a/stepmania/src/NotesLoaderKSF.h +++ b/stepmania/src/NotesLoaderKSF.h @@ -17,8 +17,8 @@ class KSFLoader: public NotesLoader void LoadTags( const RString &str, Song &out ); public: - void GetApplicableFiles( RString sPath, vector &out ); - bool LoadFromDir( RString sDir, Song &out ); + void GetApplicableFiles( const RString &sPath, vector &out ); + bool LoadFromDir( const RString &sDir, Song &out ); }; diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp index 54acaa9858..8fb0a2eb4d 100644 --- a/stepmania/src/NotesLoaderSM.cpp +++ b/stepmania/src/NotesLoaderSM.cpp @@ -62,7 +62,7 @@ void SMLoader::LoadFromSMTokens( out.TidyUpData(); } -void SMLoader::GetApplicableFiles( RString sPath, vector &out ) +void SMLoader::GetApplicableFiles( const RString &sPath, vector &out ) { GetDirListing( sPath + RString("*.sm"), out ); } @@ -225,7 +225,7 @@ bool LoadFromBGChangesString( BackgroundChange &change, const RString &sBGChange return aBGChangeValues.size() >= 2; } -bool SMLoader::LoadFromSMFile( RString sPath, Song &out ) +bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out ) { LOG->Trace( "Song::LoadFromSMFile(%s)", sPath.c_str() ); @@ -444,7 +444,7 @@ bool SMLoader::LoadFromSMFile( RString sPath, Song &out ) } -bool SMLoader::LoadFromDir( RString sPath, Song &out ) +bool SMLoader::LoadFromDir( const RString &sPath, Song &out ) { vector aFileNames; GetApplicableFiles( sPath, aFileNames ); @@ -483,14 +483,14 @@ bool SMLoader::LoadEdit( RString sEditFilePath, ProfileSlot slot ) return LoadEditFromMsd( msd, sEditFilePath, slot ); } -bool SMLoader::LoadEditFromBuffer( const RString &sBuffer, RString sEditFilePath, ProfileSlot slot ) +bool SMLoader::LoadEditFromBuffer( const RString &sBuffer, const RString &sEditFilePath, ProfileSlot slot ) { MsdFile msd; msd.ReadFromString( sBuffer ); return LoadEditFromMsd( msd, sEditFilePath, slot ); } -bool SMLoader::LoadEditFromMsd( const MsdFile &msd, RString sEditFilePath, ProfileSlot slot ) +bool SMLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePath, ProfileSlot slot ) { Song* pSong = NULL; diff --git a/stepmania/src/NotesLoaderSM.h b/stepmania/src/NotesLoaderSM.h index 8019f683cf..aa3321163a 100644 --- a/stepmania/src/NotesLoaderSM.h +++ b/stepmania/src/NotesLoaderSM.h @@ -1,7 +1,7 @@ /* SMLoader - Reads a Song from an .SM file. */ -#ifndef NOTES_LOADER_SM_H -#define NOTES_LOADER_SM_H +#ifndef NotesLoaderSM_H +#define NotesLoaderSM_H #include "NotesLoader.h" #include "GameConstantsAndTypes.h" @@ -26,22 +26,22 @@ class SMLoader: public NotesLoader public: SMLoader() { FromCache = false; } - bool LoadFromSMFile( RString sPath, Song &out ); - bool LoadFromSMFile( RString sPath, Song &out, bool cache ) + bool LoadFromSMFile( const RString &sPath, Song &out ); + bool LoadFromSMFile( const RString &sPath, Song &out, bool cache ) { FromCache=cache; return LoadFromSMFile( sPath, out ); } - void GetApplicableFiles( RString sPath, vector &out ); - bool LoadFromDir( RString sPath, Song &out ); + void GetApplicableFiles( const RString &sPath, vector &out ); + bool LoadFromDir( const RString &sPath, Song &out ); void TidyUpData( Song &song, bool cache ); static bool LoadTimingFromFile( const RString &fn, TimingData &out ); static void LoadTimingFromSMFile( const MsdFile &msd, TimingData &out ); static bool LoadEdit( RString sEditFilePath, ProfileSlot slot ); - static bool LoadEditFromBuffer( const RString &sBuffer, RString sEditFilePath, ProfileSlot slot ); + static bool LoadEditFromBuffer( const RString &sBuffer, const RString &sEditFilePath, ProfileSlot slot ); private: - static bool LoadEditFromMsd( const MsdFile &msd, RString sEditFilePath, ProfileSlot slot ); + static bool LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePath, ProfileSlot slot ); }; #endif