summaryrefslogtreecommitdiff
path: root/src/sound
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2019-03-03 22:25:13 +0000
committerMichael Lutz <michi@icosahedron.de>2019-03-24 16:10:04 +0100
commitaf7d9020a15c1b1a14b3981ac73c70d2e58cc877 (patch)
tree1dcff3e01382ea3a0a4733a4637659dbbfd4bad5 /src/sound
parent31260e66252fb4d0dda6f992520faeeb96929cfe (diff)
downloadopenttd-af7d9020a15c1b1a14b3981ac73c70d2e58cc877.tar.xz
Codechange: Use override specifer for overriding member declarations
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.
Diffstat (limited to 'src/sound')
-rw-r--r--src/sound/allegro_s.h8
-rw-r--r--src/sound/cocoa_s.h8
-rw-r--r--src/sound/null_s.h8
-rw-r--r--src/sound/sdl_s.h8
-rw-r--r--src/sound/win32_s.h8
-rw-r--r--src/sound/xaudio2_s.h8
6 files changed, 24 insertions, 24 deletions
diff --git a/src/sound/allegro_s.h b/src/sound/allegro_s.h
index e0a247f7b..255be66c7 100644
--- a/src/sound/allegro_s.h
+++ b/src/sound/allegro_s.h
@@ -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. */
diff --git a/src/sound/cocoa_s.h b/src/sound/cocoa_s.h
index 701091425..dd2d74020 100644
--- a/src/sound/cocoa_s.h
+++ b/src/sound/cocoa_s.h
@@ -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 */
diff --git a/src/sound/null_s.h b/src/sound/null_s.h
index b2acd9093..ca9adb546 100644
--- a/src/sound/null_s.h
+++ b/src/sound/null_s.h
@@ -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 */
diff --git a/src/sound/sdl_s.h b/src/sound/sdl_s.h
index 544ce2070..2d36b4629 100644
--- a/src/sound/sdl_s.h
+++ b/src/sound/sdl_s.h
@@ -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 */
diff --git a/src/sound/win32_s.h b/src/sound/win32_s.h
index c6c8e8d14..a0d53a2da 100644
--- a/src/sound/win32_s.h
+++ b/src/sound/win32_s.h
@@ -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 */
diff --git a/src/sound/xaudio2_s.h b/src/sound/xaudio2_s.h
index 2385f49ee..f3525251c 100644
--- a/src/sound/xaudio2_s.h
+++ b/src/sound/xaudio2_s.h
@@ -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 */