dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Use override specifer for overriding member declarations

Browse Source 
This is a C++11 feature that allows the compiler to check that a virtual
member declaration overrides a base-class member with the same signature.

Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked
as virtual despite being a template.
This commit is contained in:
Henry Wilson
2019-03-03 22:25:13 +00:00
committed by Michael Lutz
parent 31260e6625
commit af7d9020a1
85 changed files with 565 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sound/allegro_s.h
View File

@@ -17,12 +17,12 @@
/** Implementation of the allegro sound driver. */
class SoundDriver_Allegro : public SoundDriver {
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param);
/* virtual */ void Stop();
void Stop();
/* virtual */ void MainLoop();
/* virtual */ const char *GetName() const { return "allegro"; }
void MainLoop();
const char *GetName() const { return "allegro"; }
};
/** Factory for the allegro sound driver. */

8
src/sound/cocoa_s.h
View File

@@ -16,16 +16,16 @@
class SoundDriver_Cocoa : public SoundDriver {
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
/* virtual */ const char *GetName() const { return "cocoa"; }
void Stop() override;
const char *GetName() const override { return "cocoa"; }
};
class FSoundDriver_Cocoa : public DriverFactoryBase {
public:
FSoundDriver_Cocoa() : DriverFactoryBase(Driver::DT_SOUND, 10, "cocoa", "Cocoa Sound Driver") {}
/* virtual */ Driver *CreateInstance() const { return new SoundDriver_Cocoa(); }
Driver *CreateInstance() const override { return new SoundDriver_Cocoa(); }
};
#endif /* SOUND_COCOA_H */

8
src/sound/null_s.h
View File

@@ -17,17 +17,17 @@
/** Implementation of the null sound driver. */
class SoundDriver_Null : public SoundDriver {
public:
/* virtual */ const char *Start(const char * const *param) { return NULL; }
const char *Start(const char * const *param) override { return NULL; }
/* virtual */ void Stop() { }
/* virtual */ const char *GetName() const { return "null"; }
void Stop() override { }
const char *GetName() const override { return "null"; }
};
/** Factory for the null sound driver. */
class FSoundDriver_Null : public DriverFactoryBase {
public:
FSoundDriver_Null() : DriverFactoryBase(Driver::DT_SOUND, 1, "null", "Null Sound Driver") {}
/* virtual */ Driver *CreateInstance() const { return new SoundDriver_Null(); }
Driver *CreateInstance() const override { return new SoundDriver_Null(); }
};
#endif /* SOUND_NULL_H */

8
src/sound/sdl_s.h
View File

@@ -17,17 +17,17 @@
/** Implementation of the SDL sound driver. */
class SoundDriver_SDL : public SoundDriver {
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
/* virtual */ const char *GetName() const { return "sdl"; }
void Stop() override;
const char *GetName() const override { return "sdl"; }
};
/** Factory for the SDL sound driver. */
class FSoundDriver_SDL : public DriverFactoryBase {
public:
FSoundDriver_SDL() : DriverFactoryBase(Driver::DT_SOUND, 5, "sdl", "SDL Sound Driver") {}
/* virtual */ Driver *CreateInstance() const { return new SoundDriver_SDL(); }
Driver *CreateInstance() const override { return new SoundDriver_SDL(); }
};
#endif /* SOUND_SDL_H */

8
src/sound/win32_s.h
View File

@@ -17,17 +17,17 @@
/** Implementation of the sound driver for Windows. */
class SoundDriver_Win32 : public SoundDriver {
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
/* virtual */ const char *GetName() const { return "win32"; }
void Stop() override;
const char *GetName() const override { return "win32"; }
};
/** Factory for the sound driver for Windows. */
class FSoundDriver_Win32 : public DriverFactoryBase {
public:
FSoundDriver_Win32() : DriverFactoryBase(Driver::DT_SOUND, 9, "win32", "Win32 WaveOut Sound Driver") {}
/* virtual */ Driver *CreateInstance() const { return new SoundDriver_Win32(); }
Driver *CreateInstance() const override { return new SoundDriver_Win32(); }
};
#endif /* SOUND_WIN32_H */

8
src/sound/xaudio2_s.h
View File

@@ -17,17 +17,17 @@
/** Implementation of the XAudio2 sound driver. */
class SoundDriver_XAudio2 : public SoundDriver {
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
/* virtual */ const char *GetName() const { return "xaudio2"; }
void Stop() override;
const char *GetName() const override { return "xaudio2"; }
};
/** Factory for the XAudio2 sound driver. */
class FSoundDriver_XAudio2 : public DriverFactoryBase {
public:
FSoundDriver_XAudio2() : DriverFactoryBase(Driver::DT_SOUND, 10, "xaudio2", "XAudio2 Sound Driver") {}
/* virtual */ Driver *CreateInstance() const { return new SoundDriver_XAudio2(); }
Driver *CreateInstance() const override { return new SoundDriver_XAudio2(); }
};
#endif /* SOUND_XAUDIO2_H */