[Scummvm-git-logs] scummvm master -> b531894158c0c12c5ffb1b102429ee745648ab55
bluegr
noreply at scummvm.org
Sun Nov 14 12:31:24 UTC 2021
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b531894158 GRAPHICS: JANITORIAL: Remove 'virtual' when override is specified
Commit: b531894158c0c12c5ffb1b102429ee745648ab55
https://github.com/scummvm/scummvm/commit/b531894158c0c12c5ffb1b102429ee745648ab55
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-11-14T14:31:21+02:00
Commit Message:
GRAPHICS: JANITORIAL: Remove 'virtual' when override is specified
Changed paths:
graphics/macgui/macbutton.h
graphics/macgui/macmenu.h
graphics/macgui/mactext.h
graphics/macgui/macwindow.h
graphics/scaler/dotmatrix.h
graphics/scaler/edge.h
graphics/scaler/hq.h
graphics/scaler/normal.h
graphics/scaler/pm.h
graphics/scaler/sai.h
graphics/scaler/scalebit.h
graphics/scaler/tv.h
graphics/scalerplugin.h
diff --git a/graphics/macgui/macbutton.h b/graphics/macgui/macbutton.h
index a95b95cfb7..4b0ecee1a1 100644
--- a/graphics/macgui/macbutton.h
+++ b/graphics/macgui/macbutton.h
@@ -49,7 +49,7 @@ class MacButton : public MacText {
public:
MacButton(MacButtonType buttonType, TextAlign textAlignment, MacWidget *parent, int x, int y, int w, int h, MacWindowManager *wm, const Common::U32String &s, const MacFont *macFont, int fgcolor, int bgcolor);
- virtual void setActive(bool active) override;
+ void setActive(bool active) override;
void invertOuter();
void invertInner();
@@ -58,10 +58,10 @@ public:
void setCheckBoxType(int type);
void setCheckBoxAccess(int type) { _checkBoxAccess = type; }
- virtual bool draw(ManagedSurface *g, bool forceRedraw = false) override;
- virtual bool draw(bool forceRedraw = false) override;
- virtual bool processEvent(Common::Event &event) override;
- virtual Common::Point calculateOffset() override;
+ bool draw(ManagedSurface *g, bool forceRedraw = false) override;
+ bool draw(bool forceRedraw = false) override;
+ bool processEvent(Common::Event &event) override;
+ Common::Point calculateOffset() override;
private:
void init();
diff --git a/graphics/macgui/macmenu.h b/graphics/macgui/macmenu.h
index 3c7cb58367..090ba942ec 100644
--- a/graphics/macgui/macmenu.h
+++ b/graphics/macgui/macmenu.h
@@ -52,9 +52,9 @@ public:
MacMenu(int id, const Common::Rect &bounds, MacWindowManager *wm);
~MacMenu();
- virtual ManagedSurface *getBorderSurface() override { return nullptr; }
- virtual const Common::Rect &getInnerDimensions() override { return _dims; }
- virtual bool isDirty() override { return _contentIsDirty || _dimensionsDirty; }
+ ManagedSurface *getBorderSurface() override { return nullptr; }
+ const Common::Rect &getInnerDimensions() override { return _dims; }
+ bool isDirty() override { return _contentIsDirty || _dimensionsDirty; }
static Common::StringArray *readMenuFromResource(Common::SeekableReadStream *res);
static MacMenu *createMenuFromPEexe(Common::PEResources *exe, MacWindowManager *wm);
@@ -77,9 +77,9 @@ public:
MacMenuSubMenu *getSubmenu(MacMenuSubMenu *submenu, int index);
- virtual bool draw(ManagedSurface *g, bool forceRedraw = false) override;
- virtual bool draw(bool forceRedraw = false) override { return false; }
- virtual void blit(ManagedSurface *g, Common::Rect &dest) override {}
+ bool draw(ManagedSurface *g, bool forceRedraw = false) override;
+ bool draw(bool forceRedraw = false) override { return false; }
+ void blit(ManagedSurface *g, Common::Rect &dest) override {}
bool processEvent(Common::Event &event) override;
diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h
index 739fe58362..170a148f57 100644
--- a/graphics/macgui/mactext.h
+++ b/graphics/macgui/mactext.h
@@ -159,15 +159,15 @@ public:
virtual ~MacText();
virtual void resize(int w, int h);
- virtual bool processEvent(Common::Event &event) override;
+ bool processEvent(Common::Event &event) override;
- virtual bool needsRedraw() override { return _contentIsDirty || _cursorDirty; }
+ bool needsRedraw() override { return _contentIsDirty || _cursorDirty; }
void render();
void undrawCursor();
void draw(ManagedSurface *g, int x, int y, int w, int h, int xoff, int yoff);
- virtual bool draw(ManagedSurface *g, bool forceRedraw = false) override;
- virtual bool draw(bool forceRedraw = false) override;
+ bool draw(ManagedSurface *g, bool forceRedraw = false) override;
+ bool draw(bool forceRedraw = false) override;
void drawToPoint(ManagedSurface *g, Common::Rect srcRect, Common::Point dstPoint);
void drawToPoint(ManagedSurface *g, Common::Point dstPoint);
@@ -182,7 +182,7 @@ public:
void setAlignOffset(TextAlign align);
TextAlign getAlign() { return _textAlignment; }
virtual Common::Point calculateOffset();
- virtual void setActive(bool active) override;
+ void setActive(bool active) override;
void setEditable(bool editable);
void setColors(uint32 fg, uint32 bg) override;
diff --git a/graphics/macgui/macwindow.h b/graphics/macgui/macwindow.h
index f2e478a443..6678edf794 100644
--- a/graphics/macgui/macwindow.h
+++ b/graphics/macgui/macwindow.h
@@ -226,7 +226,7 @@ public:
* of the window, although move() and resize() might be more comfortable.
* @param r The desired dimensions of the window.
*/
- virtual void setDimensions(const Common::Rect &r) override;
+ void setDimensions(const Common::Rect &r) override;
/**
* Set a background pattern for the window.
@@ -239,13 +239,13 @@ public:
* @param g See BaseMacWindow.
* @param forceRedraw If true, the borders are guarranteed to redraw.
*/
- virtual bool draw(ManagedSurface *g, bool forceRedraw = false) override;
+ bool draw(ManagedSurface *g, bool forceRedraw = false) override;
- virtual bool draw(bool forceRedraw = false) override;
- virtual void blit(ManagedSurface *g, Common::Rect &dest) override;
+ bool draw(bool forceRedraw = false) override;
+ void blit(ManagedSurface *g, Common::Rect &dest) override;
- virtual const Common::Rect &getInnerDimensions() override { return _innerDims; }
- virtual ManagedSurface *getBorderSurface() override { return &_borderSurface; }
+ const Common::Rect &getInnerDimensions() override { return _innerDims; }
+ ManagedSurface *getBorderSurface() override { return &_borderSurface; }
/**
* Centers the window using the dimensions of the parent window manager, or undoes this; does
@@ -258,7 +258,7 @@ public:
* Most often called from the WM.
* @param active Target state.
*/
- virtual void setActive(bool active) override;
+ void setActive(bool active) override;
/**
* Accessor to determine whether a window is active.
* @return True if the window is active.
@@ -291,8 +291,8 @@ public:
/**
* See BaseMacWindow.
*/
- virtual bool processEvent(Common::Event &event) override;
- virtual bool hasAllFocus() override { return _beingDragged || _beingResized; }
+ bool processEvent(Common::Event &event) override;
+ bool hasAllFocus() override { return _beingDragged || _beingResized; }
/**
* Set arbitrary border from a BMP data stream, with custom border offsets.
@@ -344,7 +344,7 @@ public:
void markAllDirty();
void mergeDirtyRects();
- virtual bool isDirty() override { return _borderIsDirty || _contentIsDirty; }
+ bool isDirty() override { return _borderIsDirty || _contentIsDirty; }
void setBorderDirty(bool dirty) { _borderIsDirty = true; }
void resizeBorderSurface();
diff --git a/graphics/scaler/dotmatrix.h b/graphics/scaler/dotmatrix.h
index 27dbc1267d..fc96fffdca 100644
--- a/graphics/scaler/dotmatrix.h
+++ b/graphics/scaler/dotmatrix.h
@@ -27,13 +27,13 @@
class DotMatrixPlugin : public ScalerPluginObject {
public:
DotMatrixPlugin();
- virtual void initialize(const Graphics::PixelFormat &format) override;
- virtual uint increaseFactor() override;
- virtual uint decreaseFactor() override;
- virtual bool canDrawCursor() const override { return false; }
- virtual uint extraPixels() const override { return 0; }
- virtual const char *getName() const override;
- virtual const char *getPrettyName() const override;
+ void initialize(const Graphics::PixelFormat &format) override;
+ uint increaseFactor() override;
+ uint decreaseFactor() override;
+ bool canDrawCursor() const override { return false; }
+ uint extraPixels() const override { return 0; }
+ const char *getName() const override;
+ const char *getPrettyName() const override;
protected:
virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
diff --git a/graphics/scaler/edge.h b/graphics/scaler/edge.h
index 69e4a5d9ea..aa4b4a96b9 100644
--- a/graphics/scaler/edge.h
+++ b/graphics/scaler/edge.h
@@ -28,14 +28,14 @@ class EdgePlugin : public SourceScaler {
public:
EdgePlugin();
- virtual void initialize(const Graphics::PixelFormat &format) override;
- virtual uint increaseFactor() override;
- virtual uint decreaseFactor() override;
- virtual bool canDrawCursor() const override { return false; }
- virtual bool useOldSource() const override { return true; }
- virtual uint extraPixels() const override { return 1; }
- virtual const char *getName() const override;
- virtual const char *getPrettyName() const override;
+ void initialize(const Graphics::PixelFormat &format) override;
+ uint increaseFactor() override;
+ uint decreaseFactor() override;
+ bool canDrawCursor() const override { return false; }
+ bool useOldSource() const override { return true; }
+ uint extraPixels() const override { return 1; }
+ const char *getName() const override;
+ const char *getPrettyName() const override;
protected:
diff --git a/graphics/scaler/hq.h b/graphics/scaler/hq.h
index 563bdb3d44..2f12dcbfea 100644
--- a/graphics/scaler/hq.h
+++ b/graphics/scaler/hq.h
@@ -27,14 +27,14 @@
class HQPlugin : public ScalerPluginObject {
public:
HQPlugin();
- virtual void initialize(const Graphics::PixelFormat &format) override;
- virtual void deinitialize() override;
- virtual uint increaseFactor() override;
- virtual uint decreaseFactor() override;
- virtual bool canDrawCursor() const override { return false; }
- virtual uint extraPixels() const override { return 1; }
- virtual const char *getName() const override;
- virtual const char *getPrettyName() const override;
+ void initialize(const Graphics::PixelFormat &format) override;
+ void deinitialize() override;
+ uint increaseFactor() override;
+ uint decreaseFactor() override;
+ bool canDrawCursor() const override { return false; }
+ uint extraPixels() const override { return 1; }
+ const char *getName() const override;
+ const char *getPrettyName() const override;
protected:
virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
diff --git a/graphics/scaler/normal.h b/graphics/scaler/normal.h
index a4a4e38cc7..0f6bb6830b 100644
--- a/graphics/scaler/normal.h
+++ b/graphics/scaler/normal.h
@@ -27,12 +27,12 @@
class NormalPlugin : public ScalerPluginObject {
public:
NormalPlugin();
- virtual uint increaseFactor() override;
- virtual uint decreaseFactor() override;
- virtual bool canDrawCursor() const override { return true; }
- virtual uint extraPixels() const override { return 0; }
- virtual const char *getName() const override;
- virtual const char *getPrettyName() const override;
+ uint increaseFactor() override;
+ uint decreaseFactor() override;
+ bool canDrawCursor() const override { return true; }
+ uint extraPixels() const override { return 0; }
+ const char *getName() const override;
+ const char *getPrettyName() const override;
protected:
virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
diff --git a/graphics/scaler/pm.h b/graphics/scaler/pm.h
index d24dd42bd9..ef378d6a00 100644
--- a/graphics/scaler/pm.h
+++ b/graphics/scaler/pm.h
@@ -29,12 +29,12 @@ public:
PMPlugin();
virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
- virtual uint increaseFactor() override;
- virtual uint decreaseFactor() override;
- virtual bool canDrawCursor() const override { return false; }
- virtual uint extraPixels() const override { return 1; }
- virtual const char *getName() const override;
- virtual const char *getPrettyName() const override;
+ uint increaseFactor() override;
+ uint decreaseFactor() override;
+ bool canDrawCursor() const override { return false; }
+ uint extraPixels() const override { return 1; }
+ const char *getName() const override;
+ const char *getPrettyName() const override;
};
#endif
diff --git a/graphics/scaler/sai.h b/graphics/scaler/sai.h
index c509b5842d..9bce8ca815 100644
--- a/graphics/scaler/sai.h
+++ b/graphics/scaler/sai.h
@@ -27,12 +27,12 @@
class SAIPlugin : public ScalerPluginObject {
public:
SAIPlugin();
- virtual uint increaseFactor() override;
- virtual uint decreaseFactor() override;
- virtual bool canDrawCursor() const override { return false; }
- virtual uint extraPixels() const override { return 2; }
- virtual const char *getName() const override;
- virtual const char *getPrettyName() const override;
+ uint increaseFactor() override;
+ uint decreaseFactor() override;
+ bool canDrawCursor() const override { return false; }
+ uint extraPixels() const override { return 2; }
+ const char *getName() const override;
+ const char *getPrettyName() const override;
protected:
virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
@@ -41,12 +41,12 @@ protected:
class SuperSAIPlugin : public ScalerPluginObject {
public:
SuperSAIPlugin();
- virtual uint increaseFactor() override;
- virtual uint decreaseFactor() override;
- virtual bool canDrawCursor() const override { return false; }
- virtual uint extraPixels() const override { return 2; }
- virtual const char *getName() const override;
- virtual const char *getPrettyName() const override;
+ uint increaseFactor() override;
+ uint decreaseFactor() override;
+ bool canDrawCursor() const override { return false; }
+ uint extraPixels() const override { return 2; }
+ const char *getName() const override;
+ const char *getPrettyName() const override;
protected:
virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
@@ -55,12 +55,12 @@ protected:
class SuperEaglePlugin : public ScalerPluginObject {
public:
SuperEaglePlugin();
- virtual uint increaseFactor() override;
- virtual uint decreaseFactor() override;
- virtual bool canDrawCursor() const override { return false; }
- virtual uint extraPixels() const override { return 2; }
- virtual const char *getName() const override;
- virtual const char *getPrettyName() const override;
+ uint increaseFactor() override;
+ uint decreaseFactor() override;
+ bool canDrawCursor() const override { return false; }
+ uint extraPixels() const override { return 2; }
+ const char *getName() const override;
+ const char *getPrettyName() const override;
protected:
virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
diff --git a/graphics/scaler/scalebit.h b/graphics/scaler/scalebit.h
index 3ccdf71c45..5fb3598a51 100644
--- a/graphics/scaler/scalebit.h
+++ b/graphics/scaler/scalebit.h
@@ -46,12 +46,12 @@ public:
AdvMamePlugin();
virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
- virtual uint increaseFactor() override;
- virtual uint decreaseFactor() override;
- virtual bool canDrawCursor() const override { return true; }
- virtual uint extraPixels() const override { return 4; }
- virtual const char *getName() const override;
- virtual const char *getPrettyName() const override;
+ uint increaseFactor() override;
+ uint decreaseFactor() override;
+ bool canDrawCursor() const override { return true; }
+ uint extraPixels() const override { return 4; }
+ const char *getName() const override;
+ const char *getPrettyName() const override;
};
#endif
diff --git a/graphics/scaler/tv.h b/graphics/scaler/tv.h
index c56b97d4f9..b8d51fa76d 100644
--- a/graphics/scaler/tv.h
+++ b/graphics/scaler/tv.h
@@ -27,12 +27,12 @@
class TVPlugin : public ScalerPluginObject {
public:
TVPlugin();
- virtual uint increaseFactor() override;
- virtual uint decreaseFactor() override;
- virtual bool canDrawCursor() const override { return false; }
- virtual uint extraPixels() const override { return 0; }
- virtual const char *getName() const override;
- virtual const char *getPrettyName() const override;
+ uint increaseFactor() override;
+ uint decreaseFactor() override;
+ bool canDrawCursor() const override { return false; }
+ uint extraPixels() const override { return 0; }
+ const char *getName() const override;
+ const char *getPrettyName() const override;
private:
virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
diff --git a/graphics/scalerplugin.h b/graphics/scalerplugin.h
index 2fb10bc785..0b0f0a5107 100644
--- a/graphics/scalerplugin.h
+++ b/graphics/scalerplugin.h
@@ -171,7 +171,7 @@ public:
SourceScaler();
virtual ~SourceScaler();
- virtual void deinitialize() override;
+ void deinitialize() override;
virtual void setSource(const byte *src, uint pitch, int width, int height, int padding) final;
More information about the Scummvm-git-logs
mailing list