Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

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

14
editor/doc/doc_data.cpp
View file

@ -741,10 +741,9 @@ Error DocData::load_classes(const String &p_dir) {
da->list_dir_begin();
String path;
bool isdir;
path = da->get_next(&isdir);
path = da->get_next();
while (path != String()) {
if (!isdir && path.ends_with("xml")) {
if (!da->current_is_dir() && path.ends_with("xml")) {
Ref<XMLParser> parser = memnew(XMLParser);
Error err2 = parser->open(p_dir.plus_file(path));
if (err2)
@ -752,7 +751,7 @@ Error DocData::load_classes(const String &p_dir) {
_load(parser);
}
path = da->get_next(&isdir);
path = da->get_next();
}
da->list_dir_end();
@ -771,13 +770,12 @@ Error DocData::erase_classes(const String &p_dir) {
da->list_dir_begin();
String path;
bool isdir;
path = da->get_next(&isdir);
path = da->get_next();
while (path != String()) {
if (!isdir && path.ends_with("xml")) {
if (!da->current_is_dir() && path.ends_with("xml")) {
to_erase.push_back(path);
}
path = da->get_next(&isdir);
path = da->get_next();
}
da->list_dir_end();