mirror of
https://github.com/minetest/irrlicht.git
synced 2025-07-01 15:50:27 +02:00
Replace _IRR_OVERRIDE_ macro with override keyword
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:
@ -26,21 +26,21 @@ namespace video
|
||||
|
||||
virtual ~CSDLManager() {}
|
||||
|
||||
virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_;
|
||||
bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) override;
|
||||
|
||||
virtual void terminate() _IRR_OVERRIDE_ {};
|
||||
virtual bool generateSurface() _IRR_OVERRIDE_ { return true; };
|
||||
virtual void destroySurface() _IRR_OVERRIDE_ {};
|
||||
virtual bool generateContext() _IRR_OVERRIDE_ { return true; };
|
||||
virtual void destroyContext() _IRR_OVERRIDE_ {};
|
||||
void terminate() override {};
|
||||
bool generateSurface() override { return true; };
|
||||
void destroySurface() override {};
|
||||
bool generateContext() override { return true; };
|
||||
void destroyContext() override {};
|
||||
|
||||
virtual const SExposedVideoData& getContext() const _IRR_OVERRIDE_;
|
||||
const SExposedVideoData& getContext() const override;
|
||||
|
||||
virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero=false) _IRR_OVERRIDE_;
|
||||
bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero=false) override;
|
||||
|
||||
virtual void* getProcAddress(const std::string &procName) _IRR_OVERRIDE_;
|
||||
void* getProcAddress(const std::string &procName) override;
|
||||
|
||||
virtual bool swapBuffers() _IRR_OVERRIDE_;
|
||||
bool swapBuffers() override;
|
||||
|
||||
private:
|
||||
SExposedVideoData Data;
|
||||
|
Reference in New Issue
Block a user