[Scummvm-git-logs] scummvm master -> fa615bc52fdb0ca103edc3f227696383b9b6bbb1
SupSuper
supsuper at gmail.com
Sat May 30 05:49:23 UTC 2020
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:
fa615bc52f BACKENDS: Fix inconsistent usage of const modifier
Commit: fa615bc52fdb0ca103edc3f227696383b9b6bbb1
https://github.com/scummvm/scummvm/commit/fa615bc52fdb0ca103edc3f227696383b9b6bbb1
Author: SupSuper (supsuper at gmail.com)
Date: 2020-05-30T06:49:09+01:00
Commit Message:
BACKENDS: Fix inconsistent usage of const modifier
Fixes warnings from mismatching method signatures between parent and child managers
Changed paths:
backends/graphics/sdl/sdl-graphics.cpp
backends/graphics/sdl/sdl-graphics.h
backends/graphics/windowed.h
diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp
index a5b87d9986..c798ee0625 100644
--- a/backends/graphics/sdl/sdl-graphics.cpp
+++ b/backends/graphics/sdl/sdl-graphics.cpp
@@ -170,7 +170,7 @@ void SdlGraphicsManager::initSizeHint(const Graphics::ModeList &modes) {
#endif
}
-bool SdlGraphicsManager::showMouse(const bool visible) {
+bool SdlGraphicsManager::showMouse(bool visible) {
if (visible == _cursorVisible) {
return visible;
}
diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h
index 401f523b76..95d284e76c 100644
--- a/backends/graphics/sdl/sdl-graphics.h
+++ b/backends/graphics/sdl/sdl-graphics.h
@@ -94,7 +94,7 @@ public:
*/
virtual bool notifyMousePosition(Common::Point &mouse);
- virtual bool showMouse(const bool visible) override;
+ virtual bool showMouse(bool visible) override;
virtual bool saveScreenshot(const Common::String &filename) const { return false; }
void saveScreenshot();
diff --git a/backends/graphics/windowed.h b/backends/graphics/windowed.h
index b85124e78a..b18f857282 100644
--- a/backends/graphics/windowed.h
+++ b/backends/graphics/windowed.h
@@ -223,7 +223,7 @@ protected:
*/
virtual void setSystemMousePosition(const int x, const int y) = 0;
- virtual bool showMouse(const bool visible) override {
+ virtual bool showMouse(bool visible) override {
if (_cursorVisible == visible) {
return visible;
}
@@ -240,7 +240,7 @@ protected:
* @param x The new X position of the mouse in virtual screen coordinates.
* @param y The new Y position of the mouse in virtual screen coordinates.
*/
- void warpMouse(const int x, const int y) override {
+ void warpMouse(int x, int y) override {
// Check active coordinate instead of window coordinate to avoid warping
// the mouse if it is still within the same virtual pixel
const Common::Point virtualCursor = convertWindowToVirtual(_cursorX, _cursorY);
More information about the Scummvm-git-logs
mailing list