luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code 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/CTimer.h
View File

@@ -24,13 +24,13 @@ namespace irr
/** This value does not start with 0 when the application starts.
For example in one implementation the value returned could be the
amount of milliseconds which have elapsed since the system was started. */
virtual u32 getRealTime() const _IRR_OVERRIDE_
u32 getRealTime() const override
{
return os::Timer::getRealTime();
}
//! Get current time and date in calendar form
virtual RealTimeDate getRealTimeAndDate() const _IRR_OVERRIDE_
RealTimeDate getRealTimeAndDate() const override
{
return os::Timer::getRealTimeAndDate();
}
@@ -39,13 +39,13 @@ namespace irr
/** This value starts with 0 and can be manipulated using setTime(), stopTimer(),
startTimer(), etc. This value depends on the set speed of the timer if the timer
is stopped, etc. If you need the system time, use getRealTime() */
virtual u32 getTime() const _IRR_OVERRIDE_
u32 getTime() const override
{
return os::Timer::getTime();
}
//! sets current virtual time
virtual void setTime(u32 time) _IRR_OVERRIDE_
void setTime(u32 time) override
{
os::Timer::setTime(time);
}
@@ -54,7 +54,7 @@ namespace irr
/** The timer is reference counted, which means everything which calls
stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
corretly again. */
virtual void stop() _IRR_OVERRIDE_
void stop() override
{
os::Timer::stopTimer();
}
@@ -63,7 +63,7 @@ namespace irr
/** The timer is reference counted, which means everything which calls
stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
corretly again. */
virtual void start() _IRR_OVERRIDE_
void start() override
{
os::Timer::startTimer();
}
@@ -71,7 +71,7 @@ namespace irr
//! Sets the speed of the timer
/** The speed is the factor with which the time is running faster or slower then the
real system time. */
virtual void setSpeed(f32 speed = 1.0f) _IRR_OVERRIDE_
void setSpeed(f32 speed = 1.0f) override
{
os::Timer::setSpeed(speed);
}
@@ -79,13 +79,13 @@ namespace irr
//! Returns current speed of the timer
/** The speed is the factor with which the time is running faster or slower then the
real system time. */
virtual f32 getSpeed() const _IRR_OVERRIDE_
f32 getSpeed() const override
{
return os::Timer::getSpeed();
}
//! Returns if game timer is currently stopped
virtual bool isStopped() const _IRR_OVERRIDE_
bool isStopped() const override
{
bool ret = os::Timer::isStopped();
return ret;
@@ -95,7 +95,7 @@ namespace irr
/** Makes the virtual timer update the time value based on the real time. This is
called automatically when calling IrrlichtDevice::run(), but you can call it manually
if you don't use this method. */
virtual void tick() _IRR_OVERRIDE_
void tick() override
{
os::Timer::tick();
}