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 /core | |
| 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 'core')
| -rw-r--r-- | core/os/dir_access.cpp | 8 | ||||
| -rw-r--r-- | core/os/dir_access.h | 1 |
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; |