Prechádzať zdrojové kódy

Add override keywords to DirAccess derived classes

Marcel Admiraal 4 rokov pred
rodič
commit
c06025fa13

+ 19 - 19
core/io/file_access_pack.h

@@ -217,33 +217,33 @@ class DirAccessPack : public DirAccess {
 	PackedData::PackedDir *_find_dir(String p_dir);
 
 public:
-	virtual Error list_dir_begin();
-	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;
+	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);
-	virtual String get_current_dir(bool p_include_drive = true) const;
+	virtual Error change_dir(String p_dir) override;
+	virtual String get_current_dir(bool p_include_drive = true) const override;
 
-	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_from, String p_to);
-	virtual Error remove(String p_name);
+	virtual Error rename(String p_from, String p_to) override;
+	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 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; }
 
-	virtual String get_filesystem_type() const;
+	virtual String get_filesystem_type() const override;
 
 	DirAccessPack();
 };

+ 23 - 23
drivers/unix/dir_access_unix.h

@@ -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();

+ 19 - 19
drivers/windows/dir_access_windows.h

@@ -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();

+ 4 - 4
platform/macos/dir_access_macos.h

@@ -43,12 +43,12 @@
 
 class DirAccessMacOS : public DirAccessUnix {
 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 String get_drive(int p_drive);
+	virtual int get_drive_count() override;
+	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