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 /core/string | |
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 'core/string')
-rw-r--r-- | core/string/ustring.cpp | 4 | ||||
-rw-r--r-- | core/string/ustring.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp index 6a19baa94b..ec5ec3dd79 100644 --- a/core/string/ustring.cpp +++ b/core/string/ustring.cpp @@ -3799,7 +3799,7 @@ String String::humanize_size(uint64_t p_size) { return String::num(p_size / divisor).pad_decimals(digits) + " " + prefixes[prefix_idx]; } -bool String::is_abs_path() const { +bool String::is_absolute_path() const { if (length() > 1) { return (operator[](0) == '/' || operator[](0) == '\\' || find(":/") != -1 || find(":\\") != -1); } else if ((length()) == 1) { @@ -4409,7 +4409,7 @@ bool String::is_resource_file() const { } bool String::is_rel_path() const { - return !is_abs_path(); + return !is_absolute_path(); } String String::get_base_dir() const { diff --git a/core/string/ustring.h b/core/string/ustring.h index a56845deff..f05865165d 100644 --- a/core/string/ustring.h +++ b/core/string/ustring.h @@ -397,7 +397,7 @@ public: _FORCE_INLINE_ bool is_empty() const { return length() == 0; } // path functions - bool is_abs_path() const; + bool is_absolute_path() const; bool is_rel_path() const; bool is_resource_file() const; String path_to(const String &p_path) const; |