From 981f1e9298d57489d44fac4344ce9b3cf88cae00 Mon Sep 17 00:00:00 2001
From: Joel Croteau <joelcroteau@joelcroteau.com>
Date: Mon, 12 May 2025 17:51:09 -0500
Subject: [PATCH] Rename `VariantUtilityFunctions::join()` to `join_string()`

---
 core/variant/variant_utility.cpp | 18 +++++++++---------
 core/variant/variant_utility.h   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/variant/variant_utility.cpp b/core/variant/variant_utility.cpp
index 14ee932b95a..8fe2d7fed5a 100644
--- a/core/variant/variant_utility.cpp
+++ b/core/variant/variant_utility.cpp
@@ -942,7 +942,7 @@ String VariantUtilityFunctions::str(const Variant **p_args, int p_arg_count, Cal
 
 	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) {
@@ -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) {
-	print_line(join(p_args, p_arg_count));
+	print_line(join_string(p_args, p_arg_count));
 	r_error.error = Callable::CallError::CALL_OK;
 }
 
 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;
 }
 
@@ -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
 		// when verbose mode is enabled. This avoids performing string argument concatenation
 		// 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;
 }
 
 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;
 }
 
@@ -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) {
-	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;
 }
 
@@ -1021,7 +1021,7 @@ void VariantUtilityFunctions::push_error(const Variant **p_args, int p_arg_count
 		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;
 }
 
@@ -1031,7 +1031,7 @@ void VariantUtilityFunctions::push_warning(const Variant **p_args, int p_arg_cou
 		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;
 }
 
@@ -1150,7 +1150,7 @@ bool VariantUtilityFunctions::is_same(const Variant &p_a, const Variant &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;
 	for (int i = 0; i < p_arg_count; i++) {
 		String os = p_args[i]->operator String();
diff --git a/core/variant/variant_utility.h b/core/variant/variant_utility.h
index a14142051af..a76e1b90124 100644
--- a/core/variant/variant_utility.h
+++ b/core/variant/variant_utility.h
@@ -152,5 +152,5 @@ struct VariantUtilityFunctions {
 	static uint64_t rid_allocate_id();
 	static RID rid_from_int64(uint64_t p_base);
 	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);
 };