godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

DirAccess: Drop compat get_next(bool *is_dir) which was hidden

Browse Source 
Fixes this warning:
```
./core/os/dir_access.h:74:17: warning: 'virtual String DirAccess::get_next(bool*)' was hidden [-Woverloaded-virtual]
```

Part of #30790.
This commit is contained in:
Rémi Verschelde
2019-07-25 11:09:57 +02:00
parent 1481d299ea
commit 43238bb59a
7 changed files with 23 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
editor/editor_file_dialog.cpp
View File

@@ -29,6 +29,7 @@
/*************************************************************************/
#include "editor_file_dialog.h"
#include "core/os/file_access.h"
#include "core/os/keyboard.h"
#include "core/os/os.h"
@@ -731,19 +732,15 @@ void EditorFileDialog::update_file_list() {
List<String> files;
List<String> dirs;
bool is_dir;
bool is_hidden;
String item;
while ((item = dir_access->get_next(&is_dir)) != "") {
while ((item = dir_access->get_next()) != "") {
if (item == "." || item == "..")
continue;
is_hidden = dir_access->current_is_hidden();
if (show_hidden_files || !is_hidden) {
if (!is_dir)
if (show_hidden_files || !dir_access->current_is_hidden()) {
if (!dir_access->current_is_dir())
files.push_back(item);
else
dirs.push_back(item);