summaryrefslogtreecommitdiff
path: root/src/video/cocoa
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/video/cocoa
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/video/cocoa')
-rw-r--r--src/video/cocoa/cocoa_v.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/video/cocoa/cocoa_v.h b/src/video/cocoa/cocoa_v.h
index 564daefe0..2614eef53 100644
--- a/src/video/cocoa/cocoa_v.h
+++ b/src/video/cocoa/cocoa_v.h
@@ -16,10 +16,10 @@
class VideoDriver_Cocoa : public VideoDriver {
public:
- /* virtual */ const char *Start(const char * const *param);
+ const char *Start(const char * const *param) override;
/** Stop the video driver */
- /* virtual */ void Stop();
+ void Stop() override;
/** Mark dirty a screen region
* @param left x-coordinate of left border
@@ -27,44 +27,44 @@ public:
* @param width width or dirty rectangle
* @param height height of dirty rectangle
*/
- /* virtual */ void MakeDirty(int left, int top, int width, int height);
+ void MakeDirty(int left, int top, int width, int height) override;
/** Programme main loop */
- /* virtual */ void MainLoop();
+ void MainLoop() override;
/** Change window resolution
* @param w New window width
* @param h New window height
* @return Whether change was successful
*/
- /* virtual */ bool ChangeResolution(int w, int h);
+ bool ChangeResolution(int w, int h) override;
/** Set a new window mode
* @param fullscreen Whether to set fullscreen mode or not
* @return Whether changing the screen mode was successful
*/
- /* virtual */ bool ToggleFullscreen(bool fullscreen);
+ bool ToggleFullscreen(bool fullscreen) override;
/** Callback invoked after the blitter was changed.
* @return True if no error.
*/
- /* virtual */ bool AfterBlitterChange();
+ bool AfterBlitterChange() override;
/**
* An edit box lost the input focus. Abort character compositing if necessary.
*/
- /* virtual */ void EditBoxLostFocus();
+ void EditBoxLostFocus() override;
/** Return driver name
* @return driver name
*/
- /* virtual */ const char *GetName() const { return "cocoa"; }
+ const char *GetName() const override { return "cocoa"; }
};
class FVideoDriver_Cocoa : public DriverFactoryBase {
public:
FVideoDriver_Cocoa() : DriverFactoryBase(Driver::DT_VIDEO, 10, "cocoa", "Cocoa Video Driver") {}
- /* virtual */ Driver *CreateInstance() const { return new VideoDriver_Cocoa(); }
+ Driver *CreateInstance() const override { return new VideoDriver_Cocoa(); }
};