Backport to Generals: Use trimEnd, truncateBy and truncateTo instead of removeLastChar.

slurmlord · slurmlord · commit 103fb4112f2b · 2025-07-12T22:20:29.000+02:00
diff --git a/Generals/Code/GameEngine/Source/Common/CommandLine.cpp b/Generals/Code/GameEngine/Source/Common/CommandLine.cpp
@@ -95,10 +95,7 @@ static void ConvertShortMapPathToLongMapPath(AsciiString &mapName)
 		DEBUG_CRASH(("Invalid map name %s", mapName.str()));
 	}
 	// remove the .map from the end.
-	token.removeLastChar();
-	token.removeLastChar();
-	token.removeLastChar();
-	token.removeLastChar();
+	token.truncateBy(4);
 
 	actualpath.concat(token);
 	actualpath.concat('\\');
diff --git a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp
@@ -897,9 +897,7 @@ void updateTGAtoDDS()
 		}
 
 		// replace tga with dds
-		filenameDDS.removeLastChar();	// a
-		filenameDDS.removeLastChar();	// g
-		filenameDDS.removeLastChar();	// t
+		filenameDDS.truncateBy(3);	// "tga"
 		filenameDDS.concat("dds");
 
 		Bool needsToBeUpdated = FALSE;
diff --git a/Generals/Code/GameEngine/Source/Common/Recorder.cpp b/Generals/Code/GameEngine/Source/Common/Recorder.cpp
@@ -297,9 +297,7 @@ void RecorderClass::cleanUpReplayFile( void )
 			return;
 
 		AsciiString debugFname = fname;
-		debugFname.removeLastChar();
-		debugFname.removeLastChar();
-		debugFname.removeLastChar();
+		debugFname.truncateBy(3);
 		debugFname.concat("txt");
 		UnsignedInt fileSize = 0;
 		FILE *fp = fopen(logFileName, "rb");
diff --git a/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp b/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp
@@ -317,10 +317,7 @@ void StatsCollector::createFileName( void )
 	const char *fname = name.reverseFind('\\');
 	if (fname)
 		name = fname+1;
-	name.removeLastChar(); // p
-	name.removeLastChar(); // a
-	name.removeLastChar(); // m
-	name.removeLastChar(); // .
+	name.truncateBy(4); // ".map"
 	m_statsFileName.clear();
 #if defined(RTS_DEBUG)
 	if (TheGlobalData->m_saveStats)
diff --git a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp
@@ -408,9 +408,8 @@ static void findHighFileNumber( AsciiString filename, void *userData )
 
 	// strip off the extension at the end of the filename
 	AsciiString nameOnly = filename;
-	for( size_t count = 0; count < strlen( SAVE_GAME_EXTENSION ); count++ )
-		nameOnly.removeLastChar();
-	
+	nameOnly.truncateBy( strlen( SAVE_GAME_EXTENSION ) );
+
 	// convert filename (which is only numbers) to a number
 	Int fileNumber = atoi( nameOnly.str() );
 
diff --git a/Generals/Code/GameEngine/Source/Common/UserPreferences.cpp b/Generals/Code/GameEngine/Source/Common/UserPreferences.cpp
@@ -802,11 +802,7 @@ Bool LadderPreferences::loadProfile( Int profileID )
 			continue;
 
 		p.port = atoi( ptr + 1 );
-		Int i=0;
-		for (; i<strlen(ptr); ++i)
-		{
-			ladName.removeLastChar();
-		}
+		ladName.truncateBy(strlen(ptr));
 		p.address = QuotedPrintableToAsciiString(ladName);
 
 		ptr = ladData.reverseFind(':');
@@ -815,10 +811,7 @@ Bool LadderPreferences::loadProfile( Int profileID )
 			continue;
 
 		p.lastPlayDate = atoi( ptr + 1 );
-		for (i=0; i<strlen(ptr); ++i)
-		{
-			ladData.removeLastChar();
-		}
+		ladData.truncateBy(strlen(ptr));
 		p.name = QuotedPrintableToUnicodeString(ladData);
 
 		m_ladders[p.lastPlayDate] = p;
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
@@ -422,17 +422,16 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	//txtInput.translate(IPs.getMachineName());
 	LANPreferences prefs;
 	defaultName = prefs.getUserName();
-	while (defaultName.getLength() > g_lanPlayerNameLength)
-		defaultName.removeLastChar();
+	defaultName.truncateTo(g_lanPlayerNameLength);
+
 	GadgetTextEntrySetText( textEntryPlayerName, defaultName);
 	// Clear the text entry line
 	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);
 
 	GadgetListBoxReset(listboxPlayers);
 	GadgetListBoxReset(listboxGames);
 
-	while (defaultName.getLength() > g_lanPlayerNameLength)
-		defaultName.removeLastChar();
+	defaultName.truncateTo(g_lanPlayerNameLength);
 	TheLAN->RequestSetName(defaultName);
 	TheLAN->RequestLocations();
 
@@ -815,8 +814,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					else
 						txtInput = UnicodeString::TheEmptyString;
 
-					while (txtInput.getLength() > g_lanPlayerNameLength)
-						txtInput.removeLastChar();
+					txtInput.truncateTo(g_lanPlayerNameLength);
 					
 					if (!txtInput.isEmpty() && txtInput.getCharAt(txtInput.getLength()-1) == L',')
 						txtInput.removeLastChar(); // we use , for strtok's so we can't allow them in names.  :(
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
@@ -197,8 +197,7 @@ void HostDirectConnectGame()
 	prefs["UserName"] = UnicodeStringToQuotedPrintable(name);
 	prefs.write();
 
-	while (name.getLength() > g_lanPlayerNameLength)
-		name.removeLastChar();
+	name.truncateTo(g_lanPlayerNameLength);
 	TheLAN->RequestSetName(name);
 	TheLAN->RequestGameCreate(localIPString, TRUE);
 }
@@ -241,8 +240,7 @@ void JoinDirectConnectGame()
 	UpdateRemoteIPList();
 	PopulateRemoteIPComboBox();
 
-	while (name.getLength() > g_lanPlayerNameLength)
-		name.removeLastChar();
+	name.truncateTo(g_lanPlayerNameLength);
 	TheLAN->RequestSetName(name);
 
 	TheLAN->RequestGameJoinDirectConnect(ipaddress);
@@ -500,8 +498,7 @@ WindowMsgHandledType NetworkDirectConnectSystem( GameWindow *window, UnsignedInt
 					prefs["UserName"] = UnicodeStringToQuotedPrintable(name);
 					prefs.write();
 
-					while (name.getLength() > g_lanPlayerNameLength)
-						name.removeLastChar();
+					name.truncateTo(g_lanPlayerNameLength);
 					TheLAN->RequestSetName(name);
 
 					buttonPushed = true;
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
@@ -124,8 +124,7 @@ static Bool readReplayMapInfo(const AsciiString& filename, RecorderClass::Replay
 static void removeReplayExtension(UnicodeString& replayName)
 {
 	const Int extensionLength = TheRecorder->getReplayExtention().getLength();
-		for (Int k=0; k < extensionLength; ++k)
-			replayName.removeLastChar();
+	replayName.truncateBy(extensionLength);
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
@@ -550,10 +550,7 @@ void HandleBuddyResponses( void )
 					}  // end if
 
 					UnicodeString snippet = message.m_message;
-					while (snippet.getLength() > 11)
-					{
-						snippet.removeLastChar();
-					}
+					snippet.truncateTo(11);
 					UnicodeString s;
 					s.format(TheGameText->fetch("Buddy:MessageNotification"), nick.str(), snippet.str());
 					lastNotificationWasStatus = FALSE;
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
@@ -1066,17 +1066,13 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 				trimmedEmail.trim();
 				if (!trimmedNick.isEmpty())
 				{
-					if (trimmedNick.getCharAt(trimmedNick.getLength()-1) == L'\\')
-						trimmedNick.removeLastChar();
-					if (trimmedNick.getCharAt(trimmedNick.getLength()-1) == L'/')
-						trimmedNick.removeLastChar();
+					trimmedNick.trimEnd(L'\\');
+					trimmedNick.trimEnd(L'/');
 				}
 				if (!trimmedEmail.isEmpty())
 				{
-					if (trimmedEmail.getCharAt(trimmedEmail.getLength()-1) == L'\\')
-						trimmedEmail.removeLastChar();
-					if (trimmedEmail.getCharAt(trimmedEmail.getLength()-1) == L'/')
-						trimmedEmail.removeLastChar();
+					trimmedEmail.trimEnd(L'\\');
+					trimmedEmail.trimEnd(L'/');
 				}
 				if (trimmedEmail.getLength() != uEmail.getLength())
 				{
@@ -1466,19 +1462,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 								{
 									UnicodeString uniLine;
 									uniLine = UnicodeString(MultiByteToWideCharSingleLine(asciiLine.str()).c_str());
-									int len = uniLine.getLength();
-									for (int index = len-1; index >= 0; index--)
-									{
-										if (iswspace(uniLine.getCharAt(index)))
-										{
-											uniLine.removeLastChar();
-										}
-										else
-										{
-											break;
-										}
-									}
-									//uniLine.trim();
+									uniLine.trimEnd();
 									DEBUG_LOG(("adding TOS line: [%ls]\n", uniLine.str()));
 									GadgetListBoxAddEntryText(listboxTOS, uniLine, tosColor, -1);
 								}
diff --git a/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp b/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp
@@ -572,8 +572,7 @@ Bool MapCache::loadUserMaps()
 		{
 			AsciiString endingStr;
 			AsciiString fname = s+1;
-			for (size_t i=0; i<strlen(mapExtension); ++i)
-				fname.removeLastChar();
+			fname.truncateBy(strlen(mapExtension));
 
 			endingStr.format("%s\\%s%s", fname.str(), fname.str(), mapExtension);
 
@@ -702,8 +701,7 @@ Bool MapCache::addMap( AsciiString dirName, AsciiString fname, FileInfo *fileInf
 	{
 		AsciiString stringFileName;
 		stringFileName.format("%s\\%s", dirName.str(), fname.str());
-		for (Int i=0; i<4; ++i)
-			stringFileName.removeLastChar();
+		stringFileName.truncateBy(4);
 		stringFileName.concat("\\map.str");
 		TheGameText->initMapStringFile(stringFileName);
 		md.m_displayName = TheGameText->fetch(munkee);
@@ -1066,10 +1064,7 @@ Image *getMapPreviewImage( AsciiString mapName )
 	AsciiString name;
 	AsciiString tempName;
 	AsciiString filename;
-	tgaName.removeLastChar(); // p
-	tgaName.removeLastChar(); // a
-	tgaName.removeLastChar(); // m
-	tgaName.removeLastChar(); // .
+	tgaName.truncateBy(4); // ".map"
 	name = tgaName;//.reverseFind('\\') + 1;
 	filename = tgaName.reverseFind('\\') + 1;
 	//tgaName = name;
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameInfo.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameInfo.cpp
@@ -512,9 +512,7 @@ void GameInfo::setMap( AsciiString mapName )
 		{
 			m_mapMask = 1;
 			AsciiString path = mapName;
-			path.removeLastChar();
-			path.removeLastChar();
-			path.removeLastChar();
+			path.truncateBy(3);
 			path.concat("tga");
 			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", path.str()));
 			File *fp = TheFileSystem->openFile(path.str());
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp
@@ -87,8 +87,7 @@ static LadderInfo *parseLadder(AsciiString raw)
 			line.nextToken(&tokenHomepage, " ");
 
 			lad->name = MultiByteToWideCharSingleLine(tokenName.str()).c_str();
-			while (lad->name.getLength() > 20)
-				lad->name.removeLastChar(); // Per Harvard's request, ladder names are limited to 20 chars
+			lad->name.truncateTo(20); // Per Harvard's request, ladder names are limited to 20 chars
 			lad->address = tokenAddr;
 			lad->port = atoi(tokenPort.str());
 			lad->homepageURL = tokenHomepage;
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp b/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp
@@ -894,8 +894,7 @@ void LANAPI::RequestGameCreate( UnicodeString gameName, Bool isDirectConnect )
 	else
 		s.concat(gameName);
 
-	while (s.getLength() > g_lanGameNameLength)
-		s.removeLastChar();
+	s.truncateTo(g_lanGameNameLength);
 
 	DEBUG_LOG(("Setting local game name to '%ls'\n", s.str()));
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp
@@ -1348,8 +1348,11 @@ BOOL CWorldBuilderDoc::OnOpenDocument(LPCTSTR lpszPathName)
 	// clear out map-specific text
 	TheGameText->reset();
 	AsciiString s = lpszPathName;
-	while (s.getLength() && s.getCharAt(s.getLength()-1) != '\\')
-		s.removeLastChar();
+	const char* lastSep = s.reverseFind('\\');
+	if (lastSep != NULL)
+	{
+		s.truncateTo(lastSep - s.str() + 1);
+	}
 	s.concat("map.str");
 	DEBUG_LOG(("Looking for map-specific text in [%s]\n", s.str()));
 	TheGameText->initMapStringFile(s);

Original file line number	Diff line number	Diff line change
`@@ -897,9 +897,7 @@ void updateTGAtoDDS()`
`897`	`897`	`}`
`898`	`898`
`899`	`899`	`// replace tga with dds`
`900`		`- filenameDDS.removeLastChar(); // a`
`901`		`- filenameDDS.removeLastChar(); // g`
`902`		`- filenameDDS.removeLastChar(); // t`
	`900`	`+ filenameDDS.truncateBy(3); // "tga"`
`903`	`901`	`filenameDDS.concat("dds");`
`904`	`902`
`905`	`903`	`Bool needsToBeUpdated = FALSE;`
Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,7 @@ static Bool readReplayMapInfo(const AsciiString& filename, RecorderClass::Replay`
`124`	`124`	`static void removeReplayExtension(UnicodeString& replayName)`
`125`	`125`	`{`
`126`	`126`	`const Int extensionLength = TheRecorder->getReplayExtention().getLength();`
`127`		`- for (Int k=0; k < extensionLength; ++k)`
`128`		`- replayName.removeLastChar();`
	`127`	`+ replayName.truncateBy(extensionLength);`
`129`	`128`	`}`
`130`	`129`
`131`	`130`	`//-------------------------------------------------------------------------------------------------`