minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-07-02 00:00:26 +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/CEGLManager.h
View File

@ -32,42 +32,42 @@ namespace video
// Initialize EGL.
/* This method initialize EGLand create EGL display, anyway surface and context
aren't create. */
virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_;
bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) override;
// Terminate EGL.
/* Terminate EGL context. This method break both existed surface and context. */
virtual void terminate() _IRR_OVERRIDE_;
void terminate() override;
// Create EGL surface.
/* This method create EGL surface. On some platforms eg. Android, we must
recreate surface on each resume, because WindowID may change, so existed
surface may not be valid. If EGL context already exist, this method
automatically activates it. */
virtual bool generateSurface() _IRR_OVERRIDE_;
bool generateSurface() override;
// Destroy EGL surface.
/* This method destroy EGL. On some platforms eg. Android, we should call
this method on each pause, because after resume this surface may not be valid.
Hovewer this method doesn'r break EGL context. */
virtual void destroySurface() _IRR_OVERRIDE_;
void destroySurface() override;
// Create EGL context.
/* This method create and activate EGL context. */
virtual bool generateContext() _IRR_OVERRIDE_;
bool generateContext() override;
// Destroy EGL context.
/* This method destroy EGL context. */
virtual void destroyContext() _IRR_OVERRIDE_;
void destroyContext() override;
virtual const SExposedVideoData& getContext() const _IRR_OVERRIDE_;
const SExposedVideoData& getContext() const override;
virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_;
bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) override;
// Get procedure address.
virtual void* getProcAddress(const std::string &procName) _IRR_OVERRIDE_;
void* getProcAddress(const std::string &procName) override;
// Swap buffers.
virtual bool swapBuffers() _IRR_OVERRIDE_;
bool swapBuffers() override;
protected:
enum EConfigStyle