thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BACKENDS: SDL: Add override keywords

Browse source
This commit is contained in:
Eugene Sandulenko 2020-01-31 12:39:23 +01:00
parent 507dd5c178
commit 6817478967
3 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/graphics/surfacesdl/surfacesdl-graphics.h
View file

@ -425,7 +425,7 @@ protected:
virtual void setAspectRatioCorrection(bool enable);
void setFilteringMode(bool enable);
virtual bool saveScreenshot(const Common::String &filename) const;
virtual bool saveScreenshot(const Common::String &filename) const override;
virtual void setGraphicsModeIntern();
private:

18
backends/platform/sdl/posix/posix.h
View file

@ -27,26 +27,26 @@
class OSystem_POSIX : public OSystem_SDL {
public:
virtual bool hasFeature(Feature f);
virtual bool hasFeature(Feature f) override;
virtual bool displayLogFile();
virtual bool displayLogFile() override;
virtual bool openUrl(const Common::String &url);
virtual bool openUrl(const Common::String &url) override;
virtual void init();
virtual void initBackend();
virtual void init() override;
virtual void initBackend() override;
virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
Common::String getScreenshotsPath() override;
protected:
virtual Common::String getDefaultConfigFileName();
virtual Common::String getDefaultLogFileName();
virtual Common::String getDefaultConfigFileName() override;
virtual Common::String getDefaultLogFileName() override;
Common::String getXdgUserDir(const char *name);
virtual AudioCDManager *createAudioCDManager();
virtual AudioCDManager *createAudioCDManager() override;
bool launchBrowser(const Common::String& client, const Common::String &url);
};

50
backends/platform/sdl/sdl.h
View file

@ -55,37 +55,37 @@ public:
*/
virtual SdlMixerManager *getMixerManager();
virtual bool hasFeature(Feature f);
virtual bool hasFeature(Feature f) override;
// Override functions from ModularBackend and OSystem
virtual void initBackend();
virtual void engineInit();
virtual void engineDone();
virtual void quit();
virtual void fatalError();
virtual void initBackend() override;
virtual void engineInit() override;
virtual void engineDone() override;
virtual void quit() override;
virtual void fatalError() override;
Common::KeymapArray getGlobalKeymaps() override;
Common::HardwareInputSet *getHardwareInputSet() override;
// Logging
virtual void logMessage(LogMessageType::Type type, const char *message);
virtual void logMessage(LogMessageType::Type type, const char *message) override;
virtual Common::String getSystemLanguage() const;
virtual Common::String getSystemLanguage() const override;
#if SDL_VERSION_ATLEAST(2, 0, 0)
// Clipboard
virtual bool hasTextInClipboard();
virtual Common::String getTextFromClipboard();
virtual bool setTextInClipboard(const Common::String &text);
virtual bool hasTextInClipboard() override;
virtual Common::String getTextFromClipboard() override;
virtual bool setTextInClipboard(const Common::String &text) override;
#endif
virtual void setWindowCaption(const char *caption);
virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
virtual uint32 getMillis(bool skipRecord = false);
virtual void delayMillis(uint msecs);
virtual void getTimeAndDate(TimeDate &td) const;
virtual Audio::Mixer *getMixer();
virtual Common::TimerManager *getTimerManager();
virtual Common::SaveFileManager *getSavefileManager();
virtual void setWindowCaption(const char *caption) override;
virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
virtual uint32 getMillis(bool skipRecord = false) override;
virtual void delayMillis(uint msecs) override;
virtual void getTimeAndDate(TimeDate &td) const override;
virtual Audio::Mixer *getMixer() override;
virtual Common::TimerManager *getTimerManager() override;
virtual Common::SaveFileManager *getSavefileManager() override;
//Screenshots
virtual Common::String getScreenshotsPath();
@ -123,7 +123,7 @@ protected:
*/
SdlWindow *_window;
virtual Common::EventSource *getDefaultEventSource() { return _eventSource; }
virtual Common::EventSource *getDefaultEventSource() override { return _eventSource; }
/**
* Initialze the SDL library.
@ -156,13 +156,13 @@ protected:
*/
void setupGraphicsModes();
virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const;
virtual int getDefaultGraphicsMode() const;
virtual bool setGraphicsMode(int mode);
virtual int getGraphicsMode() const;
virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
virtual int getDefaultGraphicsMode() const override;
virtual bool setGraphicsMode(int mode) override;
virtual int getGraphicsMode() const override;
#endif
protected:
virtual char *convertEncoding(const char *to, const char *from, const char *string, size_t length);
virtual char *convertEncoding(const char *to, const char *from, const char *string, size_t length) override;
};
#endif