diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-06-11 15:58:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-11 15:58:16 +0200 |
commit | 6b0183ec893ddea3f8ae71005b5fce1ae988e8a0 (patch) | |
tree | 762ec5df42c374a18bb5ad0ee4cd213ba0add257 /modules | |
parent | 6107d9e180a51e3c9feb4fe8c818321c292ff86b (diff) | |
parent | 5ea1c75d639b53ef1fe84ef33bb65a844f6741b6 (diff) |
Merge pull request #49279 from Calinou/rename-string-is-abs-path-method
Rename `String.is_abs_path()` to `String.is_absolute_path()`
Diffstat (limited to 'modules')
-rw-r--r-- | modules/gdscript/gdscript.cpp | 2 | ||||
-rw-r--r-- | modules/mono/utils/path_utils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index e99c3d6cca..2759675e28 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -2064,7 +2064,7 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b if (err == OK) { const GDScriptParser::ClassNode *c = parser.get_tree(); if (r_icon_path) { - if (c->icon_path.is_empty() || c->icon_path.is_abs_path()) { + if (c->icon_path.is_empty() || c->icon_path.is_absolute_path()) { *r_icon_path = c->icon_path; } else if (c->icon_path.is_rel_path()) { *r_icon_path = p_path.get_base_dir().plus_file(c->icon_path).simplify_path(); diff --git a/modules/mono/utils/path_utils.cpp b/modules/mono/utils/path_utils.cpp index 93d44628ac..c205bdd688 100644 --- a/modules/mono/utils/path_utils.cpp +++ b/modules/mono/utils/path_utils.cpp @@ -80,7 +80,7 @@ String cwd() { } String abspath(const String &p_path) { - if (p_path.is_abs_path()) { + if (p_path.is_absolute_path()) { return p_path.simplify_path(); } else { return path::join(path::cwd(), p_path).simplify_path(); |