Replace s.compare("..") == 0 by s == "..".

Wargus · Apr 30, 2024 · 497539b · 497539b
1 parent fee78c1
commit 497539b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/gameheaders/stratagus-game-launcher.h b/gameheaders/stratagus-game-launcher.h
@@ -384,9 +384,9 @@ static void ExtractData(char *extractor_tool,
 				}
 			} else {
 				// we cannot test if this is an innoextract installer, assume not but maybe warn
-				if (datafile.compare("INSTALL.EXE") == 0 || datafile.compare("install.exe") == 0
-				    || datafile.compare("INSTALL.exe") == 0 || datafile.compare("SETUP.EXE") == 0
-				    || datafile.compare("setup.exe") == 0 || datafile.compare("SETUP.exe") == 0) {
+				if (datafile == "INSTALL.EXE" || datafile == "install.exe"
+				    || datafile == "INSTALL.exe" || datafile == "SETUP.EXE"
+				    || datafile == "setup.exe" || datafile == "SETUP.exe") {
 					// probably not a packaged installer
 				} else {
 					// warn

diff --git a/src/network/online_service.cpp b/src/network/online_service.cpp
@@ -1981,7 +1981,7 @@ class C2S_SID_AUTH_INFO : public OnlineState
 		// Connect
 
 		std::string localHost = CNetworkParameter::Instance.localHost;
-		if (!localHost.compare("127.0.0.1")) {
+		if (localHost == "127.0.0.1") {
 			localHost = "0.0.0.0";
 		}
 		if (!ctx.getTCPSocket().IsValid()) {
@@ -2022,7 +2022,7 @@ class C2S_SID_AUTH_INFO : public OnlineState
 		// (UINT32) Language code
 		buffer.serialize32(0x00);
 		// (UINT32) Local IP
-		if (CNetworkParameter::Instance.localHost.compare("127.0.0.1")) {
+		if (CNetworkParameter::Instance.localHost != "127.0.0.1") {
 			// user set a custom local ip, use that
 #ifdef USE_WIN32
 			uint32_t addr = inet_addr(CNetworkParameter::Instance.localHost.c_str());

diff --git a/src/ui/button_checks.cpp b/src/ui/button_checks.cpp
@@ -399,7 +399,7 @@ bool ButtonCheckSingleResearch(const CUnit &unit, const ButtonAction &button)
 */
 bool ButtonCheckDebug(const CUnit &, const ButtonAction &button)
 {
-	if(!button.AllowStr.compare("single-player-walls")) { /// Check if enabled walls for singleplayer games
+	if (button.AllowStr == "single-player-walls") { /// Check if enabled walls for singleplayer games
 		return !IsNetworkGame() && EnableWallsInSinglePlayer;
 	}
 	return false;

diff --git a/src/unit/build.cpp b/src/unit/build.cpp
@@ -150,9 +150,9 @@ bool CBuildRestrictionDistance::Check(const CUnit *builder, const CUnitType &typ
 			(this->RestrictType == unit->Type || (!this->RestrictType && this->RestrictTypeOwner.size() > 0)) &&
 			// RestrictTypeOwner is not set or unit belongs to a suitable player
 			(this->RestrictTypeOwner.empty() ||
-			 (!this->RestrictTypeOwner.compare("self") && player == unit->Player) ||
-			 (!this->RestrictTypeOwner.compare("allied") && (player == unit->Player || player->IsAllied(*unit->Player))) ||
-			 (!this->RestrictTypeOwner.compare("enemy") && player->IsEnemy(*unit->Player)))) {
+			 (this->RestrictTypeOwner == "self" && player == unit->Player) ||
+			 (this->RestrictTypeOwner == "allied" && (player == unit->Player || player->IsAllied(*unit->Player))) ||
+			 (this->RestrictTypeOwner == "enemy" && player->IsEnemy(*unit->Player)))) {
 
 			switch (this->DistanceType) {
 				case EComparison::GreaterThan:
@@ -202,22 +202,22 @@ bool CBuildRestrictionHasUnit::Check(const CUnit *builder, const CUnitType &type
 	Vec2i pos2(0, 0);
 	CPlayer* player = builder != nullptr ? builder->Player : ThisPlayer;
 	int count = 0;
-	if (this->RestrictTypeOwner.empty() || !this->RestrictTypeOwner.compare("self")) {
+	if (this->RestrictTypeOwner.empty() || this->RestrictTypeOwner == "self") {
 		count = player->GetUnitTotalCount(*this->RestrictType);
-	} else if (!this->RestrictTypeOwner.compare("allied")) {
+	} else if (this->RestrictTypeOwner == "allied") {
 		count = player->GetUnitTotalCount(*this->RestrictType);
 		for (int i = 0; i < NumPlayers; i++) {
 			if (player->IsAllied(Players[i])) {
 				count += Players[i].GetUnitTotalCount(*this->RestrictType);
 			}
 		}
-	} else if (!this->RestrictTypeOwner.compare("enemy")) {
+	} else if (this->RestrictTypeOwner == "enemy") {
 		for (int i = 0; i < NumPlayers; i++) {
 			if (player->IsEnemy(Players[i])) {
 				count += Players[i].GetUnitTotalCount(*this->RestrictType);
 			}
 		}
-	} else if (!this->RestrictTypeOwner.compare("any")) {
+	} else if (this->RestrictTypeOwner == "any") {
 		for (int i = 0; i < NumPlayers; i++) {
 			count += Players[i].GetUnitTotalCount(*this->RestrictType);
 		}
@@ -278,9 +278,9 @@ bool CBuildRestrictionSurroundedBy::Check(const CUnit *builder, const CUnitType
 			(this->RestrictType == unit->Type || (!this->RestrictType && this->RestrictTypeOwner.size() > 0)) &&
 			// RestrictTypeOwner is not set or unit belongs to a suitable player
 			(this->RestrictTypeOwner.empty() ||
-				(!this->RestrictTypeOwner.compare("self") && builder->Player == unit->Player) ||
-				(!this->RestrictTypeOwner.compare("allied") && (builder->Player == unit->Player || builder->Player->IsAllied(*unit->Player))) ||
-				(!this->RestrictTypeOwner.compare("enemy") && builder->Player->IsEnemy(*unit->Player)))) {
+				(this->RestrictTypeOwner == "self" && builder->Player == unit->Player) ||
+				(this->RestrictTypeOwner == "allied" && (builder->Player == unit->Player || builder->Player->IsAllied(*unit->Player))) ||
+				(this->RestrictTypeOwner == "enemy" && builder->Player->IsEnemy(*unit->Player)))) {
 
 			switch (this->DistanceType) {
 				case EComparison::GreaterThan: