Merge pull request godotengine#66361 from dalexeev/remove-int-plus-st…

…ring Unexpose confusing `String + int` and `int + String` operations
Shou · Nov 2, 2022 · d3a6855 · d3a6855
2 parents fd1e579 + 453c5ef
commit d3a6855
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 15 deletions.
diff --git a/core/variant/variant_op.cpp b/core/variant/variant_op.cpp
@@ -240,8 +240,6 @@ void Variant::_register_variant_operators() {
 	register_op<OperatorEvaluatorAdd<double, double, int64_t>>(Variant::OP_ADD, Variant::FLOAT, Variant::INT);
 	register_op<OperatorEvaluatorAdd<double, double, double>>(Variant::OP_ADD, Variant::FLOAT, Variant::FLOAT);
 	register_op<OperatorEvaluatorAdd<String, String, String>>(Variant::OP_ADD, Variant::STRING, Variant::STRING);
-	register_op<OperatorEvaluatorAdd<String, char32_t, String>>(Variant::OP_ADD, Variant::INT, Variant::STRING);
-	register_op<OperatorEvaluatorAdd<String, String, char32_t>>(Variant::OP_ADD, Variant::STRING, Variant::INT);
 	register_op<OperatorEvaluatorAdd<Vector2, Vector2, Vector2>>(Variant::OP_ADD, Variant::VECTOR2, Variant::VECTOR2);
 	register_op<OperatorEvaluatorAdd<Vector2i, Vector2i, Vector2i>>(Variant::OP_ADD, Variant::VECTOR2I, Variant::VECTOR2I);
 	register_op<OperatorEvaluatorAdd<Vector3, Vector3, Vector3>>(Variant::OP_ADD, Variant::VECTOR3, Variant::VECTOR3);

diff --git a/doc/classes/String.xml b/doc/classes/String.xml
@@ -940,12 +940,6 @@
 			<description>
 			</description>
 		</operator>
-		<operator name="operator +">
-			<return type="String" />
-			<param index="0" name="right" type="int" />
-			<description>
-			</description>
-		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
 			<param index="0" name="right" type="String" />

diff --git a/doc/classes/int.xml b/doc/classes/int.xml
@@ -205,13 +205,6 @@
 				[/codeblock]
 			</description>
 		</operator>
-		<operator name="operator +">
-			<return type="String" />
-			<param index="0" name="right" type="String" />
-			<description>
-				Adds Unicode character with code [int] to the [String].
-			</description>
-		</operator>
 		<operator name="operator +">
 			<return type="float" />
 			<param index="0" name="right" type="float" />