From 7a76b58bd3baa9a74c0cc1379381165c782542e2 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 25 Dec 2005 19:27:31 +0000 Subject: [PATCH] style cleanup --- stepmania/src/StepMania.cpp | 4 +--- stepmania/src/ThemeManager.cpp | 6 +++--- stepmania/src/ThemeManager.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index a9f54f49cc..54bacfaea9 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -918,9 +918,7 @@ static void ApplyLogPreferences() static CString LocalizeString( const CString &sSection, const CString &s ) { - CString sOut; - THEME->GetString( sSection, s, sOut ); - return sOut; + return THEME->GetString( sSection, s ); } static LocalizedString COULDNT_OPEN_LOADING_WINDOW( "StepMania", "Couldn't open any loading windows." ); diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index e7f1f8fe2b..6834a3903c 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -899,10 +899,10 @@ void ThemeManager::GetMetric( const CString &sClassName, const CString &sValueNa valueOut.SetFromExpression( "function(self) " + sValue + "end" ); } -void ThemeManager::GetString( const CString &sClassName, const CString &sValueName, CString &valueOut ) +CString ThemeManager::GetString( const CString &sClassName, const CString &sValueName ) { // TODO: Change this to GetMetricRaw and write stubs for missing strings into every language file. - valueOut = GetMetric( sClassName, sValueName ); + return GetMetric( sClassName, sValueName ); } void ThemeManager::GetMetricsThatBeginWith( const CString &sClassName_, const CString &sValueName, set &vsValueNamesOut ) @@ -948,7 +948,7 @@ public: LunaThemeManager() { LUA->Register( Register ); } static int GetMetric( T* p, lua_State *L ) { lua_pushstring(L, p->GetMetric(SArg(1),SArg(2)) ); return 1; } - static int GetString( T* p, lua_State *L ) { CString s; p->GetString(SArg(1),SArg(2),s); lua_pushstring(L,s); return 1; } + static int GetString( T* p, lua_State *L ) { lua_pushstring(L, p->GetString(SArg(1),SArg(2)) ); return 1; } static int GetPathG( T* p, lua_State *L ) { lua_pushstring(L, p->GetPathG(SArg(1),SArg(2)) ); return 1; } static int GetPathB( T* p, lua_State *L ) { lua_pushstring(L, p->GetPathB(SArg(1),SArg(2)) ); return 1; } static int GetPathS( T* p, lua_State *L ) { lua_pushstring(L, p->GetPathS(SArg(1),SArg(2)) ); return 1; } diff --git a/stepmania/src/ThemeManager.h b/stepmania/src/ThemeManager.h index 8ee675143b..4c5629b06b 100644 --- a/stepmania/src/ThemeManager.h +++ b/stepmania/src/ThemeManager.h @@ -81,7 +81,7 @@ public: void GetMetric( const CString &sClassName, const CString &sValueName, LuaExpression &valueOut ); void GetMetric( const CString &sClassName, const CString &sValueName, apActorCommands &valueOut ); - void GetString( const CString &sClassName, const CString &sValueName, CString &valueOut ); + CString GetString( const CString &sClassName, const CString &sValueName ); void GetMetricsThatBeginWith( const CString &sClassName, const CString &sValueName, set &vsValueNamesOut );