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

22
source/Irrlicht/CFileList.h
View File

@ -82,37 +82,37 @@ public:
\param offset The offset where the file is stored in an archive
\param size The size of the file in bytes.
\param id The ID of the file in the archive which owns it */
virtual u32 addItem(const io::path& fullPath, u32 offset, u32 size, bool isDirectory, u32 id=0) _IRR_OVERRIDE_;
u32 addItem(const io::path& fullPath, u32 offset, u32 size, bool isDirectory, u32 id=0) override;
//! Sorts the file list. You should call this after adding any items to the file list
virtual void sort() _IRR_OVERRIDE_;
void sort() override;
//! Returns the amount of files in the filelist.
virtual u32 getFileCount() const _IRR_OVERRIDE_;
u32 getFileCount() const override;
//! Gets the name of a file in the list, based on an index.
virtual const io::path& getFileName(u32 index) const _IRR_OVERRIDE_;
const io::path& getFileName(u32 index) const override;
//! Gets the full name of a file in the list, path included, based on an index.
virtual const io::path& getFullFileName(u32 index) const _IRR_OVERRIDE_;
const io::path& getFullFileName(u32 index) const override;
//! Returns the ID of a file in the file list, based on an index.
virtual u32 getID(u32 index) const _IRR_OVERRIDE_;
u32 getID(u32 index) const override;
//! Returns true if the file is a directory
virtual bool isDirectory(u32 index) const _IRR_OVERRIDE_;
bool isDirectory(u32 index) const override;
//! Returns the size of a file
virtual u32 getFileSize(u32 index) const _IRR_OVERRIDE_;
u32 getFileSize(u32 index) const override;
//! Returns the offset of a file
virtual u32 getFileOffset(u32 index) const _IRR_OVERRIDE_;
u32 getFileOffset(u32 index) const override;
//! Searches for a file or folder within the list, returns the index
virtual s32 findFile(const io::path& filename, bool isFolder) const _IRR_OVERRIDE_;
s32 findFile(const io::path& filename, bool isFolder) const override;
//! Returns the base path of the file list
virtual const io::path& getPath() const _IRR_OVERRIDE_;
const io::path& getPath() const override;
protected: