[Scummvm-git-logs] scummvm master -> 6c714b4894334da7cc10c177b1f529557116a133

[somaen]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a85053f430 WATCHMAKER: Fix COPY_INSTEAD_OF_MOVE (CID 1526665, CID 1526988)
6c714b4894 WATCHMAKER: Fix wrong casing in variable name


Commit: a85053f43017c7037fda6ab00af309ebdafbd96e
    https://github.com/scummvm/scummvm/commit/a85053f43017c7037fda6ab00af309ebdafbd96e
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2024-07-07T23:06:35+02:00

Commit Message:
WATCHMAKER: Fix COPY_INSTEAD_OF_MOVE (CID 1526665, CID 1526988)

Changed paths:
    engines/watchmaker/3d/loader.cpp
    engines/watchmaker/t2d/t2d.cpp


diff --git a/engines/watchmaker/3d/loader.cpp b/engines/watchmaker/3d/loader.cpp
index 22f318f9d0c..f811e7cd8c4 100644
--- a/engines/watchmaker/3d/loader.cpp
+++ b/engines/watchmaker/3d/loader.cpp
@@ -117,7 +117,7 @@ Common::String constructPath(const Common::String &prefix, const Common::String
 		Name = Name.substr(0, len - suffixLen) + suffix;
 		assert(suffixLen == 3);
 	}
-	return Common::String(Name);
+	return Common::String(Common::move(Name));
 }
 
 class RoomManagerImplementation : public RoomManager {
diff --git a/engines/watchmaker/t2d/t2d.cpp b/engines/watchmaker/t2d/t2d.cpp
index ec645cdc8b9..89c10e0d758 100644
--- a/engines/watchmaker/t2d/t2d.cpp
+++ b/engines/watchmaker/t2d/t2d.cpp
@@ -123,7 +123,7 @@ void delSpaces(Common::String &str) {
 			result += *it;
 		}
 	}
-	str = result;
+	str = Common::move(result);
 }
 
 t2dWINDOW t2dWin[T2D_MAX_WINDOWS];


Commit: 6c714b4894334da7cc10c177b1f529557116a133
    https://github.com/scummvm/scummvm/commit/6c714b4894334da7cc10c177b1f529557116a133
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2024-07-07T23:09:10+02:00

Commit Message:
WATCHMAKER: Fix wrong casing in variable name

Changed paths:
    engines/watchmaker/3d/loader.cpp


diff --git a/engines/watchmaker/3d/loader.cpp b/engines/watchmaker/3d/loader.cpp
index f811e7cd8c4..250f25290f5 100644
--- a/engines/watchmaker/3d/loader.cpp
+++ b/engines/watchmaker/3d/loader.cpp
@@ -110,14 +110,14 @@ void decodeLoaderFlags(uint32 flags) {
 }
 
 Common::String constructPath(const Common::String &prefix, const Common::String &filename, const char *suffix) {
-	Common::String Name = prefix + filename;
-	uint16 len = Name.size();
+	Common::String name = prefix + filename;
+	uint16 len = name.size();
 	if (suffix != nullptr) {
 		uint16 suffixLen = strlen(suffix);
-		Name = Name.substr(0, len - suffixLen) + suffix;
+		name = name.substr(0, len - suffixLen) + suffix;
 		assert(suffixLen == 3);
 	}
-	return Common::String(Common::move(Name));
+	return Common::String(Common::move(name));
 }
 
 class RoomManagerImplementation : public RoomManager {