godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Remove confusing `String + int` and `int + String` operations

This commit is contained in:
Danil Alexeev 2022-09-24 18:13:44 +03:00
parent f74491fdee
commit 453c5ef682
No known key found for this signature in database
GPG Key ID: 124453E157DA8DC7
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/variant/variant_op.cpp
View File

@ -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, 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<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, 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<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<Vector2i, Vector2i, Vector2i>>(Variant::OP_ADD, Variant::VECTOR2I, Variant::VECTOR2I);
register_op<OperatorEvaluatorAdd<Vector3, Vector3, Vector3>>(Variant::OP_ADD, Variant::VECTOR3, Variant::VECTOR3); register_op<OperatorEvaluatorAdd<Vector3, Vector3, Vector3>>(Variant::OP_ADD, Variant::VECTOR3, Variant::VECTOR3);

6
doc/classes/String.xml
View File

@ -940,12 +940,6 @@
<description> <description>
</description> </description>
</operator> </operator>
<operator name="operator +">
<return type="String" />
<param index="0" name="right" type="int" />
<description>
</description>
</operator>
<operator name="operator &lt;"> <operator name="operator &lt;">
<return type="bool" /> <return type="bool" />
<param index="0" name="right" type="String" /> <param index="0" name="right" type="String" />

7
doc/classes/int.xml
View File

@ -195,13 +195,6 @@
<description> <description>
</description> </description>
</operator> </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 +"> <operator name="operator +">
<return type="float" /> <return type="float" />
<param index="0" name="right" type="float" /> <param index="0" name="right" type="float" />