From 6a84b15d3d113946e68fb7f2a3175a38e319ec44 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 6 Nov 2004 21:32:28 +0000 Subject: [PATCH] const fixes --- stepmania/src/NoteSkinManager.cpp | 15 ++++++++------- stepmania/src/NoteSkinManager.h | 14 +++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/stepmania/src/NoteSkinManager.cpp b/stepmania/src/NoteSkinManager.cpp index 18968da56d..c2ee449138 100644 --- a/stepmania/src/NoteSkinManager.cpp +++ b/stepmania/src/NoteSkinManager.cpp @@ -140,7 +140,7 @@ void NoteSkinManager::GetNoteSkinNames( const Game* pGame, CStringArray &AddTo, } -bool NoteSkinManager::DoesNoteSkinExist( CString sSkinName ) +bool NoteSkinManager::DoesNoteSkinExist( const CString &sSkinName ) { CStringArray asSkinNames; GetNoteSkinNames( asSkinNames ); @@ -157,8 +157,9 @@ CString NoteSkinManager::GetNoteSkinDir( const CString &sSkinName ) return NOTESKINS_DIR + sGame + "/" + sSkinName + "/"; } -CString NoteSkinManager::GetMetric( CString sNoteSkinName, CString sButtonName, CString sValue ) +CString NoteSkinManager::GetMetric( const CString &_sNoteSkinName, const CString &sButtonName, const CString &sValue ) { + CString sNoteSkinName = _sNoteSkinName; sNoteSkinName.MakeLower(); map::const_iterator it = m_mapNameToData.find(sNoteSkinName); ASSERT_M( it != m_mapNameToData.end(), sNoteSkinName ); // this NoteSkin doesn't exist! @@ -173,22 +174,22 @@ CString NoteSkinManager::GetMetric( CString sNoteSkinName, CString sButtonName, return sReturn; } -int NoteSkinManager::GetMetricI( CString sNoteSkinName, CString sButtonName, CString sValueName ) +int NoteSkinManager::GetMetricI( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName ) { return atoi( GetMetric(sNoteSkinName,sButtonName,sValueName) ); } -float NoteSkinManager::GetMetricF( CString sNoteSkinName, CString sButtonName, CString sValueName ) +float NoteSkinManager::GetMetricF( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName ) { return strtof( GetMetric(sNoteSkinName,sButtonName,sValueName), NULL ); } -bool NoteSkinManager::GetMetricB( CString sNoteSkinName, CString sButtonName, CString sValueName ) +bool NoteSkinManager::GetMetricB( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName ) { return atoi( GetMetric(sNoteSkinName,sButtonName,sValueName) ) != 0; } -RageColor NoteSkinManager::GetMetricC( CString sNoteSkinName, CString sButtonName, CString sValueName ) +RageColor NoteSkinManager::GetMetricC( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName ) { float r=1,b=1,g=1,a=1; // initialize in case sscanf fails CString sValue = GetMetric(sNoteSkinName,sButtonName,sValueName); @@ -205,7 +206,7 @@ RageColor NoteSkinManager::GetMetricC( CString sNoteSkinName, CString sButtonNam } -CString NoteSkinManager::GetPathToFromNoteSkinAndButton( CString NoteSkin, CString sButtonName, CString sElement, bool bOptional ) +CString NoteSkinManager::GetPathToFromNoteSkinAndButton( const CString &NoteSkin, const CString &sButtonName, const CString &sElement, bool bOptional ) { try_again: diff --git a/stepmania/src/NoteSkinManager.h b/stepmania/src/NoteSkinManager.h index 50a409c536..88cdad8cba 100644 --- a/stepmania/src/NoteSkinManager.h +++ b/stepmania/src/NoteSkinManager.h @@ -18,15 +18,15 @@ public: void RefreshNoteSkinData( const Game* game ); void GetNoteSkinNames( const Game* game, CStringArray &AddTo, bool bFilterDefault=true ); void GetNoteSkinNames( CStringArray &AddTo ); // looks up current const Game* in GAMESTATE - bool DoesNoteSkinExist( CString sSkinName ); // looks up current const Game* in GAMESTATE + bool DoesNoteSkinExist( const CString &sSkinName ); // looks up current const Game* in GAMESTATE - CString GetPathToFromNoteSkinAndButton( CString NoteSkin, CString sButtonName, CString sElement, bool bOptional=false ); + CString GetPathToFromNoteSkinAndButton( const CString &sNoteSkin, const CString &sButtonName, const CString &sElement, bool bOptional=false ); - CString GetMetric( CString sNoteSkinName, CString sButtonName, CString sValue ); - int GetMetricI( CString sNoteSkinName, CString sButtonName, CString sValueName ); - float GetMetricF( CString sNoteSkinName, CString sButtonName, CString sValueName ); - bool GetMetricB( CString sNoteSkinName, CString sButtonName, CString sValueName ); - RageColor GetMetricC( CString sNoteSkinName, CString sButtonName, CString sValueName ); + CString GetMetric( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValue ); + int GetMetricI( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName ); + float GetMetricF( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName ); + bool GetMetricB( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName ); + RageColor GetMetricC( const CString &sNoteSkinName, const CString &sButtonName, const CString &sValueName ); CString GetNoteSkinDir( const CString &sSkinName );