diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-02 18:51:16 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-02 18:51:16 +0100 |
| commit | d3a6855dfced9c55043b3a8d4ae25f1390b3e86d (patch) | |
| tree | 2bb513c96504fe9a12a0527ac8bf8d4a959dc3e3 | |
| parent | fd1e579aa78258b91e658b5b4b9a3fc94d0a0ef4 (diff) | |
| parent | 453c5ef6823174aa464c23e0aca3b1f2f00f9bc1 (diff) | |
Merge pull request #66361 from dalexeev/remove-int-plus-string
Unexpose confusing `String + int` and `int + String` operations
| -rw-r--r-- | core/variant/variant_op.cpp | 2 | ||||
| -rw-r--r-- | doc/classes/String.xml | 6 | ||||
| -rw-r--r-- | doc/classes/int.xml | 7 |
3 files changed, 0 insertions, 15 deletions
diff --git a/core/variant/variant_op.cpp b/core/variant/variant_op.cpp index 4c6ee8df1b..25bc241e9b 100644 --- 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 index 320b9fd737..089f6f65a4 100644 --- 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 <"> <return type="bool" /> <param index="0" name="right" type="String" /> diff --git a/doc/classes/int.xml b/doc/classes/int.xml index 689cb7fe8e..65ab5d4656 100644 --- a/doc/classes/int.xml +++ b/doc/classes/int.xml @@ -206,13 +206,6 @@ </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" /> <description> |