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

Merge pull request #49058 from madmiraal/add-override-fileaccess

Browse source 
Add override keywords to FileAccess and DirAccess derived classes
This commit is contained in:
Rémi Verschelde 2022-08-02 20:03:24 +02:00 • committed by GitHub
commit 9daffa12be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 223 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

46
drivers/unix/dir_access_unix.h
View file

@ -52,39 +52,39 @@ protected:
virtual bool is_hidden(const String &p_name);
public:
virtual Error list_dir_begin(); ///< This starts dir listing
virtual String get_next();
virtual bool current_is_dir() const;
virtual bool current_is_hidden() const;
virtual Error list_dir_begin() override; ///< This starts dir listing
virtual String get_next() override;
virtual bool current_is_dir() const override;
virtual bool current_is_hidden() const override;
virtual void list_dir_end(); ///<
virtual void list_dir_end() override; ///<
virtual int get_drive_count();
virtual String get_drive(int p_drive);
virtual int get_current_drive();
virtual bool drives_are_shortcuts();
virtual int get_drive_count() override;
virtual String get_drive(int p_drive) override;
virtual int get_current_drive() override;
virtual bool drives_are_shortcuts() override;
virtual Error change_dir(String p_dir); ///< 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 Error make_dir(String p_dir);
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 override; ///< return current dir location
virtual Error make_dir(String p_dir) override;
virtual bool file_exists(String p_file);
virtual bool dir_exists(String p_dir);
virtual bool is_readable(String p_dir);
virtual bool is_writable(String p_dir);
virtual bool file_exists(String p_file) override;
virtual bool dir_exists(String p_dir) override;
virtual bool is_readable(String p_dir) override;
virtual bool is_writable(String p_dir) override;
virtual uint64_t get_modified_time(String p_file);
virtual Error rename(String p_path, String p_new_path);
virtual Error remove(String p_path);
virtual Error rename(String p_path, String p_new_path) override;
virtual Error remove(String p_path) override;
virtual bool is_link(String p_file);
virtual String read_link(String p_file);
virtual Error create_link(String p_source, String p_target);
virtual bool is_link(String p_file) override;
virtual String read_link(String p_file) override;
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();

38
drivers/unix/file_access_unix.h
View file

@ -54,33 +54,33 @@ class FileAccessUnix : public FileAccess {
public:
static CloseNotificationFunc close_notification_func;
virtual Error _open(const String &p_path, int p_mode_flags); ///< open a file
virtual bool is_open() const; ///< true when file is open
virtual Error _open(const String &p_path, int p_mode_flags) override; ///< open a file
virtual bool is_open() const override; ///< true when file is open
virtual String get_path() const; /// returns the path for the current open file
virtual String get_path_absolute() const; /// returns the absolute path for the current open file
virtual String get_path() const override; /// returns the path for the current open file
virtual String get_path_absolute() const override; /// returns the absolute path for the current open file
virtual void seek(uint64_t p_position); ///< seek to a given position
virtual void seek_end(int64_t p_position = 0); ///< seek from the end of file
virtual uint64_t get_position() const; ///< get position in the file
virtual uint64_t get_length() const; ///< get size of the file
virtual void seek(uint64_t p_position) override; ///< seek to a given position
virtual void seek_end(int64_t p_position = 0) override; ///< seek from the end of file
virtual uint64_t get_position() const override; ///< get position in the file
virtual uint64_t get_length() const override; ///< get size of the file
virtual bool eof_reached() const; ///< reading passed EOF
virtual bool eof_reached() const override; ///< reading passed EOF
virtual uint8_t get_8() const; ///< get a byte
virtual uint64_t get_buffer(uint8_t *p_dst, uint64_t p_length) const;
virtual uint8_t get_8() const override; ///< get a byte
virtual uint64_t get_buffer(uint8_t *p_dst, uint64_t p_length) const override;
virtual Error get_error() const; ///< get last error
virtual Error get_error() const override; ///< get last error
virtual void flush();
virtual void store_8(uint8_t p_dest); ///< store a byte
virtual void store_buffer(const uint8_t *p_src, uint64_t p_length); ///< store an array of bytes
virtual void flush() override;
virtual void store_8(uint8_t p_dest) override; ///< store a byte
virtual void store_buffer(const uint8_t *p_src, uint64_t p_length) override; ///< store an array of bytes
virtual bool file_exists(const String &p_path); ///< return true if a file exists
virtual bool file_exists(const String &p_path) override; ///< return true if a file exists
virtual uint64_t _get_modified_time(const String &p_file);
virtual uint32_t _get_unix_permissions(const String &p_file);
virtual Error _set_unix_permissions(const String &p_file, uint32_t p_permissions);
virtual uint64_t _get_modified_time(const String &p_file) override;
virtual uint32_t _get_unix_permissions(const String &p_file) override;
virtual Error _set_unix_permissions(const String &p_file, uint32_t p_permissions) override;
FileAccessUnix() {}
virtual ~FileAccessUnix();

38
drivers/windows/dir_access_windows.h
View file

@ -54,33 +54,33 @@ class DirAccessWindows : public DirAccess {
bool _cishidden = false;
public:
virtual Error list_dir_begin(); ///< This starts dir listing
virtual String get_next();
virtual bool current_is_dir() const;
virtual bool current_is_hidden() const;
virtual void list_dir_end(); ///<
virtual Error list_dir_begin() override; ///< This starts dir listing
virtual String get_next() override;
virtual bool current_is_dir() const override;
virtual bool current_is_hidden() const override;
virtual void list_dir_end() override; ///<
virtual int get_drive_count();
virtual String get_drive(int p_drive);
virtual int get_drive_count() override;
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 String get_current_dir(bool p_include_drive = true) const; ///< return current dir location
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 override; ///< return current dir location
virtual bool file_exists(String p_file);
virtual bool dir_exists(String p_dir);
virtual bool file_exists(String p_file) override;
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 remove(String p_path);
virtual Error rename(String p_path, String p_new_path) override;
virtual Error remove(String p_path) override;
virtual bool is_link(String p_file) { return false; };
virtual String read_link(String p_file) { return p_file; };
virtual Error create_link(String p_source, String p_target) { return FAILED; };
virtual bool is_link(String p_file) override { return false; };
virtual String read_link(String p_file) override { return p_file; };
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();

38
drivers/windows/file_access_windows.h
View file

@ -51,33 +51,33 @@ class FileAccessWindows : public FileAccess {
void _close();
public:
virtual Error _open(const String &p_path, int p_mode_flags); ///< open a file
virtual bool is_open() const; ///< true when file is open
virtual Error _open(const String &p_path, int p_mode_flags) override; ///< open a file
virtual bool is_open() const override; ///< true when file is open
virtual String get_path() const; /// returns the path for the current open file
virtual String get_path_absolute() const; /// returns the absolute path for the current open file
virtual String get_path() const override; /// returns the path for the current open file
virtual String get_path_absolute() const override; /// returns the absolute path for the current open file
virtual void seek(uint64_t p_position); ///< seek to a given position
virtual void seek_end(int64_t p_position = 0); ///< seek from the end of file
virtual uint64_t get_position() const; ///< get position in the file
virtual uint64_t get_length() const; ///< get size of the file
virtual void seek(uint64_t p_position) override; ///< seek to a given position
virtual void seek_end(int64_t p_position = 0) override; ///< seek from the end of file
virtual uint64_t get_position() const override; ///< get position in the file
virtual uint64_t get_length() const override; ///< get size of the file
virtual bool eof_reached() const; ///< reading passed EOF
virtual bool eof_reached() const override; ///< reading passed EOF
virtual uint8_t get_8() const; ///< get a byte
virtual uint64_t get_buffer(uint8_t *p_dst, uint64_t p_length) const;
virtual uint8_t get_8() const override; ///< get a byte
virtual uint64_t get_buffer(uint8_t *p_dst, uint64_t p_length) const override;
virtual Error get_error() const; ///< get last error
virtual Error get_error() const override; ///< get last error
virtual void flush();
virtual void store_8(uint8_t p_dest); ///< store a byte
virtual void store_buffer(const uint8_t *p_src, uint64_t p_length); ///< store an array of bytes
virtual void flush() override;
virtual void store_8(uint8_t p_dest) override; ///< store a byte
virtual void store_buffer(const uint8_t *p_src, uint64_t p_length) override; ///< store an array of bytes
virtual bool file_exists(const String &p_name); ///< return true if a file exists
virtual bool file_exists(const String &p_name) override; ///< return true if a file exists
uint64_t _get_modified_time(const String &p_file);
virtual uint32_t _get_unix_permissions(const String &p_file);
virtual Error _set_unix_permissions(const String &p_file, uint32_t p_permissions);
uint64_t _get_modified_time(const String &p_file) override;
virtual uint32_t _get_unix_permissions(const String &p_file) override;
virtual Error _set_unix_permissions(const String &p_file, uint32_t p_permissions) override;
FileAccessWindows() {}
virtual ~FileAccessWindows();