BACKENDS: Use override keyword where appropriate

This commit is contained in:
Le Philousophe authored and Filippos Karapetis committed 2026-07-12 19:03:07 +03:00
1 parent 4e501a7377
commit ab115aa69d
20 files changed
+62 -62

No files matched your search

+6 -6
View File
@@ -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;
+14 -14
View File
@@ -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<Common::String> &trackNames, int track) const;
+3 -3
View File
@@ -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;
+1 -1
View File
@@ -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;
+3 -3
View File
@@ -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);
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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;
+1 -1
View File
@@ -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; }
+1 -1
View File
@@ -48,7 +48,7 @@ public:
~Keymapper();
// EventMapper interface
virtual bool mapEvent(const Event &ev, List<Event> &mappedEvents);
bool mapEvent(const Event &ev, List<Event> &mappedEvents) override;
/**
* Registers a HardwareInputSet and platform-specific default mappings with the Keymapper
+4 -4
View File
@@ -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);
+5 -5
View File
@@ -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<int> *portIDs) const;
+4 -4
View File
@@ -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 {
+4 -4
View File
@@ -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 {
+1 -1
View File
@@ -34,7 +34,7 @@ public:
AtariMixerManager();
virtual ~AtariMixerManager();
virtual void init() override;
void init() override;
void update();
void suspendAudio() override;
+3 -3
View File
@@ -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:
/**
+1 -1
View File
@@ -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
+4 -4
View File
@@ -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();
+1 -1
View File
@@ -209,7 +209,7 @@ private:
class SdlIconlessWindow : public SdlWindow {
public:
virtual void setupIcon() {}
void setupIcon() override {}
};
#endif
+1 -1
View File
@@ -205,7 +205,7 @@ protected:
#endif
virtual uint32 getOSDoubleClickTime() const { return 0; }
virtual const char * const *buildHelpDialogData() override;
const char * const *buildHelpDialogData() override;
};
#endif
+2 -2
View File
@@ -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.