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

24
source/Irrlicht/CMemoryFile.h
View File

@ -29,28 +29,28 @@ namespace io
virtual ~CMemoryReadFile();
//! returns how much was read
virtual size_t read(void* buffer, size_t sizeToRead) _IRR_OVERRIDE_;
size_t read(void* buffer, size_t sizeToRead) override;
//! changes position in file, returns true if successful
virtual bool seek(long finalPos, bool relativeMovement = false) _IRR_OVERRIDE_;
bool seek(long finalPos, bool relativeMovement = false) override;
//! returns size of file
virtual long getSize() const _IRR_OVERRIDE_;
long getSize() const override;
//! returns where in the file we are.
virtual long getPos() const _IRR_OVERRIDE_;
long getPos() const override;
//! returns name of file
virtual const io::path& getFileName() const _IRR_OVERRIDE_;
const io::path& getFileName() const override;
//! Get the type of the class implementing this interface
virtual EREAD_FILE_TYPE getType() const _IRR_OVERRIDE_
EREAD_FILE_TYPE getType() const override
{
return ERFT_MEMORY_READ_FILE;
}
//! Get direct access to internal buffer
virtual const void *getBuffer() const _IRR_OVERRIDE_
const void *getBuffer() const override
{
return Buffer;
}
@ -78,18 +78,18 @@ namespace io
virtual ~CMemoryWriteFile();
//! returns how much was written
virtual size_t write(const void* buffer, size_t sizeToWrite) _IRR_OVERRIDE_;
size_t write(const void* buffer, size_t sizeToWrite) override;
//! changes position in file, returns true if successful
virtual bool seek(long finalPos, bool relativeMovement = false) _IRR_OVERRIDE_;
bool seek(long finalPos, bool relativeMovement = false) override;
//! returns where in the file we are.
virtual long getPos() const _IRR_OVERRIDE_;
long getPos() const override;
//! returns name of file
virtual const io::path& getFileName() const _IRR_OVERRIDE_;
const io::path& getFileName() const override;
virtual bool flush() _IRR_OVERRIDE_;
bool flush() override;
private: