diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2021-08-30 20:45:45 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-30 20:45:45 -0300 |
| commit | bcd73fc00a913babb501dd119d3d833aceaf88da (patch) | |
| tree | f5213fab100f72bbfecba792e0b05b72c2ddd2da /platform | |
| parent | d085b2d04d6a6f972cc252532dbbf07f0d54fc3c (diff) | |
| parent | d11c1afc0497894edd8307434948fc8fb4bb1b11 (diff) | |
Merge pull request #52240 from Rubonnek/rename-rel-path
Rename `String::is_rel_path` to `String::is_relative_path`
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/dir_access_jandroid.cpp | 2 | ||||
| -rw-r--r-- | platform/android/export/export_plugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/dir_access_jandroid.cpp b/platform/android/dir_access_jandroid.cpp index 0bae090702..0eeee8215d 100644 --- a/platform/android/dir_access_jandroid.cpp +++ b/platform/android/dir_access_jandroid.cpp @@ -161,7 +161,7 @@ bool DirAccessJAndroid::dir_exists(String p_dir) { if (current_dir == "") sd = p_dir; else { - if (p_dir.is_rel_path()) + if (p_dir.is_relative_path()) sd = current_dir.plus_file(p_dir); else sd = fix_path(p_dir); diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index bdf12b6c50..5c1c3281a6 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -2609,7 +2609,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP String export_filename = p_path.get_file(); String export_path = p_path.get_base_dir(); - if (export_path.is_rel_path()) { + if (export_path.is_relative_path()) { export_path = OS::get_singleton()->get_resource_dir().plus_file(export_path); } export_path = ProjectSettings::get_singleton()->globalize_path(export_path).simplify_path(); |