diff --git a/stepmania/src/ExportStrings.cpp b/stepmania/src/CommandLineActions.cpp similarity index 96% rename from stepmania/src/ExportStrings.cpp rename to stepmania/src/CommandLineActions.cpp index d913d739ba..a68bed490f 100644 --- a/stepmania/src/ExportStrings.cpp +++ b/stepmania/src/CommandLineActions.cpp @@ -1,5 +1,5 @@ #include "global.h" -#include "ExportStrings.h" +#include "CommandLineActions.h" #include "RageFile.h" #include "RageUtil.h" #include "IniFile.h" @@ -47,7 +47,7 @@ static void GetPackageFilesToInstall( vector &vs ) vs.clear(); } -bool ExportStrings::AnyPackageFilesInCommandLine() +bool CommandLineActions::AnyPackageFilesInCommandLine() { vector vs; GetPackageFilesToInstall( vs ); @@ -61,7 +61,7 @@ struct FileCopyResult RString sFile, sComment; }; -void ExportStrings::Install() +void CommandLineActions::Install() { vector vSucceeded; vector vFailed; @@ -118,7 +118,7 @@ void ExportStrings::Install() Dialog::OK( sMessage ); } -void ExportStrings::Nsis() +void CommandLineActions::Nsis() { RageFile out; if( !out.Open( "nsis_strings_temp.inc", RageFile::WRITE ) ) @@ -152,7 +152,7 @@ void ExportStrings::Nsis() } } -void ExportStrings::LuaInformation() +void CommandLineActions::LuaInformation() { XNode *pNode = LuaHelpers::GetLuaInformation(); pNode->AppendAttr( "xmlns", "http://www.stepmania.com" ); diff --git a/stepmania/src/ExportStrings.h b/stepmania/src/CommandLineActions.h similarity index 94% rename from stepmania/src/ExportStrings.h rename to stepmania/src/CommandLineActions.h index b089eafcd8..701e7b8380 100644 --- a/stepmania/src/ExportStrings.h +++ b/stepmania/src/CommandLineActions.h @@ -1,7 +1,7 @@ -#ifndef ExportStrings_H -#define ExportStrings_H +#ifndef CommandLineActions_H +#define CommandLineActions_H -namespace ExportStrings +namespace CommandLineActions { bool AnyPackageFilesInCommandLine(); void Install(); diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj index a4019ed2a3..35a187d1f5 100644 --- a/stepmania/src/StepMania-net2003.vcproj +++ b/stepmania/src/StepMania-net2003.vcproj @@ -3206,10 +3206,10 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ Name="StepMania" Filter=""> + RelativePath=".\CommandLineActions.cpp"> + RelativePath=".\CommandLineActions.h"> diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index de4d599aae..82624195d6 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -32,7 +32,7 @@ #include "RageSurface.h" #include "RageSurface_Load.h" #include "CatalogXml.h" -#include "ExportStrings.h" +#include "CommandLineActions.h" #if !defined(SUPPORT_OPENGL) && !defined(SUPPORT_D3D) #define SUPPORT_OPENGL @@ -932,7 +932,7 @@ int main(int argc, char* argv[]) RunMode_ExportLuaInformation, }; RunMode runmode = RunMode_Normal; - if( ExportStrings::AnyPackageFilesInCommandLine() ) + if( CommandLineActions::AnyPackageFilesInCommandLine() ) runmode = RunMode_Install; else if( GetCommandlineArgument("ExportNsisStrings") ) runmode = RunMode_ExportNsisStrings; @@ -1066,13 +1066,13 @@ int main(int argc, char* argv[]) { DEFAULT_FAIL( runmode ); case RunMode_Install: - ExportStrings::Install(); + CommandLineActions::Install(); break; case RunMode_ExportNsisStrings: - ExportStrings::Nsis(); + CommandLineActions::Nsis(); break; case RunMode_ExportLuaInformation: - ExportStrings::LuaInformation(); + CommandLineActions::LuaInformation(); break; }; exit(0);