diff --git a/core/string/ustring.h b/core/string/ustring.h index 8229ff3a4a..a0d4944e12 100644 --- a/core/string/ustring.h +++ b/core/string/ustring.h @@ -520,7 +520,7 @@ public: String rstrip(const String &p_chars) const; String get_extension() const; String get_basename() const; - String path_join(const String &p_file) const; + String path_join(const String &p_path) const; char32_t unicode_at(int p_idx) const; CharString ascii(bool p_allow_extended = false) const; diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp index eb6fab2c7f..31824d1d56 100644 --- a/core/variant/variant_call.cpp +++ b/core/variant/variant_call.cpp @@ -1820,7 +1820,7 @@ static void _register_variant_builtin_methods_string() { bind_string_method(rstrip, sarray("chars"), varray()); bind_string_method(get_extension, sarray(), varray()); bind_string_method(get_basename, sarray(), varray()); - bind_string_method(path_join, sarray("file"), varray()); + bind_string_method(path_join, sarray("path"), varray()); bind_string_method(unicode_at, sarray("at"), varray()); bind_string_method(indent, sarray("prefix"), varray()); bind_string_method(dedent, sarray(), varray()); diff --git a/doc/classes/String.xml b/doc/classes/String.xml index 1016c818f0..d1f6e6e8ea 100644 --- a/doc/classes/String.xml +++ b/doc/classes/String.xml @@ -757,9 +757,9 @@ - + - Concatenates [param file] at the end of the string as a subpath, adding [code]/[/code] if necessary. + Concatenates [param path] at the end of the string as a subpath, adding [code]/[/code] if necessary. [b]Example:[/b] [code]"this/is".path_join("path") == "this/is/path"[/code]. diff --git a/doc/classes/StringName.xml b/doc/classes/StringName.xml index 1378542689..4a84e10cb7 100644 --- a/doc/classes/StringName.xml +++ b/doc/classes/StringName.xml @@ -665,9 +665,9 @@ - + - Concatenates [param file] at the end of the string as a subpath, adding [code]/[/code] if necessary. + Concatenates [param path] at the end of the string as a subpath, adding [code]/[/code] if necessary. [b]Example:[/b] [code]"this/is".path_join("path") == "this/is/path"[/code].