cleanup

stepmania/src/ThemeManager.cpp

@@ -48,7 +48,7 @@ struct Theme
 	IniFile *iniMetrics;	// pointer because the copy constructor isn't a deep copy
 };
 // When looking for a metric or an element, search these from head to tail.
-deque<Theme> g_vThemes;
+static deque<Theme> g_vThemes;
 
 
 //
@@ -84,7 +84,7 @@ void ThemeManager::ClearThemePathCache()
 		g_ThemePathCache[i].clear();
 }
 
-void FileNameToClassAndElement( const CString &sFileName, CString &sClassNameOut, CString &sElementOut )
+static void FileNameToClassAndElement( const CString &sFileName, CString &sClassNameOut, CString &sElementOut )
 {
 	// split into class name and file name
 	int iIndexOfFirstSpace = sFileName.Find(" ");
@@ -433,11 +433,8 @@ try_element_again:
 	bool bIsARedirect = GetExtension(sPath).CompareNoCase("redir")==0;
 
 	if( !bIsARedirect )
-	{
 		return sPath;
-	}
-	else	// bIsARedirect
-	{
+
 	CString sNewFileName;
 	GetFileContents( sPath, sNewFileName, true );
 
@@ -474,7 +471,6 @@ try_element_again:
 
 		RageException::Throw( "%s", message.c_str() ); 
 	}
-	}
 }
 
 CString ThemeManager::GetPath( ElementCategory category, const CString &sClassName_, const CString &sElement_, bool bOptional )