diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-25 14:51:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 14:51:01 +0200 |
| commit | 27d1e63dd461d6a61c2ef4f784e14ad7b9dfdc24 (patch) | |
| tree | 095aaad58eb69393ffccf405beed89c1eef196e9 /editor/editor_file_system.cpp | |
| parent | 7d1dd54d8b50490e204f71a3782a344e9c75f046 (diff) | |
| parent | 43238bb59af7a0b7e98540a2786d006dad8747c9 (diff) | |
Merge pull request #30807 from akien-mga/da-get_next-hidden
DirAccess: Drop compat get_next(bool *is_dir) which was hidden
Diffstat (limited to 'editor/editor_file_system.cpp')
| -rw-r--r-- | editor/editor_file_system.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index 87a37acac6..be3df2815e 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -673,12 +673,11 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess da->list_dir_begin(); while (true) { - bool isdir; - String f = da->get_next(&isdir); + String f = da->get_next(); if (f == "") break; - if (isdir) { + if (da->current_is_dir()) { if (f.begins_with(".")) //ignore hidden and . / .. continue; @@ -870,12 +869,11 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const da->list_dir_begin(); while (true) { - bool isdir; - String f = da->get_next(&isdir); + String f = da->get_next(); if (f == "") break; - if (isdir) { + if (da->current_is_dir()) { if (f.begins_with(".")) //ignore hidden and . / .. continue; |