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

Add override keywords to DirAccess derived classes

Browse Source
This commit is contained in:
Marcel Admiraal
2021-05-25 08:55:54 +01:00
parent cafb19e608
commit c06025fa13
4 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/io/file_access_pack.h
View File

@@ -217,33 +217,33 @@ class DirAccessPack : public DirAccess {
PackedData::PackedDir *_find_dir(String p_dir); PackedData::PackedDir *_find_dir(String p_dir);
public: public:
virtual Error list_dir_begin(); virtual Error list_dir_begin() override;
virtual String get_next(); virtual String get_next() override;
virtual bool current_is_dir() const; virtual bool current_is_dir() const override;
virtual bool current_is_hidden() const; virtual bool current_is_hidden() const override;
virtual void list_dir_end(); virtual void list_dir_end() override;
virtual int get_drive_count(); virtual int get_drive_count() override;
virtual String get_drive(int p_drive); virtual String get_drive(int p_drive) override;
virtual Error change_dir(String p_dir); virtual Error change_dir(String p_dir) override;
virtual String get_current_dir(bool p_include_drive = true) const; virtual String get_current_dir(bool p_include_drive = true) const override;
virtual bool file_exists(String p_file); virtual bool file_exists(String p_file) override;
virtual bool dir_exists(String p_dir); virtual bool dir_exists(String p_dir) override;
virtual Error make_dir(String p_dir); virtual Error make_dir(String p_dir) override;
virtual Error rename(String p_from, String p_to); virtual Error rename(String p_from, String p_to) override;
virtual Error remove(String p_name); virtual Error remove(String p_name) override;
uint64_t get_space_left(); uint64_t get_space_left() override;
virtual bool is_link(String p_file) { return false; } virtual bool is_link(String p_file) override { return false; }
virtual String read_link(String p_file) { return p_file; } virtual String read_link(String p_file) override { return p_file; }
virtual Error create_link(String p_source, String p_target) { return FAILED; } virtual Error create_link(String p_source, String p_target) override { return FAILED; }
virtual String get_filesystem_type() const; virtual String get_filesystem_type() const override;
DirAccessPack(); DirAccessPack();
}; };

46
drivers/unix/dir_access_unix.h
View File

@@ -52,39 +52,39 @@ protected:
virtual bool is_hidden(const String &p_name); virtual bool is_hidden(const String &p_name);
public: public:
virtual Error list_dir_begin(); ///< This starts dir listing virtual Error list_dir_begin() override; ///< This starts dir listing
virtual String get_next(); virtual String get_next() override;
virtual bool current_is_dir() const; virtual bool current_is_dir() const override;
virtual bool current_is_hidden() const; virtual bool current_is_hidden() const override;
virtual void list_dir_end(); ///< virtual void list_dir_end() override; ///<
virtual int get_drive_count(); virtual int get_drive_count() override;
virtual String get_drive(int p_drive); virtual String get_drive(int p_drive) override;
virtual int get_current_drive(); virtual int get_current_drive() override;
virtual bool drives_are_shortcuts(); virtual bool drives_are_shortcuts() override;
virtual Error change_dir(String p_dir); ///< can be relative or absolute, return false on success virtual Error change_dir(String p_dir) override; ///< can be relative or absolute, return false on success
virtual String get_current_dir(bool p_include_drive = true) const; ///< return current dir location virtual String get_current_dir(bool p_include_drive = true) const override; ///< return current dir location
virtual Error make_dir(String p_dir); virtual Error make_dir(String p_dir) override;
virtual bool file_exists(String p_file); virtual bool file_exists(String p_file) override;
virtual bool dir_exists(String p_dir); virtual bool dir_exists(String p_dir) override;
virtual bool is_readable(String p_dir); virtual bool is_readable(String p_dir) override;
virtual bool is_writable(String p_dir); virtual bool is_writable(String p_dir) override;
virtual uint64_t get_modified_time(String p_file); virtual uint64_t get_modified_time(String p_file);
virtual Error rename(String p_path, String p_new_path); virtual Error rename(String p_path, String p_new_path) override;
virtual Error remove(String p_path); virtual Error remove(String p_path) override;
virtual bool is_link(String p_file); virtual bool is_link(String p_file) override;
virtual String read_link(String p_file); virtual String read_link(String p_file) override;
virtual Error create_link(String p_source, String p_target); virtual Error create_link(String p_source, String p_target) override;
virtual uint64_t get_space_left(); virtual uint64_t get_space_left() override;
virtual String get_filesystem_type() const; virtual String get_filesystem_type() const override;
DirAccessUnix(); DirAccessUnix();
~DirAccessUnix(); ~DirAccessUnix();

38
drivers/windows/dir_access_windows.h
View File

@@ -54,33 +54,33 @@ class DirAccessWindows : public DirAccess {
bool _cishidden = false; bool _cishidden = false;
public: public:
virtual Error list_dir_begin(); ///< This starts dir listing virtual Error list_dir_begin() override; ///< This starts dir listing
virtual String get_next(); virtual String get_next() override;
virtual bool current_is_dir() const; virtual bool current_is_dir() const override;
virtual bool current_is_hidden() const; virtual bool current_is_hidden() const override;
virtual void list_dir_end(); ///< virtual void list_dir_end() override; ///<
virtual int get_drive_count(); virtual int get_drive_count() override;
virtual String get_drive(int p_drive); virtual String get_drive(int p_drive) override;
virtual Error change_dir(String p_dir); ///< can be relative or absolute, return false on success virtual Error change_dir(String p_dir) override; ///< can be relative or absolute, return false on success
virtual String get_current_dir(bool p_include_drive = true) const; ///< return current dir location virtual String get_current_dir(bool p_include_drive = true) const override; ///< return current dir location
virtual bool file_exists(String p_file); virtual bool file_exists(String p_file) override;
virtual bool dir_exists(String p_dir); virtual bool dir_exists(String p_dir) override;
virtual Error make_dir(String p_dir); virtual Error make_dir(String p_dir) override;
virtual Error rename(String p_path, String p_new_path); virtual Error rename(String p_path, String p_new_path) override;
virtual Error remove(String p_path); virtual Error remove(String p_path) override;
virtual bool is_link(String p_file) { return false; }; virtual bool is_link(String p_file) override { return false; };
virtual String read_link(String p_file) { return p_file; }; virtual String read_link(String p_file) override { return p_file; };
virtual Error create_link(String p_source, String p_target) { return FAILED; }; virtual Error create_link(String p_source, String p_target) override { return FAILED; };
uint64_t get_space_left(); uint64_t get_space_left() override;
virtual String get_filesystem_type() const; virtual String get_filesystem_type() const override;
DirAccessWindows(); DirAccessWindows();
~DirAccessWindows(); ~DirAccessWindows();

8
platform/macos/dir_access_macos.h
View File

@@ -43,12 +43,12 @@
class DirAccessMacOS : public DirAccessUnix { class DirAccessMacOS : public DirAccessUnix {
protected: protected:
virtual String fix_unicode_name(const char *p_name) const; virtual String fix_unicode_name(const char *p_name) const override;
virtual int get_drive_count(); virtual int get_drive_count() override;
virtual String get_drive(int p_drive); virtual String get_drive(int p_drive) override;
virtual bool is_hidden(const String &p_name); virtual bool is_hidden(const String &p_name) override;
}; };
#endif // UNIX ENABLED || LIBC_FILEIO_ENABLED #endif // UNIX ENABLED || LIBC_FILEIO_ENABLED