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

20
editor/export_template_manager.cpp
View File

@@ -52,18 +52,16 @@ void ExportTemplateManager::_update_template_list() {
DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
Error err = d->change_dir(EditorSettings::get_singleton()->get_templates_dir());
d->list_dir_begin();
Set<String> templates;
d->list_dir_begin();
if (err == OK) {
bool isdir;
String c = d->get_next(&isdir);
String c = d->get_next();
while (c != String()) {
if (isdir && !c.begins_with(".")) {
if (d->current_is_dir() && !c.begins_with(".")) {
templates.insert(c);
}
c = d->get_next(&isdir);
c = d->get_next();
}
}
d->list_dir_end();
@@ -154,18 +152,14 @@ void ExportTemplateManager::_uninstall_template_confirm() {
ERR_FAIL_COND(err != OK);
Vector<String> files;
d->list_dir_begin();
bool isdir;
String c = d->get_next(&isdir);
String c = d->get_next();
while (c != String()) {
if (!isdir) {
if (!d->current_is_dir()) {
files.push_back(c);
}
c = d->get_next(&isdir);
c = d->get_next();
}
d->list_dir_end();
for (int i = 0; i < files.size(); i++) {