summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-07-25 11:09:57 +0200
committerRémi Verschelde <rverschelde@gmail.com>2019-07-25 11:09:57 +0200
commit43238bb59af7a0b7e98540a2786d006dad8747c9 (patch)
tree67b640f9b898f0d2879b4e7eb2205dd33ebca6be /core
parent1481d299ea97fa1311a75a9ee39eb97d624a8619 (diff)
DirAccess: Drop compat get_next(bool *is_dir) which was hidden
Fixes this warning: ``` ./core/os/dir_access.h:74:17: warning: 'virtual String DirAccess::get_next(bool*)' was hidden [-Woverloaded-virtual] ``` Part of #30790.
Diffstat (limited to 'core')
-rw-r--r--core/os/dir_access.cpp8
-rw-r--r--core/os/dir_access.h1
2 files changed, 0 insertions, 9 deletions
diff --git a/core/os/dir_access.cpp b/core/os/dir_access.cpp
index 0cdb5b41b7..b444f0ae1e 100644
--- a/core/os/dir_access.cpp
+++ b/core/os/dir_access.cpp
@@ -179,14 +179,6 @@ Error DirAccess::make_dir_recursive(String p_dir) {
return OK;
}
-String DirAccess::get_next(bool *p_is_dir) {
-
- String next = get_next();
- if (p_is_dir)
- *p_is_dir = current_is_dir();
- return next;
-}
-
String DirAccess::fix_path(String p_path) const {
switch (_access_type) {
diff --git a/core/os/dir_access.h b/core/os/dir_access.h
index bde19bd5ae..704eedae5b 100644
--- a/core/os/dir_access.h
+++ b/core/os/dir_access.h
@@ -71,7 +71,6 @@ protected:
public:
virtual Error list_dir_begin() = 0; ///< This starts dir listing
- virtual String get_next(bool *p_is_dir); // compatibility
virtual String get_next() = 0;
virtual bool current_is_dir() const = 0;
virtual bool current_is_hidden() const = 0;