Merge pull request #52240 from Rubonnek/rename-rel-path

Rename `String::is_rel_path` to `String::is_relative_path`

3 files changed, 5 insertions, 5 deletions

diff --git a/core/io/dir_access.cpp b/core/io/dir_access.cpp
index 8234adea06..3bff0a3fd5 100644
--- a/core/io/dir_access.cpp
+++ b/core/io/dir_access.cpp
@@ -135,7 +135,7 @@ Error DirAccess::make_dir_recursive(String p_dir) {
 
 	String full_dir;
 
-	if (p_dir.is_rel_path()) {
+	if (p_dir.is_relative_path()) {
 		//append current
 		full_dir = get_current_dir().plus_file(p_dir);
 
@@ -345,7 +345,7 @@ Error DirAccess::_copy_dir(DirAccess *p_target_da, String p_to, int p_chmod_flag
 				dirs.push_back(n);
 			} else {
 				const String &rel_path = n;
-				if (!n.is_rel_path()) {
+				if (!n.is_relative_path()) {
 					list_dir_end();
 					return ERR_BUG;
 				}
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index 00d4d093da..84fd6496a7 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -335,7 +335,7 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 					String exttype = get_unicode_string();
 					String path = get_unicode_string();
 
-					if (path.find("://") == -1 && path.is_rel_path()) {
+					if (path.find("://") == -1 && path.is_relative_path()) {
 						// path is relative to file being loaded, so convert to a resource path
 						path = ProjectSettings::get_singleton()->localize_path(res_path.get_base_dir().plus_file(path));
 					}
@@ -626,7 +626,7 @@ Error ResourceLoaderBinary::load() {
 			path = remaps[path];
 		}
 
-		if (path.find("://") == -1 && path.is_rel_path()) {
+		if (path.find("://") == -1 && path.is_relative_path()) {
 			// path is relative to file being loaded, so convert to a resource path
 			path = ProjectSettings::get_singleton()->localize_path(path.get_base_dir().plus_file(external_resources[i].path));
 		}
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index 64237f3b15..3026236f07 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -278,7 +278,7 @@ static String _validate_local_path(const String &p_path) {
 	ResourceUID::ID uid = ResourceUID::get_singleton()->text_to_id(p_path);
 	if (uid != ResourceUID::INVALID_ID) {
 		return ResourceUID::get_singleton()->get_id_path(uid);
-	} else if (p_path.is_rel_path()) {
+	} else if (p_path.is_relative_path()) {
 		return "res://" + p_path;
 	} else {
 		return ProjectSettings::get_singleton()->localize_path(p_path);