Skip to content

Commit 3275116

Browse files
committed
Rename "file" param for str.path_join() to "path"
1 parent 39c201c commit 3275116

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

core/string/ustring.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ class String {
517517
String rstrip(const String &p_chars) const;
518518
String get_extension() const;
519519
String get_basename() const;
520-
String path_join(const String &p_file) const;
520+
String path_join(const String &p_path) const;
521521
char32_t unicode_at(int p_idx) const;
522522

523523
CharString ascii(bool p_allow_extended = false) const;

core/variant/variant_call.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1750,7 +1750,7 @@ static void _register_variant_builtin_methods_string() {
17501750
bind_string_method(rstrip, sarray("chars"), varray());
17511751
bind_string_method(get_extension, sarray(), varray());
17521752
bind_string_method(get_basename, sarray(), varray());
1753-
bind_string_method(path_join, sarray("file"), varray());
1753+
bind_string_method(path_join, sarray("path"), varray());
17541754
bind_string_method(unicode_at, sarray("at"), varray());
17551755
bind_string_method(indent, sarray("prefix"), varray());
17561756
bind_string_method(dedent, sarray(), varray());

doc/classes/String.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -757,9 +757,9 @@
757757
</method>
758758
<method name="path_join" qualifiers="const">
759759
<return type="String" />
760-
<param index="0" name="file" type="String" />
760+
<param index="0" name="path" type="String" />
761761
<description>
762-
Concatenates [param file] at the end of the string as a subpath, adding [code]/[/code] if necessary.
762+
Concatenates [param path] at the end of the string as a subpath, adding [code]/[/code] if necessary.
763763
[b]Example:[/b] [code]"this/is".path_join("path") == "this/is/path"[/code].
764764
</description>
765765
</method>

doc/classes/StringName.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,9 +665,9 @@
665665
</method>
666666
<method name="path_join" qualifiers="const">
667667
<return type="String" />
668-
<param index="0" name="file" type="String" />
668+
<param index="0" name="path" type="String" />
669669
<description>
670-
Concatenates [param file] at the end of the string as a subpath, adding [code]/[/code] if necessary.
670+
Concatenates [param path] at the end of the string as a subpath, adding [code]/[/code] if necessary.
671671
[b]Example:[/b] [code]"this/is".path_join("path") == "this/is/path"[/code].
672672
</description>
673673
</method>

0 commit comments

Comments
 (0)