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

16
src/music/allegro_m.h
View File

@@ -17,18 +17,18 @@
/** Allegro's music player. */
class MusicDriver_Allegro : public MusicDriver {
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
void Stop() override;
/* virtual */ void PlaySong(const MusicSongInfo &song);
void PlaySong(const MusicSongInfo &song) override;
/* virtual */ void StopSong();
void StopSong() override;
/* virtual */ bool IsSongPlaying();
bool IsSongPlaying() override;
/* virtual */ void SetVolume(byte vol);
/* virtual */ const char *GetName() const { return "allegro"; }
void SetVolume(byte vol) override;
const char *GetName() const override { return "allegro"; }
};
/** Factory for allegro's music player. */
@@ -43,7 +43,7 @@ public:
static const int PRIORITY = 2;
#endif
FMusicDriver_Allegro() : DriverFactoryBase(Driver::DT_MUSIC, PRIORITY, "allegro", "Allegro MIDI Driver") {}
/* virtual */ Driver *CreateInstance() const { return new MusicDriver_Allegro(); }
Driver *CreateInstance() const override { return new MusicDriver_Allegro(); }
};
#endif /* MUSIC_ALLEGRO_H */

16
src/music/bemidi.h
View File

@@ -17,25 +17,25 @@
/** The midi player for BeOS. */
class MusicDriver_BeMidi : public MusicDriver {
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
void Stop() override;
/* virtual */ void PlaySong(const MusicSongInfo &song);
void PlaySong(const MusicSongInfo &song) override;
/* virtual */ void StopSong();
void StopSong() override;
/* virtual */ bool IsSongPlaying();
bool IsSongPlaying() override;
/* virtual */ void SetVolume(byte vol);
/* virtual */ const char *GetName() const { return "bemidi"; }
void SetVolume(byte vol) override;
const char *GetName() const override { return "bemidi"; }
};
/** Factory for the BeOS midi player. */
class FMusicDriver_BeMidi : public DriverFactoryBase {
public:
FMusicDriver_BeMidi() : DriverFactoryBase(Driver::DT_MUSIC, 10, "bemidi", "BeOS MIDI Driver") {}
/* virtual */ Driver *CreateInstance() const { return new MusicDriver_BeMidi(); }
Driver *CreateInstance() const override { return new MusicDriver_BeMidi(); }
};
#endif /* MUSIC_BEMIDI_H */

16
src/music/cocoa_m.h
View File

@@ -16,24 +16,24 @@
class MusicDriver_Cocoa : public MusicDriver {
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
void Stop() override;
/* virtual */ void PlaySong(const MusicSongInfo &song);
void PlaySong(const MusicSongInfo &song) override;
/* virtual */ void StopSong();
void StopSong() override;
/* virtual */ bool IsSongPlaying();
bool IsSongPlaying() override;
/* virtual */ void SetVolume(byte vol);
/* virtual */ const char *GetName() const { return "cocoa"; }
void SetVolume(byte vol) override;
const char *GetName() const override { return "cocoa"; }
};
class FMusicDriver_Cocoa : public DriverFactoryBase {
public:
FMusicDriver_Cocoa() : DriverFactoryBase(Driver::DT_MUSIC, 10, "cocoa", "Cocoa MIDI Driver") {}
/* virtual */ Driver *CreateInstance() const { return new MusicDriver_Cocoa(); }
Driver *CreateInstance() const override { return new MusicDriver_Cocoa(); }
};
#endif /* MUSIC_MACOSX_COCOA_H */

16
src/music/dmusic.h
View File

@@ -19,25 +19,25 @@ class MusicDriver_DMusic : public MusicDriver {
public:
virtual ~MusicDriver_DMusic();
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
void Stop() override;
/* virtual */ void PlaySong(const MusicSongInfo &song);
void PlaySong(const MusicSongInfo &song) override;
/* virtual */ void StopSong();
void StopSong() override;
/* virtual */ bool IsSongPlaying();
bool IsSongPlaying() override;
/* virtual */ void SetVolume(byte vol);
/* virtual */ const char *GetName() const { return "dmusic"; }
void SetVolume(byte vol) override;
const char *GetName() const override { return "dmusic"; }
};
/** Factory for the DirectX music player. */
class FMusicDriver_DMusic : public DriverFactoryBase {
public:
FMusicDriver_DMusic() : DriverFactoryBase(Driver::DT_MUSIC, 10, "dmusic", "DirectMusic MIDI Driver") {}
/* virtual */ Driver *CreateInstance() const { return new MusicDriver_DMusic(); }
Driver *CreateInstance() const override { return new MusicDriver_DMusic(); }
};
#endif /* MUSIC_DMUSIC_H */

16
src/music/extmidi.h
View File

@@ -24,24 +24,24 @@ private:
void DoStop();
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
void Stop() override;
/* virtual */ void PlaySong(const MusicSongInfo &song);
void PlaySong(const MusicSongInfo &song) override;
/* virtual */ void StopSong();
void StopSong() override;
/* virtual */ bool IsSongPlaying();
bool IsSongPlaying() override;
/* virtual */ void SetVolume(byte vol);
/* virtual */ const char *GetName() const { return "extmidi"; }
void SetVolume(byte vol) override;
const char *GetName() const override { return "extmidi"; }
};
class FMusicDriver_ExtMidi : public DriverFactoryBase {
public:
FMusicDriver_ExtMidi() : DriverFactoryBase(Driver::DT_MUSIC, 3, "extmidi", "External MIDI Driver") {}
/* virtual */ Driver *CreateInstance() const { return new MusicDriver_ExtMidi(); }
Driver *CreateInstance() const override { return new MusicDriver_ExtMidi(); }
};
#endif /* MUSIC_EXTERNAL_H */

16
src/music/fluidsynth.h
View File

@@ -17,25 +17,25 @@
/** Music driver making use of FluidSynth. */
class MusicDriver_FluidSynth : public MusicDriver {
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
void Stop() override;
/* virtual */ void PlaySong(const MusicSongInfo &song);
void PlaySong(const MusicSongInfo &song) override;
/* virtual */ void StopSong();
void StopSong() override;
/* virtual */ bool IsSongPlaying();
bool IsSongPlaying() override;
/* virtual */ void SetVolume(byte vol);
/* virtual */ const char *GetName() const { return "fluidsynth"; }
void SetVolume(byte vol) override;
const char *GetName() const override { return "fluidsynth"; }
};
/** Factory for the fluidsynth driver. */
class FMusicDriver_FluidSynth : public DriverFactoryBase {
public:
FMusicDriver_FluidSynth() : DriverFactoryBase(Driver::DT_MUSIC, 5, "fluidsynth", "FluidSynth MIDI Driver") {}
/* virtual */ Driver *CreateInstance() const { return new MusicDriver_FluidSynth(); }
Driver *CreateInstance() const override { return new MusicDriver_FluidSynth(); }
};
#endif /* MUSIC_FLUIDSYNTH_H */

16
src/music/null_m.h
View File

@@ -17,25 +17,25 @@
/** The music player that does nothing. */
class MusicDriver_Null : public MusicDriver {
public:
/* virtual */ const char *Start(const char * const *param) { return NULL; }
const char *Start(const char * const *param) override { return NULL; }
/* virtual */ void Stop() { }
void Stop() override { }
/* virtual */ void PlaySong(const MusicSongInfo &song) { }
void PlaySong(const MusicSongInfo &song) override { }
/* virtual */ void StopSong() { }
void StopSong() override { }
/* virtual */ bool IsSongPlaying() { return true; }
bool IsSongPlaying() override { return true; }
/* virtual */ void SetVolume(byte vol) { }
/* virtual */ const char *GetName() const { return "null"; }
void SetVolume(byte vol) override { }
const char *GetName() const override { return "null"; }
};
/** Factory for the null music player. */
class FMusicDriver_Null : public DriverFactoryBase {
public:
FMusicDriver_Null() : DriverFactoryBase(Driver::DT_MUSIC, 1, "null", "Null Music Driver") {}
/* virtual */ Driver *CreateInstance() const { return new MusicDriver_Null(); }
Driver *CreateInstance() const override { return new MusicDriver_Null(); }
};
#endif /* MUSIC_NULL_H */

16
src/music/os2_m.h
View File

@@ -17,25 +17,25 @@
/** OS/2's music player. */
class MusicDriver_OS2 : public MusicDriver {
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
void Stop() override;
/* virtual */ void PlaySong(const MusicSongInfo &song);
void PlaySong(const MusicSongInfo &song) override;
/* virtual */ void StopSong();
void StopSong() override;
/* virtual */ bool IsSongPlaying();
bool IsSongPlaying() override;
/* virtual */ void SetVolume(byte vol);
/* virtual */ const char *GetName() const { return "os2"; }
void SetVolume(byte vol) override;
const char *GetName() const override { return "os2"; }
};
/** Factory for OS/2's music player. */
class FMusicDriver_OS2 : public DriverFactoryBase {
public:
FMusicDriver_OS2() : DriverFactoryBase(Driver::DT_MUSIC, 10, "os2", "OS/2 Music Driver") {}
/* virtual */ Driver *CreateInstance() const { return new MusicDriver_OS2(); }
Driver *CreateInstance() const override { return new MusicDriver_OS2(); }
};
#endif /* MUSIC_OS2_H */

16
src/music/qtmidi.h
View File

@@ -16,24 +16,24 @@
class MusicDriver_QtMidi : public MusicDriver {
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
void Stop() override;
/* virtual */ void PlaySong(const MusicSongInfo &song);
void PlaySong(const MusicSongInfo &song) override;
/* virtual */ void StopSong();
void StopSong() override;
/* virtual */ bool IsSongPlaying();
bool IsSongPlaying() override;
/* virtual */ void SetVolume(byte vol);
/* virtual */ const char *GetName() const { return "qt"; }
void SetVolume(byte vol) override;
const char *GetName() const override { return "qt"; }
};
class FMusicDriver_QtMidi : public DriverFactoryBase {
public:
FMusicDriver_QtMidi() : DriverFactoryBase(Driver::DT_MUSIC, 5, "qt", "QuickTime MIDI Driver") {}
/* virtual */ Driver *CreateInstance() const { return new MusicDriver_QtMidi(); }
Driver *CreateInstance() const override { return new MusicDriver_QtMidi(); }
};
#endif /* MUSIC_MACOSX_QUICKTIME_H */

16
src/music/win32_m.h
View File

@@ -17,25 +17,25 @@
/** The Windows music player. */
class MusicDriver_Win32 : public MusicDriver {
public:
/* virtual */ const char *Start(const char * const *param);
const char *Start(const char * const *param) override;
/* virtual */ void Stop();
void Stop() override;
/* virtual */ void PlaySong(const MusicSongInfo &song);
void PlaySong(const MusicSongInfo &song) override;
/* virtual */ void StopSong();
void StopSong() override;
/* virtual */ bool IsSongPlaying();
bool IsSongPlaying() override;
/* virtual */ void SetVolume(byte vol);
/* virtual */ const char *GetName() const { return "win32"; }
void SetVolume(byte vol) override;
const char *GetName() const override { return "win32"; }
};
/** Factory for Windows' music player. */
class FMusicDriver_Win32 : public DriverFactoryBase {
public:
FMusicDriver_Win32() : DriverFactoryBase(Driver::DT_MUSIC, 5, "win32", "Win32 Music Driver") {}
/* virtual */ Driver *CreateInstance() const { return new MusicDriver_Win32(); }
Driver *CreateInstance() const override { return new MusicDriver_Win32(); }
};
#endif /* MUSIC_WIN32_H */