minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-07-01 15:50:27 +02:00
Code Issues Projects Releases Wiki Activity

Replace _IRR_OVERRIDE_ macro with override keyword

Browse Source 
The commit also establishes a precedent of leaving off the `virtual`
keyword in overrides. Although not strictly necessary, I believe this is
good for readability because it makes it clear it is an override and not
a pure virtual function, and it helps keep line lengths shorter. We
should move towards eliminating the macro altogether, but the definition
has been left in with a note on deprecation so that in-progress work
will not suffer merge conflicts.
This commit is contained in:
JosiahWI
2022-10-09 13:57:28 -05:00
committed by sfan5
parent f3a1f9f656
commit 59fc4401f1
87 changed files with 1471 additions and 1474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/Irrlicht/CZipReader.h
View File

@ -145,28 +145,28 @@ namespace io
//! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".zip")
virtual bool isALoadableFileFormat(const io::path& filename) const _IRR_OVERRIDE_;
bool isALoadableFileFormat(const io::path& filename) const override;
//! Check if the file might be loaded by this class
/** Check might look into the file.
\param file File handle to check.
\return True if file seems to be loadable. */
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_;
bool isALoadableFileFormat(io::IReadFile* file) const override;
//! Check to see if the loader can create archives of this type.
/** Check based on the archive type.
\param fileType The archive type to check.
\return True if the archile loader supports this type, false if not */
virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const _IRR_OVERRIDE_;
bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const override;
//! Creates an archive from the filename
/** \param file File handle to check.
\return Pointer to newly created archive, or 0 upon error. */
virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_;
IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const override;
//! creates/loads an archive from the file.
//! \return Pointer to the created archive. Returns 0 if loading failed.
virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_;
io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const override;
private:
io::IFileSystem* FileSystem;
@ -186,19 +186,19 @@ namespace io
virtual ~CZipReader();
//! opens a file by file name
virtual IReadFile* createAndOpenFile(const io::path& filename) _IRR_OVERRIDE_;
IReadFile* createAndOpenFile(const io::path& filename) override;
//! opens a file by index
virtual IReadFile* createAndOpenFile(u32 index) _IRR_OVERRIDE_;
IReadFile* createAndOpenFile(u32 index) override;
//! returns the list of files
virtual const IFileList* getFileList() const _IRR_OVERRIDE_;
const IFileList* getFileList() const override;
//! get the archive type
virtual E_FILE_ARCHIVE_TYPE getType() const _IRR_OVERRIDE_;
E_FILE_ARCHIVE_TYPE getType() const override;
//! return the id of the file Archive
virtual const io::path& getArchiveName() const _IRR_OVERRIDE_ {return Path;}
const io::path& getArchiveName() const override {return Path;}
protected: