Bladeren bron

Merge pull request #52241 from Rubonnek/fix-simplify-path-ret

[3.x] Fix `String::simplify_path` return type
Hugo Locurcio 4 jaren geleden
bovenliggende
commit
ef1c509372
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      core/variant_call.cpp
  2. 1 1
      doc/classes/String.xml

+ 1 - 1
core/variant_call.cpp

@@ -1688,7 +1688,7 @@ void register_variant_methods() {
 	ADDFUNC0R(STRING, BOOL, String, empty, varray());
 	ADDFUNC0R(STRING, BOOL, String, empty, varray());
 	ADDFUNC1R(STRING, STRING, String, humanize_size, INT, "size", varray());
 	ADDFUNC1R(STRING, STRING, String, humanize_size, INT, "size", varray());
 	ADDFUNC0R(STRING, BOOL, String, is_abs_path, varray());
 	ADDFUNC0R(STRING, BOOL, String, is_abs_path, varray());
-	ADDFUNC0R(STRING, BOOL, String, simplify_path, varray());
+	ADDFUNC0R(STRING, STRING, String, simplify_path, varray());
 	ADDFUNC0R(STRING, BOOL, String, is_rel_path, varray());
 	ADDFUNC0R(STRING, BOOL, String, is_rel_path, varray());
 	ADDFUNC0R(STRING, STRING, String, get_base_dir, varray());
 	ADDFUNC0R(STRING, STRING, String, get_base_dir, varray());
 	ADDFUNC0R(STRING, STRING, String, get_file, varray());
 	ADDFUNC0R(STRING, STRING, String, get_file, varray());

+ 1 - 1
doc/classes/String.xml

@@ -667,7 +667,7 @@
 			</description>
 			</description>
 		</method>
 		</method>
 		<method name="simplify_path">
 		<method name="simplify_path">
-			<return type="bool" />
+			<return type="String" />
 			<description>
 			<description>
 				Returns a simplified canonical path.
 				Returns a simplified canonical path.
 			</description>
 			</description>