godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Rename VariantUtilityFunctions::join() to join_string()

Browse Source
This commit is contained in:
Joel Croteau
2025-05-12 17:51:09 -05:00
parent 8be7ad32e7
commit 981f1e9298
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/variant/variant_utility.cpp
View File

@@ -942,7 +942,7 @@ String VariantUtilityFunctions::str(const Variant **p_args, int p_arg_count, Cal
r_error.error = Callable::CallError::CALL_OK; r_error.error = Callable::CallError::CALL_OK;
return join(p_args, p_arg_count); return join_string(p_args, p_arg_count);
} }
String VariantUtilityFunctions::error_string(Error error) { String VariantUtilityFunctions::error_string(Error error) {
@@ -959,12 +959,12 @@ String VariantUtilityFunctions::type_string(Variant::Type p_type) {
} }
void VariantUtilityFunctions::print(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) { void VariantUtilityFunctions::print(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
print_line(join(p_args, p_arg_count)); print_line(join_string(p_args, p_arg_count));
r_error.error = Callable::CallError::CALL_OK; r_error.error = Callable::CallError::CALL_OK;
} }
void VariantUtilityFunctions::print_rich(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) { void VariantUtilityFunctions::print_rich(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
print_line_rich(join(p_args, p_arg_count)); print_line_rich(join_string(p_args, p_arg_count));
r_error.error = Callable::CallError::CALL_OK; r_error.error = Callable::CallError::CALL_OK;
} }
@@ -973,14 +973,14 @@ void VariantUtilityFunctions::_print_verbose(const Variant **p_args, int p_arg_c
// No need to use `print_verbose()` as this call already only happens // No need to use `print_verbose()` as this call already only happens
// when verbose mode is enabled. This avoids performing string argument concatenation // when verbose mode is enabled. This avoids performing string argument concatenation
// when not needed. // when not needed.
print_line(join(p_args, p_arg_count)); print_line(join_string(p_args, p_arg_count));
} }
r_error.error = Callable::CallError::CALL_OK; r_error.error = Callable::CallError::CALL_OK;
} }
void VariantUtilityFunctions::printerr(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) { void VariantUtilityFunctions::printerr(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
print_error(join(p_args, p_arg_count)); print_error(join_string(p_args, p_arg_count));
r_error.error = Callable::CallError::CALL_OK; r_error.error = Callable::CallError::CALL_OK;
} }
@@ -1011,7 +1011,7 @@ void VariantUtilityFunctions::prints(const Variant **p_args, int p_arg_count, Ca
} }
void VariantUtilityFunctions::printraw(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) { void VariantUtilityFunctions::printraw(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
OS::get_singleton()->print("%s", join(p_args, p_arg_count).utf8().get_data()); OS::get_singleton()->print("%s", join_string(p_args, p_arg_count).utf8().get_data());
r_error.error = Callable::CallError::CALL_OK; r_error.error = Callable::CallError::CALL_OK;
} }
@@ -1021,7 +1021,7 @@ void VariantUtilityFunctions::push_error(const Variant **p_args, int p_arg_count
r_error.expected = 1; r_error.expected = 1;
} }
ERR_PRINT(join(p_args, p_arg_count)); ERR_PRINT(join_string(p_args, p_arg_count));
r_error.error = Callable::CallError::CALL_OK; r_error.error = Callable::CallError::CALL_OK;
} }
@@ -1031,7 +1031,7 @@ void VariantUtilityFunctions::push_warning(const Variant **p_args, int p_arg_cou
r_error.expected = 1; r_error.expected = 1;
} }
WARN_PRINT(join(p_args, p_arg_count)); WARN_PRINT(join_string(p_args, p_arg_count));
r_error.error = Callable::CallError::CALL_OK; r_error.error = Callable::CallError::CALL_OK;
} }
@@ -1150,7 +1150,7 @@ bool VariantUtilityFunctions::is_same(const Variant &p_a, const Variant &p_b) {
return p_a.identity_compare(p_b); return p_a.identity_compare(p_b);
} }
String VariantUtilityFunctions::join(const Variant **p_args, int p_arg_count) { String VariantUtilityFunctions::join_string(const Variant **p_args, int p_arg_count) {
String s; String s;
for (int i = 0; i < p_arg_count; i++) { for (int i = 0; i < p_arg_count; i++) {
String os = p_args[i]->operator String(); String os = p_args[i]->operator String();

2
core/variant/variant_utility.h
View File

@@ -152,5 +152,5 @@ struct VariantUtilityFunctions {
static uint64_t rid_allocate_id(); static uint64_t rid_allocate_id();
static RID rid_from_int64(uint64_t p_base); static RID rid_from_int64(uint64_t p_base);
static bool is_same(const Variant &p_a, const Variant &p_b); static bool is_same(const Variant &p_a, const Variant &p_b);
static String join(const Variant **p_args, int p_arg_count); static String join_string(const Variant **p_args, int p_arg_count);
}; };