refactor: Remove all explicit UnicodeString instantiations from C strings (#1928)

Author: xezon

Core/GameEngine/Source/Common/CRCDebug.cpp

@@ -80,7 +80,7 @@ CRCVerification::~CRCVerification()
 	{
 		if (TheInGameUI)
 		{
-			TheInGameUI->message(UnicodeString(L"GameLogic changed outside of GameLogic::update() - call Matt (x36804)!"));
+			TheInGameUI->message(L"GameLogic changed outside of GameLogic::update() - call Matt (x36804)!");
 		}
 		CRCDEBUG_LOG(("GameLogic changed outside of GameLogic::update()!!!"));
 	}

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

@@ -437,7 +437,7 @@ Bool UnicodeString::nextToken(UnicodeString* tok, UnicodeString delimiters)
 		return false;
 
 	if (delimiters.isEmpty())
-		delimiters = UnicodeString(L" \t\n\r");
+		delimiters = L" \t\n\r";
 
 	Int offset;
 

Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp

@@ -651,7 +651,7 @@ void ConnectionManager::processChat(NetChatCommandMsg *msg)
 	const Player *player = ThePlayerList->findPlayerWithNameKey( TheNameKeyGenerator->nameToKey( playerName ) );
 	if (!player)
 	{
-		TheInGameUI->message(UnicodeString(L"%ls"), unitext.str());
+		TheInGameUI->message(L"%ls", unitext.str());
 		return;
 	}
 
@@ -663,7 +663,7 @@ void ConnectionManager::processChat(NetChatCommandMsg *msg)
 	{
 		RGBColor rgb;
 		rgb.setFromInt(player->getPlayerColor());
-		TheInGameUI->messageColor(&rgb, UnicodeString(L"%ls"), unitext.str());
+		TheInGameUI->messageColor(&rgb, L"%ls", unitext.str());
 
 		// feedback for received chat messages in-game
 		AudioEventRTS audioEvent("GUICommunicatorIncoming");
@@ -2120,7 +2120,7 @@ UnsignedShort ConnectionManager::sendFileAnnounce(AsciiString path, UnsignedByte
 		log.format(L"Not sending file '%hs' to %X", path.str(), playerMask);
 		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("%ls", log.str()));
 		if (TheLAN)
-			TheLAN->OnChat(UnicodeString(L"sendFile"), 0, log, LANAPI::LANCHAT_SYSTEM);
+			TheLAN->OnChat(L"sendFile", 0, log, LANAPI::LANCHAT_SYSTEM);
 		return 0;
 	}
 
@@ -2158,7 +2158,7 @@ void ConnectionManager::sendFile(AsciiString path, UnsignedByte playerMask, Unsi
 		log.format(L"Not sending file '%hs' to %X", path.str(), playerMask);
 		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("%ls", log.str()));
 		if (TheLAN)
-			TheLAN->OnChat(UnicodeString(L"sendFile"), 0, log, LANAPI::LANCHAT_SYSTEM);
+			TheLAN->OnChat(L"sendFile", 0, log, LANAPI::LANCHAT_SYSTEM);
 		return;
 	}
 

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

@@ -613,8 +613,8 @@ static Int insertGame( GameWindow *win, GameSpyStagingRoom *game, Bool showMap )
 	}
 	else
 	{
-		GadgetListBoxAddEntryText(win, UnicodeString(L" "), gameColor, index, COLUMN_MAP);
-		GadgetListBoxAddEntryText(win, UnicodeString(L" "), gameColor, index, COLUMN_LADDER);
+		GadgetListBoxAddEntryText(win, L" ", gameColor, index, COLUMN_MAP);
+		GadgetListBoxAddEntryText(win, L" ", gameColor, index, COLUMN_LADDER);
 	}
 
 	s.format(L"%d/%d", game->getReportedNumPlayers(), game->getReportedMaxPlayers());
@@ -633,7 +633,7 @@ static Int insertGame( GameWindow *win, GameSpyStagingRoom *game, Bool showMap )
 	}
 	else
 	{
-		GadgetListBoxAddEntryText(win, UnicodeString(L" "), gameColor, index, COLUMN_PASSWORD);
+		GadgetListBoxAddEntryText(win, L" ", gameColor, index, COLUMN_PASSWORD);
 	}
 
 	if (game->getAllowObservers())
@@ -643,7 +643,7 @@ static Int insertGame( GameWindow *win, GameSpyStagingRoom *game, Bool showMap )
 	}
 	else
 	{
-		GadgetListBoxAddEntryText(win, UnicodeString(L" "), gameColor, index, COLUMN_OBSERVER);
+		GadgetListBoxAddEntryText(win, L" ", gameColor, index, COLUMN_OBSERVER);
 	}
 
 #if !RTS_GENERALS

Core/GameEngine/Source/GameNetwork/LANAPI.cpp

@@ -308,7 +308,7 @@ void LANAPI::checkMOTD( void )
 
 				UnicodeString uniLine;
 				uniLine.translate(line);
-				OnChat( UnicodeString(L"MOTD"), 0, uniLine, LANCHAT_SYSTEM );
+				OnChat( L"MOTD", 0, uniLine, LANCHAT_SYSTEM );
 			}
 		}
 	}
@@ -773,7 +773,7 @@ void LANAPI::RequestHasMap( void )
 			text.format(TheGameText->fetch("GUI:LocalPlayerNoMapWillTransfer"), mapDisplayName.str());
 		else
 			text.format(TheGameText->fetch("GUI:LocalPlayerNoMap"), mapDisplayName.str());
-		OnChat(UnicodeString(L"SYSTEM"), m_localIP, text, LANCHAT_SYSTEM);
+		OnChat(L"SYSTEM", m_localIP, text, LANCHAT_SYSTEM);
 	}
 }
 
@@ -921,7 +921,7 @@ void LANAPI::RequestGameCreate( UnicodeString gameName, Bool isDirectConnect )
 /// @todo: Need to initialize the players elsewere.
 /*	for (int player = 1; player < MAX_SLOTS; ++player)
 	{
-		myGame->setPlayerName(player, UnicodeString(L""));
+		myGame->setPlayerName(player, L"");
 		myGame->setIP(player, 0);
 		myGame->setAccepted(player, false);
 	}*/

Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp

@@ -124,7 +124,7 @@ void LANAPI::OnAccept( UnsignedInt playerIP, Bool status )
 		{
 			UnicodeString text;
 			text = TheGameText->fetch("GUI:HostWantsToStart");
-			OnChat(UnicodeString(L"SYSTEM"), m_localIP, text, LANCHAT_SYSTEM);
+			OnChat(L"SYSTEM", m_localIP, text, LANCHAT_SYSTEM);
 		}
 	}
 }
@@ -165,7 +165,7 @@ void LANAPI::OnHasMap( UnsignedInt playerIP, Bool status )
 					text.format(TheGameText->fetch("GUI:PlayerNoMapWillTransfer"), m_currentGame->getLANSlot(i)->getName().str(), mapDisplayName.str());
 				else
 					text.format(TheGameText->fetch("GUI:PlayerNoMap"), m_currentGame->getLANSlot(i)->getName().str(), mapDisplayName.str());
-				OnChat(UnicodeString(L"SYSTEM"), m_localIP, text, LANCHAT_SYSTEM);
+				OnChat(L"SYSTEM", m_localIP, text, LANCHAT_SYSTEM);
 			}
 			lanUpdateSlotList();
 		}
@@ -179,7 +179,7 @@ void LANAPI::OnGameStartTimer( Int seconds )
 		text.format(TheGameText->fetch("LAN:GameStartTimerSingular"), seconds);
 	else
 		text.format(TheGameText->fetch("LAN:GameStartTimerPlural"), seconds);
-	OnChat(UnicodeString(L"SYSTEM"), m_localIP, text, LANCHAT_SYSTEM);
+	OnChat(L"SYSTEM", m_localIP, text, LANCHAT_SYSTEM);
 }
 
 void LANAPI::OnGameStart( void )

Generals/Code/GameEngine/Source/Common/version.cpp

@@ -309,7 +309,7 @@ UnicodeString Version::getUnicodeBuildUserOrGitCommitAuthorName() const
 UnicodeString Version::getUnicodeProductTitle() const
 {
 	// @todo Make configurable
-	return UnicodeString(L"Community Patch");
+	return L"Community Patch";
 }
 
 UnicodeString Version::getUnicodeProductVersion() const

Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp

@@ -455,7 +455,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 		u.translate(foo);
 		GadgetListBoxAddEntryText(win, u, color, -1, -1);
 	}
-	GadgetListBoxAddEntryText(win, UnicodeString(L"Cancel"), color, -1, -1);*/
+	GadgetListBoxAddEntryText(win, L"Cancel", color, -1, -1);*/
 
 }
 
@@ -2469,7 +2469,7 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com
 		button->winSetTooltipFunc(commandButtonTooltip);
 	}
 	else
-		GadgetButtonSetText( button, UnicodeString( L"" ) );
+		GadgetButtonSetText( button, L"" );
 
 	// save the command in the user data of the window
 	GadgetButtonSetData(button, (void*)commandButton);

Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp

@@ -519,7 +519,7 @@ void ControlBar::populateBuildQueue( Object *producer )
 		m_queueData[ i ].control->winClearStatus( WIN_STATUS_USE_OVERLAY_STATES );
 
 		// set the text of the window to nothing by default
-		GadgetButtonSetText( m_queueData[ i ].control, UnicodeString( L"" ) );
+		GadgetButtonSetText( m_queueData[ i ].control, L"" );
 
 		//Clear any potential veterancy rank, or else we'll see it when it's empty!
 		GadgetButtonDrawOverlayImage( m_queueData[ i ].control, NULL );

Generals/Code/GameEngine/Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp

@@ -133,7 +133,7 @@ void DisconnectMenu::setPlayerName(Int playerNum, UnicodeString name) {
 
 	if (control != NULL) {
 		if (name.getLength() > 0) {
-			GadgetStaticTextSetText(control, UnicodeString(L""));
+			GadgetStaticTextSetText(control, L"");
 		}
 	}
 
@@ -241,7 +241,7 @@ void DisconnectMenu::showPacketRouterTimeout() {
 	control = TheWindowManager->winGetWindowFromId(NULL, id);
 
 	if (control != NULL) {
-		GadgetStaticTextSetText(control, UnicodeString(L"")); // start it off with a blank string.
+		GadgetStaticTextSetText(control, L""); // start it off with a blank string.
 		control->winHide(FALSE);
 	}
 }