refactor: Remove all explicit AsciiString instantiations from C strings (#1916)

Author: xezon

Core/GameEngine/Source/Common/Audio/GameAudio.cpp

@@ -210,22 +210,22 @@ AudioManager::~AudioManager()
 void AudioManager::init()
 {
 	INI ini;
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\AudioSettings" ), INI_LOAD_OVERWRITE, NULL);
+	ini.loadFileDirectory( "Data\\INI\\AudioSettings", INI_LOAD_OVERWRITE, NULL);
 
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Music" ), INI_LOAD_OVERWRITE, NULL );
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\Music" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\Music", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Music", INI_LOAD_OVERWRITE, NULL );
 
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\SoundEffects" ), INI_LOAD_OVERWRITE, NULL );
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\SoundEffects" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\SoundEffects", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\SoundEffects", INI_LOAD_OVERWRITE, NULL );
 
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Speech" ), INI_LOAD_OVERWRITE, NULL );
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\Speech" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\Speech", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Speech", INI_LOAD_OVERWRITE, NULL );
 
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Voice" ), INI_LOAD_OVERWRITE, NULL );
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\Voice" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\Voice", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Voice", INI_LOAD_OVERWRITE, NULL );
 
 	// do the miscellaneous sound files last so that we find the AudioEventRTS associated with the events.
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\MiscAudio" ), INI_LOAD_OVERWRITE, NULL);
+	ini.loadFileDirectory( "Data\\INI\\MiscAudio", INI_LOAD_OVERWRITE, NULL);
 
 	// determine if one of the music tracks exists. Since their now BIGd, one implies all.
 	// If they don't exist, then attempt to load them from the CD.
@@ -407,7 +407,7 @@ void AudioManager::getInfoForAudioEvent( const AudioEventRTS *eventToFindAndFill
 //-------------------------------------------------------------------------------------------------
 AudioHandle AudioManager::addAudioEvent(const AudioEventRTS *eventToAdd)
 {
-	if (eventToAdd->getEventName().isEmpty() || eventToAdd->getEventName() == AsciiString("NoSound")) {
+	if (eventToAdd->getEventName().isEmpty() || eventToAdd->getEventName() == "NoSound") {
 		return AHSV_NoSound;
 	}
 

Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp

@@ -120,7 +120,7 @@ void ArchiveFileSystem::loadIntoDirectoryTree(ArchiveFile *archiveFile, Bool ove
 
 	FilenameList filenameList;
 
-	archiveFile->getFileListInDirectory(AsciiString(""), AsciiString(""), AsciiString("*"), filenameList, TRUE);
+	archiveFile->getFileListInDirectory("", "", "*", filenameList, TRUE);
 
 	FilenameListIter it = filenameList.begin();
 

Core/GameEngine/Source/GameClient/VideoPlayer.cpp

@@ -182,8 +182,8 @@ void	VideoPlayer::init( void )
 	// Load this here so that WB doesn't have to link to BinkLib, costing us (potentially)
 	// an extra license.
 	INI ini;
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Video" ), INI_LOAD_OVERWRITE, NULL );
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\Video" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\Video", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Video", INI_LOAD_OVERWRITE, NULL );
 }
 
 //============================================================================

Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp

@@ -541,7 +541,7 @@ void FirewallHelperClass::flagNeedToRefresh(Bool flag)
 {
 	OptionPreferences pref;
 
-	(pref)["FirewallNeedToRefresh"] = flag ? AsciiString("TRUE") : AsciiString("FALSE");
+	(pref)["FirewallNeedToRefresh"] = flag ? "TRUE" : "FALSE";
 
 	pref.write();
 }

Core/GameEngine/Source/GameNetwork/GameInfo.cpp

@@ -301,7 +301,7 @@ void GameInfo::reset( void )
 	m_inGame = false;
 	m_inProgress = false;
 	m_gameID = 0;
-	m_mapName = AsciiString("NOMAP");
+	m_mapName = "NOMAP";
 	m_mapMask = 0;
 	m_seed = GetTickCount(); //GameClientRandomValue(0, INT_MAX - 1);
 	m_useStats = TRUE;

Core/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp

@@ -444,7 +444,7 @@ void LadderList::loadLocalLadders( void )
 	AsciiString dirname;
 	dirname.format("%sGeneralsOnline\\Ladders\\", TheGlobalData->getPath_UserData().str());
 	FilenameList filenameList;
-	TheFileSystem->getFileListInDirectory(dirname, AsciiString("*.ini"), filenameList, TRUE);
+	TheFileSystem->getFileListInDirectory(dirname, "*.ini", filenameList, TRUE);
 
 	Int index = -1;
 

Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp

@@ -95,7 +95,7 @@ void StartDownloadingPatches( void )
 	}
 
 	WindowLayout *layout;
-	layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DownloadMenu.wnd" ) );
+	layout = TheWindowManager->winCreateLayout( "Menus/DownloadMenu.wnd" );
 	layout->runInit();
 	layout->hide( FALSE );
 	layout->bringForward();
@@ -233,10 +233,10 @@ static void startOnline( void )
 	UserPreferences::const_iterator it = pref.find("useProfiles");
 	if (it != pref.end() && it->second.compareNoCase("yes") == 0)
 #endif // ALLOW_NON_PROFILED_LOGIN
-		TheShell->push( AsciiString("Menus/GameSpyLoginProfile.wnd") );
+		TheShell->push( "Menus/GameSpyLoginProfile.wnd" );
 #ifdef ALLOW_NON_PROFILED_LOGIN
 	else
-		TheShell->push( AsciiString("Menus/GameSpyLoginQuick.wnd") );
+		TheShell->push( "Menus/GameSpyLoginQuick.wnd" );
 #endif // ALLOW_NON_PROFILED_LOGIN
 }
 

Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp

@@ -506,7 +506,7 @@ void LANAPI::OnGameJoin( ReturnType ret, LANGameInfo *theGame )
 	if (ret == RET_OK)
 	{
 		LANbuttonPushed = true;
-		TheShell->push( AsciiString("Menus/LanGameOptionsMenu.wnd") );
+		TheShell->push( "Menus/LanGameOptionsMenu.wnd" );
 		//lanUpdateSlotList();
 
 		LANPreferences pref;
@@ -597,7 +597,7 @@ void LANAPI::OnGameCreate( ReturnType ret )
 	{
 
 		LANbuttonPushed = true;
-		TheShell->push( AsciiString("Menus/LanGameOptionsMenu.wnd") );
+		TheShell->push( "Menus/LanGameOptionsMenu.wnd" );
 
 		RequestLobbyLeave( false );
 		//RequestGameAnnounce( ); // can't do this here, since we don't have a map set

Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp

@@ -167,7 +167,7 @@ void WebBrowser::init()
 {
 	m_urlList = NULL;
 	INI ini;
-	ini.loadFileDirectory( AsciiString( "Data\\INI\\Webpages" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Webpages", INI_LOAD_OVERWRITE, NULL );
 }
 
 /******************************************************************************

Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp

@@ -210,7 +210,7 @@ void StdBIGFileSystem::closeAllFiles() {
 Bool StdBIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite) {
 
 	FilenameList filenameList;
-	TheLocalFileSystem->getFileListInDirectory(dir, AsciiString(""), fileMask, filenameList, TRUE);
+	TheLocalFileSystem->getFileListInDirectory(dir, "", fileMask, filenameList, TRUE);
 
 	Bool actuallyAdded = FALSE;
 	FilenameListIter it = filenameList.begin();