Skip to content

Remove implicit conversions from math types to String, to avoid accidental conversions #107295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2025
Merged

Remove implicit conversions from math types to String, to avoid accidental conversions #107295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/math/aabb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,5 +441,5 @@ Variant AABB::intersects_ray_bind(const Vector3 &p_from, const Vector3 &p_dir) c
}

AABB::operator String() const {
return "[P: " + position.operator String() + ", S: " + size + "]";
return "[P: " + String(position) + ", S: " + String(size) + "]";
}
2 changes: 1 addition & 1 deletion core/math/aabb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ struct [[nodiscard]] AABB {
return position + (size * 0.5f);
}

operator String() const;
explicit operator String() const;

AABB() = default;
constexpr AABB(const Vector3 &p_pos, const Vector3 &p_size) :
Expand Down
2 changes: 1 addition & 1 deletion core/math/basis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ struct [[nodiscard]] Basis {
Basis slerp(const Basis &p_to, real_t p_weight) const;
void rotate_sh(real_t *p_values);

operator String() const;
explicit operator String() const;

/* create / set */

Expand Down
2 changes: 1 addition & 1 deletion core/math/color.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ struct [[nodiscard]] Color {
static Color from_rgba8(int64_t p_r8, int64_t p_g8, int64_t p_b8, int64_t p_a8 = 255);

constexpr bool operator<(const Color &p_color) const; // Used in set keys.
operator String() const;
explicit operator String() const;

// For the binder.
_FORCE_INLINE_ void set_r8(int32_t r8) { r = (CLAMP(r8, 0, 255) / 255.0f); }
Expand Down
2 changes: 1 addition & 1 deletion core/math/face3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ bool Face3::intersects_aabb(const AABB &p_aabb) const {
}

Face3::operator String() const {
return String() + vertex[0] + ", " + vertex[1] + ", " + vertex[2];
return String() + String(vertex[0]) + ", " + String(vertex[1]) + ", " + String(vertex[2]);
}

void Face3::project_range(const Vector3 &p_normal, const Transform3D &p_transform, real_t &r_min, real_t &r_max) const {
Expand Down
2 changes: 1 addition & 1 deletion core/math/face3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct [[nodiscard]] Face3 {

bool intersects_aabb(const AABB &p_aabb) const;
_FORCE_INLINE_ bool intersects_aabb2(const AABB &p_aabb) const;
operator String() const;
explicit operator String() const;

Face3() = default;
constexpr Face3(const Vector3 &p_v1, const Vector3 &p_v2, const Vector3 &p_v3) :
Expand Down
2 changes: 1 addition & 1 deletion core/math/plane.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ struct [[nodiscard]] Plane {

constexpr bool operator==(const Plane &p_plane) const;
constexpr bool operator!=(const Plane &p_plane) const;
operator String() const;
explicit operator String() const;

Plane() = default;
constexpr Plane(real_t p_a, real_t p_b, real_t p_c, real_t p_d) :
Expand Down
2 changes: 1 addition & 1 deletion core/math/projection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ struct [[nodiscard]] Projection {
Vector4 xform(const Vector4 &p_vec4) const;
Vector4 xform_inv(const Vector4 &p_vec4) const;

operator String() const;
explicit operator String() const;

void scale_translate_to_fit(const AABB &p_aabb);
void add_jitter_offset(const Vector2 &p_offset);
Expand Down
2 changes: 1 addition & 1 deletion core/math/quaternion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ struct [[nodiscard]] Quaternion {
constexpr bool operator==(const Quaternion &p_quaternion) const;
constexpr bool operator!=(const Quaternion &p_quaternion) const;

operator String() const;
explicit operator String() const;

constexpr Quaternion() :
x(0), y(0), z(0), w(1) {}
Expand Down
2 changes: 1 addition & 1 deletion core/math/rect2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ struct [[nodiscard]] Rect2 {
return position + size;
}

operator String() const;
explicit operator String() const;
operator Rect2i() const;

Rect2() = default;
Expand Down
2 changes: 1 addition & 1 deletion core/math/rect2i.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "core/string/ustring.h"

Rect2i::operator String() const {
return "[P: " + position.operator String() + ", S: " + size + "]";
return "[P: " + String(position) + ", S: " + String(size) + "]";
}

Rect2i::operator Rect2() const {
Expand Down
2 changes: 1 addition & 1 deletion core/math/rect2i.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ struct [[nodiscard]] Rect2i {
return position + size;
}

operator String() const;
explicit operator String() const;
operator Rect2() const;

Rect2i() = default;
Expand Down
2 changes: 1 addition & 1 deletion core/math/transform_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ struct [[nodiscard]] Transform2D {
_FORCE_INLINE_ Vector<Vector2> xform(const Vector<Vector2> &p_array) const;
_FORCE_INLINE_ Vector<Vector2> xform_inv(const Vector<Vector2> &p_array) const;

operator String() const;
explicit operator String() const;

constexpr Transform2D(real_t p_xx, real_t p_xy, real_t p_yx, real_t p_yy, real_t p_ox, real_t p_oy) :
columns{
Expand Down
2 changes: 1 addition & 1 deletion core/math/transform_3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ struct [[nodiscard]] Transform3D {
origin.z = p_tz;
}

operator String() const;
explicit operator String() const;

Transform3D() = default;
constexpr Transform3D(const Basis &p_basis, const Vector3 &p_origin = Vector3()) :
Expand Down
2 changes: 1 addition & 1 deletion core/math/vector2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ struct [[nodiscard]] Vector2 {
Vector2 clampf(real_t p_min, real_t p_max) const;
real_t aspect() const { return width / height; }

operator String() const;
explicit operator String() const;
operator Vector2i() const;

// NOLINTBEGIN(cppcoreguidelines-pro-type-member-init)
Expand Down
2 changes: 1 addition & 1 deletion core/math/vector2i.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ struct [[nodiscard]] Vector2i {
Vector2i snapped(const Vector2i &p_step) const;
Vector2i snappedi(int32_t p_step) const;

operator String() const;
explicit operator String() const;
operator Vector2() const;

// NOLINTBEGIN(cppcoreguidelines-pro-type-member-init)
Expand Down
2 changes: 1 addition & 1 deletion core/math/vector3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ struct [[nodiscard]] Vector3 {
constexpr bool operator>(const Vector3 &p_v) const;
constexpr bool operator>=(const Vector3 &p_v) const;

operator String() const;
explicit operator String() const;
operator Vector3i() const;

constexpr Vector3() :
Expand Down
2 changes: 1 addition & 1 deletion core/math/vector3i.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ struct [[nodiscard]] Vector3i {
constexpr bool operator>(const Vector3i &p_v) const;
constexpr bool operator>=(const Vector3i &p_v) const;

operator String() const;
explicit operator String() const;
operator Vector3() const;

constexpr Vector3i() :
Expand Down
2 changes: 1 addition & 1 deletion core/math/vector4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ struct [[nodiscard]] Vector4 {
constexpr bool operator>=(const Vector4 &p_vec4) const;
constexpr bool operator<=(const Vector4 &p_vec4) const;

operator String() const;
explicit operator String() const;
operator Vector4i() const;

constexpr Vector4() :
Expand Down
2 changes: 1 addition & 1 deletion core/math/vector4i.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ struct [[nodiscard]] Vector4i {
constexpr bool operator>(const Vector4i &p_v) const;
constexpr bool operator>=(const Vector4i &p_v) const;

operator String() const;
explicit operator String() const;
operator Vector4() const;

constexpr Vector4i() :
Expand Down
32 changes: 16 additions & 16 deletions core/variant/variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,41 +1610,41 @@ String Variant::stringify(int recursion_count) const {
case STRING:
return *reinterpret_cast<const String *>(_data._mem);
case VECTOR2:
return operator Vector2();
return String(operator Vector2());
case VECTOR2I:
return operator Vector2i();
return String(operator Vector2i());
case RECT2:
return operator Rect2();
return String(operator Rect2());
case RECT2I:
return operator Rect2i();
return String(operator Rect2i());
case TRANSFORM2D:
return operator Transform2D();
return String(operator Transform2D());
case VECTOR3:
return operator Vector3();
return String(operator Vector3());
case VECTOR3I:
return operator Vector3i();
return String(operator Vector3i());
case VECTOR4:
return operator Vector4();
return String(operator Vector4());
case VECTOR4I:
return operator Vector4i();
return String(operator Vector4i());
case PLANE:
return operator Plane();
return String(operator Plane());
case AABB:
return operator ::AABB();
return String(operator ::AABB());
case QUATERNION:
return operator Quaternion();
return String(operator Quaternion());
case BASIS:
return operator Basis();
return String(operator Basis());
case TRANSFORM3D:
return operator Transform3D();
return String(operator Transform3D());
case PROJECTION:
return operator Projection();
return String(operator Projection());
case STRING_NAME:
return operator StringName();
case NODE_PATH:
return operator NodePath();
case COLOR:
return operator Color();
return String(operator Color());
case DICTIONARY: {
ERR_FAIL_COND_V_MSG(recursion_count > MAX_RECURSION, "{ ... }", "Maximum dictionary recursion reached!");
recursion_count++;
Expand Down
4 changes: 2 additions & 2 deletions editor/animation_track_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2928,9 +2928,9 @@ String AnimationTrackEdit::get_tooltip(const Point2 &p_pos) const {
float h = animation->bezier_track_get_key_value(track, key_idx);
text += TTR("Value:") + " " + rtos(h) + "\n";
Vector2 ih = animation->bezier_track_get_key_in_handle(track, key_idx);
text += TTR("In-Handle:") + " " + ih + "\n";
text += TTR("In-Handle:") + " " + String(ih) + "\n";
Vector2 oh = animation->bezier_track_get_key_out_handle(track, key_idx);
text += TTR("Out-Handle:") + " " + oh + "\n";
text += TTR("Out-Handle:") + " " + String(oh) + "\n";
int hm = animation->bezier_track_get_key_handle_mode(track, key_idx);
switch (hm) {
case Animation::HANDLE_MODE_FREE: {
Expand Down
30 changes: 15 additions & 15 deletions editor/debugger/debug_adapter/debug_adapter_protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
x.type = type_vec2;
y.type = type_vec2;
origin.type = type_vec2;
x.value = transform.columns[0];
y.value = transform.columns[1];
origin.value = transform.columns[2];
x.value = String(transform.columns[0]);
y.value = String(transform.columns[1]);
origin.value = String(transform.columns[2]);
x.variablesReference = parse_variant(transform.columns[0]);
y.variablesReference = parse_variant(transform.columns[1]);
origin.variablesReference = parse_variant(transform.columns[2]);
Expand All @@ -280,7 +280,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
d.type = Variant::get_type_name(Variant::FLOAT);
normal.type = Variant::get_type_name(Variant::VECTOR3);
d.value = rtos(plane.d);
normal.value = plane.normal;
normal.value = String(plane.normal);
normal.variablesReference = parse_variant(plane.normal);

Array arr = { d.to_json(), normal.to_json() };
Expand Down Expand Up @@ -318,8 +318,8 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
size.name = "size";
position.type = type_vec3;
size.type = type_vec3;
position.value = aabb.position;
size.value = aabb.size;
position.value = String(aabb.position);
size.value = String(aabb.size);
position.variablesReference = parse_variant(aabb.position);
size.variablesReference = parse_variant(aabb.size);

Expand All @@ -338,9 +338,9 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
x.type = type_vec3;
y.type = type_vec3;
z.type = type_vec3;
x.value = basis.rows[0];
y.value = basis.rows[1];
z.value = basis.rows[2];
x.value = String(basis.rows[0]);
y.value = String(basis.rows[1]);
z.value = String(basis.rows[2]);
x.variablesReference = parse_variant(basis.rows[0]);
y.variablesReference = parse_variant(basis.rows[1]);
z.variablesReference = parse_variant(basis.rows[2]);
Expand All @@ -357,8 +357,8 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
origin.name = "origin";
basis.type = Variant::get_type_name(Variant::BASIS);
origin.type = Variant::get_type_name(Variant::VECTOR3);
basis.value = transform.basis;
origin.value = transform.origin;
basis.value = String(transform.basis);
origin.value = String(transform.origin);
basis.variablesReference = parse_variant(transform.basis);
origin.variablesReference = parse_variant(transform.origin);

Expand Down Expand Up @@ -560,7 +560,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
DAP::Variable var;
var.name = itos(i);
var.type = Variant::get_type_name(Variant::VECTOR2);
var.value = array[i];
var.value = String(array[i]);
var.variablesReference = parse_variant(array[i]);
arr.push_back(var.to_json());
}
Expand All @@ -581,7 +581,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
DAP::Variable var;
var.name = itos(i);
var.type = Variant::get_type_name(Variant::VECTOR3);
var.value = array[i];
var.value = String(array[i]);
var.variablesReference = parse_variant(array[i]);
arr.push_back(var.to_json());
}
Expand All @@ -602,7 +602,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
DAP::Variable var;
var.name = itos(i);
var.type = Variant::get_type_name(Variant::COLOR);
var.value = array[i];
var.value = String(array[i]);
var.variablesReference = parse_variant(array[i]);
arr.push_back(var.to_json());
}
Expand All @@ -624,7 +624,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
DAP::Variable var;
var.name = itos(i);
var.type = Variant::get_type_name(Variant::VECTOR4);
var.value = array[i];
var.value = String(array[i]);
var.variablesReference = parse_variant(array[i]);
arr.push_back(var.to_json());
}
Expand Down
2 changes: 1 addition & 1 deletion editor/plugins/tiles/tile_map_layer_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ TileMapLayer *TileMapLayerSubEditorPlugin::_get_edited_layer() const {

void TileMapLayerSubEditorPlugin::draw_tile_coords_over_viewport(Control *p_overlay, const TileMapLayer *p_edited_layer, Ref<TileSet> p_tile_set, bool p_show_rectangle_size, const Vector2i &p_rectangle_origin) {
Point2 msgpos = Point2(20 * EDSCALE, p_overlay->get_size().y - 20 * EDSCALE);
String text = p_tile_set->local_to_map(p_edited_layer->get_local_mouse_position());
String text = String(p_tile_set->local_to_map(p_edited_layer->get_local_mouse_position()));

if (p_show_rectangle_size) {
Vector2i rect_size = p_tile_set->local_to_map(p_edited_layer->get_local_mouse_position()) - p_tile_set->local_to_map(p_rectangle_origin);
Expand Down
2 changes: 1 addition & 1 deletion scene/resources/animation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5226,7 +5226,7 @@ void Animation::compress(uint32_t p_page_size, uint32_t p_fps, float p_split_tol
ScaleTrack *st = static_cast<ScaleTrack *>(t);
st->scales.clear();
st->compressed_track = i;
print_line("Scale Bounds " + itos(i) + ": " + track_bounds[i]);
print_line("Scale Bounds " + itos(i) + ": " + String(track_bounds[i]));
} break;
case TYPE_BLEND_SHAPE: {
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
Expand Down