diff --git a/backends/audiocd/audiocd-stream.h b/backends/audiocd/audiocd-stream.h index f50c4ed8552..de854c7281d 100644 --- a/backends/audiocd/audiocd-stream.h +++ b/backends/audiocd/audiocd-stream.h @@ -53,12 +53,12 @@ public: AudioCDStream(); ~AudioCDStream(); - int readBuffer(int16 *buffer, const int numSamples); - bool isStereo() const { return true; } - int getRate() const { return 44100; } - bool endOfData() const; - bool seek(const Audio::Timestamp &where); - Audio::Timestamp getLength() const; + int readBuffer(int16 *buffer, const int numSamples) override; + bool isStereo() const override { return true; } + int getRate() const override { return 44100; } + bool endOfData() const override; + bool seek(const Audio::Timestamp &where) override; + Audio::Timestamp getLength() const override; protected: virtual uint getStartFrame() const = 0; diff --git a/backends/audiocd/default/default-audiocd.h b/backends/audiocd/default/default-audiocd.h index 28d76d8e214..26bdc08ef57 100644 --- a/backends/audiocd/default/default-audiocd.h +++ b/backends/audiocd/default/default-audiocd.h @@ -37,20 +37,20 @@ public: DefaultAudioCDManager(); virtual ~DefaultAudioCDManager(); - virtual bool open(); - virtual void close(); - virtual bool play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false, - Audio::Mixer::SoundType soundType = Audio::Mixer::kMusicSoundType); - virtual bool playAbsolute(int startFrame, int numLoops, int duration, bool onlyEmulate = false, - Audio::Mixer::SoundType soundType = Audio::Mixer::kMusicSoundType, const char *cuesheet = "disc.cue"); - virtual void stop(); - virtual bool isPlaying() const; - virtual void setVolume(byte volume); - virtual void setBalance(int8 balance); - virtual void update(); - virtual Status getStatus() const; // Subclasses should override for better status results - virtual bool existExtractedCDAudioFiles(uint track); - virtual bool isDataAndCDAudioReadFromSameCD() { return false; } + bool open() override; + void close() override; + bool play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false, + Audio::Mixer::SoundType soundType = Audio::Mixer::kMusicSoundType) override; + bool playAbsolute(int startFrame, int numLoops, int duration, bool onlyEmulate = false, + Audio::Mixer::SoundType soundType = Audio::Mixer::kMusicSoundType, const char *cuesheet = "disc.cue") override; + void stop() override; + bool isPlaying() const override; + void setVolume(byte volume) override; + void setBalance(int8 balance) override; + void update() override; + Status getStatus() const override; // Subclasses should override for better status results + bool existExtractedCDAudioFiles(uint track) override; + bool isDataAndCDAudioReadFromSameCD() override { return false; } private: void fillPotentialTrackNames(Common::Array &trackNames, int track) const; diff --git a/backends/audiocd/linux/linux-audiocd.cpp b/backends/audiocd/linux/linux-audiocd.cpp index bf6015baa48..04152a9ed88 100644 --- a/backends/audiocd/linux/linux-audiocd.cpp +++ b/backends/audiocd/linux/linux-audiocd.cpp @@ -111,9 +111,9 @@ public: ~LinuxAudioCDStream(); protected: - uint getStartFrame() const; - uint getEndFrame() const; - bool readFrame(int frame, int16 *buffer); + uint getStartFrame() const override; + uint getEndFrame() const override; + bool readFrame(int frame, int16 *buffer) override; private: int _fd; diff --git a/backends/cloud/id/idstorage.h b/backends/cloud/id/idstorage.h index ad66f455ac7..63942878521 100644 --- a/backends/cloud/id/idstorage.h +++ b/backends/cloud/id/idstorage.h @@ -70,7 +70,7 @@ public: /** Returns pointer to Networking::NetworkReadStream. */ Networking::Request *streamFile(const Common::String &path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) override; - virtual Networking::Request *streamFileById(const Common::String &id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) override = 0; + Networking::Request *streamFileById(const Common::String &id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) override = 0; /** Calls the callback when finished. */ Networking::Request *download(const Common::String &remotePath, const Common::Path &localPath, BoolCallback callback, Networking::ErrorCallback errorCallback) override; diff --git a/backends/dlc/scummvmcloud.h b/backends/dlc/scummvmcloud.h index be3a1dbdf80..7e05a0d1e49 100644 --- a/backends/dlc/scummvmcloud.h +++ b/backends/dlc/scummvmcloud.h @@ -44,11 +44,11 @@ public: ScummVMCloud() {} virtual ~ScummVMCloud() {} - virtual void getAllDLCs() override; + void getAllDLCs() override; - virtual void startDownloadAsync(const Common::String &id, const Common::String &url) override; + void startDownloadAsync(const Common::String &id, const Common::String &url) override; - virtual void removeCacheFile(const Common::Path &file) override; + void removeCacheFile(const Common::Path &file) override; // extracts the provided zip in the provided destination path Common::Error extractZip(const Common::Path &file, const Common::Path &destPath); diff --git a/backends/events/sdl/sdl-events.h b/backends/events/sdl/sdl-events.h index d139f6fe1cd..375ae78263b 100644 --- a/backends/events/sdl/sdl-events.h +++ b/backends/events/sdl/sdl-events.h @@ -47,7 +47,7 @@ public: /** * Gets and processes SDL events. */ - virtual bool pollEvent(Common::Event &event); + bool pollEvent(Common::Event &event) override; /** * Emulates a mouse movement that would normally be caused by a mouse warp diff --git a/backends/graphics/graphics.h b/backends/graphics/graphics.h index 42a0e1c35ea..73e8ace9330 100644 --- a/backends/graphics/graphics.h +++ b/backends/graphics/graphics.h @@ -83,8 +83,8 @@ public: virtual int16 getHeight() const = 0; virtual int16 getWidth() const = 0; - virtual void setPalette(const byte *colors, uint start, uint num) = 0; - virtual void grabPalette(byte *colors, uint start, uint num) const = 0; + void setPalette(const byte *colors, uint start, uint num) override = 0; + void grabPalette(byte *colors, uint start, uint num) const override = 0; virtual void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) = 0; virtual Graphics::Surface *lockScreen() = 0; virtual void unlockScreen() = 0; diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h index 13795b94fab..d863dd919bf 100644 --- a/backends/graphics/sdl/sdl-graphics.h +++ b/backends/graphics/sdl/sdl-graphics.h @@ -91,7 +91,7 @@ public: */ virtual bool notifyMousePosition(Common::Point &mouse); - virtual bool showMouse(bool visible) override; + bool showMouse(bool visible) override; bool lockMouse(bool lock) override; virtual bool saveScreenshot(const Common::Path &filename) const { return false; } diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h index 1ffb30ad25a..3c85a73b8e2 100644 --- a/backends/keymapper/keymapper.h +++ b/backends/keymapper/keymapper.h @@ -48,7 +48,7 @@ public: ~Keymapper(); // EventMapper interface - virtual bool mapEvent(const Event &ev, List &mappedEvents); + bool mapEvent(const Event &ev, List &mappedEvents) override; /** * Registers a HardwareInputSet and platform-specific default mappings with the Keymapper diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp index b222a8997f1..0991ce7e980 100644 --- a/backends/midi/alsa.cpp +++ b/backends/midi/alsa.cpp @@ -339,17 +339,17 @@ int AlsaDevice::getClient() { class AlsaMusicPlugin : public MusicPluginObject { public: - const char *getName() const { + const char *getName() const override { return "ALSA"; } - const char *getId() const { + const char *getId() const override { return "alsa"; } AlsaDevices getAlsaDevices() const; - MusicDevices getDevices() const; - Common::Error createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle = 0) const; + MusicDevices getDevices() const override; + Common::Error createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle = 0) const override; private: static int parse_addr(const char *arg, int *client, int *port); diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp index 6c50abaaee4..91aebbec6b3 100644 --- a/backends/midi/seq.cpp +++ b/backends/midi/seq.cpp @@ -272,17 +272,17 @@ const char *MidiDriver_SEQ::getDeviceName() { class SeqMusicPlugin : public MusicPluginObject { public: - const char *getName() const { + const char *getName() const override { return "SEQ"; } - const char *getId() const { + const char *getId() const override { return "seq"; } - MusicDevices getDevices() const; - Common::Error createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle = 0) const; - bool checkDevice(MidiDriver::DeviceHandle hdl, int checkFlags, bool quiet) const; + MusicDevices getDevices() const override; + Common::Error createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle = 0) const override; + bool checkDevice(MidiDriver::DeviceHandle hdl, int checkFlags, bool quiet) const override; private: void addMidiDevices(int deviceFD, MusicDevices &devices, Common::Array *portIDs) const; diff --git a/backends/midi/sndio.cpp b/backends/midi/sndio.cpp index d629420e85b..40e6f03b9f2 100644 --- a/backends/midi/sndio.cpp +++ b/backends/midi/sndio.cpp @@ -123,16 +123,16 @@ void MidiDriver_Sndio::sysEx(const byte *msg, uint16 length) { class SndioMusicPlugin : public MusicPluginObject { public: - const char *getName() const { + const char *getName() const override { return "Sndio"; } - const char *getId() const { + const char *getId() const override { return "sndio"; } - MusicDevices getDevices() const; - Common::Error createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle = 0) const; + MusicDevices getDevices() const override; + Common::Error createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle = 0) const override; }; MusicDevices SndioMusicPlugin::getDevices() const { diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp index bbeff64c756..37b72783673 100644 --- a/backends/midi/timidity.cpp +++ b/backends/midi/timidity.cpp @@ -516,16 +516,16 @@ void MidiDriver_TIMIDITY::sysEx(const byte *msg, uint16 length) { class TimidityMusicPlugin : public MusicPluginObject { public: - const char *getName() const { + const char *getName() const override { return "TiMidity"; } - const char *getId() const { + const char *getId() const override { return "timidity"; } - MusicDevices getDevices() const; - Common::Error createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle = 0) const; + MusicDevices getDevices() const override; + Common::Error createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle = 0) const override; }; MusicDevices TimidityMusicPlugin::getDevices() const { diff --git a/backends/mixer/atari/atari-mixer.h b/backends/mixer/atari/atari-mixer.h index 3957759137c..6e3e40af730 100644 --- a/backends/mixer/atari/atari-mixer.h +++ b/backends/mixer/atari/atari-mixer.h @@ -34,7 +34,7 @@ public: AtariMixerManager(); virtual ~AtariMixerManager(); - virtual void init() override; + void init() override; void update(); void suspendAudio() override; diff --git a/backends/mixer/sdl/sdl-mixer.h b/backends/mixer/sdl/sdl-mixer.h index 69b3bf50abd..afc06587c55 100644 --- a/backends/mixer/sdl/sdl-mixer.h +++ b/backends/mixer/sdl/sdl-mixer.h @@ -39,19 +39,19 @@ public: /** * Initialize and setups the mixer */ - virtual void init(); + void init() override; // Used by Event recorder /** * Pauses the audio system */ - virtual void suspendAudio(); + void suspendAudio() override; /** * Resumes the audio system */ - virtual int resumeAudio(); + int resumeAudio() override; protected: /** diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h index 86e62ee9bb5..07163a1caf2 100644 --- a/backends/platform/android/android.h +++ b/backends/platform/android/android.h @@ -272,7 +272,7 @@ public: bool isRunningInMainThread() { return pthread_self() == _main_thread; } #endif - virtual const char * const *buildHelpDialogData() override; + const char * const *buildHelpDialogData() override; }; #endif diff --git a/backends/platform/ios7/ios7_osys_main.h b/backends/platform/ios7/ios7_osys_main.h index 862345e54f8..da33e2ef0a3 100644 --- a/backends/platform/ios7/ios7_osys_main.h +++ b/backends/platform/ios7/ios7_osys_main.h @@ -158,11 +158,11 @@ public: void virtualController(bool connect); bool isiOSAppOnMac() const; - virtual Common::Path getDefaultLogFileName() override { return Common::Path("/scummvm.log"); } + Common::Path getDefaultLogFileName() override { return Common::Path("/scummvm.log"); } - virtual GUI::OptionsContainerWidget* buildBackendOptionsWidget(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const override; - virtual void applyBackendSettings() override; - virtual void registerDefaultSettings(const Common::String &target) const override; + GUI::OptionsContainerWidget* buildBackendOptionsWidget(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const override; + void applyBackendSettings() override; + void registerDefaultSettings(const Common::String &target) const override; protected: void updateOutputSurface(); diff --git a/backends/platform/sdl/sdl-window.h b/backends/platform/sdl/sdl-window.h index d3bceec8bcd..ee88a11d270 100644 --- a/backends/platform/sdl/sdl-window.h +++ b/backends/platform/sdl/sdl-window.h @@ -209,7 +209,7 @@ private: class SdlIconlessWindow : public SdlWindow { public: - virtual void setupIcon() {} + void setupIcon() override {} }; #endif diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index d9c2190bb1a..4d01df9b8d7 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -205,7 +205,7 @@ protected: #endif virtual uint32 getOSDoubleClickTime() const { return 0; } - virtual const char * const *buildHelpDialogData() override; + const char * const *buildHelpDialogData() override; }; #endif diff --git a/backends/timer/default/default-timer.h b/backends/timer/default/default-timer.h index cf59d5065ca..f5f86b62008 100644 --- a/backends/timer/default/default-timer.h +++ b/backends/timer/default/default-timer.h @@ -59,8 +59,8 @@ protected: public: DefaultTimerManager(); virtual ~DefaultTimerManager(); - virtual bool installTimerProc(TimerProc proc, int32 interval, void *refCon, const Common::String &id); - virtual void removeTimerProc(TimerProc proc); + bool installTimerProc(TimerProc proc, int32 interval, void *refCon, const Common::String &id) override; + void removeTimerProc(TimerProc proc) override; /** * Timer callback, to be invoked at regular time intervals by the backend.