[Scummvm-git-logs] scummvm master -> b6186ccdd6e15153e82431ee5c2171555dfbb599

[criezy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7408dee5df Revert "GRAPHICS: Tentative fix saveScreenshot() warning for OpenGL"
b6186ccdd6 OPENGL: Fix hidden overladed virtual saveScreenshot() warning


Commit: 7408dee5dff76b0106ce4a87ba89f5737fc0d619
    https://github.com/scummvm/scummvm/commit/7408dee5dff76b0106ce4a87ba89f5737fc0d619
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-04-07T00:09:50+01:00

Commit Message:
Revert "GRAPHICS: Tentative fix saveScreenshot() warning for OpenGL"

This reverts commit 0f118d0210d1dc1d4e4174fd72179de82b263ed8.

Changed paths:
    backends/graphics/opengl/opengl-graphics.h
    backends/graphics/openglsdl/openglsdl-graphics.cpp
    backends/graphics/openglsdl/openglsdl-graphics.h


diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
index 3b04004b69..772ecd101a 100644
--- a/backends/graphics/opengl/opengl-graphics.h
+++ b/backends/graphics/opengl/opengl-graphics.h
@@ -265,31 +265,6 @@ protected:
 	 */
 	bool saveScreenshot(const Common::String &filename) const;
 
-	/**
-	 * @brief Dummy implementation of saveScreenshot() (ie. no file argument) for OpenGLGraphicsManager
-	 *
-	 * Currently we have a backend OpenGLSDLGraphicsManager, which inherits from both
-	 * OpenGLGraphicsManager and SdlGraphicsManager
-	 *
-	 * OpenGLSDLGraphicsManager "implements" saveScreenshot(const Common::String &filename) (can be overridden)
-	 * by calling the saveScreenshot(const Common::String &filename) of OpenGLGraphicsManager
-	 * and saveScreenshot() by calling saveScreenshot() of SdlGraphicsManager
-	 *
-	 * SdlGraphicsManager provides an implementation of saveScreenshot() (which can be overridden)
-	 * but a dummy implementation of saveScreenshot(const Common::String &filename)
-	 *
-	 * OpenGLGraphicsManager provides the implementation of saveScreenshot(const Common::String &filename)
-	 * but needs a (dummy) implementation of saveScreenshot() since OpenGLGraphicsManager inherits from GraphicsManager
-	 * This avoids the noisy warning (when building for OpenGL backend with no SDL support):
-	 * OpenGL::OpenGLGraphicsManager::saveScreenshot
-	 * hides overloaded virtual function
-	 * GraphicsManager::saveScreenshot
-	 *
-	*/
-	// TODO Maybe we should just unify these two method signatures in one
-	//      to avoid this mess
-	void saveScreenshot() override { return; }
-
 private:
 	//
 	// OpenGL utilities
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index bfc19f5e14..f2c3fd6363 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -362,10 +362,6 @@ bool OpenGLSdlGraphicsManager::saveScreenshot(const Common::String &filename) co
 	return OpenGLGraphicsManager::saveScreenshot(filename);
 }
 
-void OpenGLSdlGraphicsManager::saveScreenshot() {
-	SdlGraphicsManager::saveScreenshot();
-}
-
 bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 	// In case we request a fullscreen mode we will use the mode the user
 	// has chosen last time or the biggest mode available.
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.h b/backends/graphics/openglsdl/openglsdl-graphics.h
index d83aec621a..3f75fa7923 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.h
+++ b/backends/graphics/openglsdl/openglsdl-graphics.h
@@ -59,7 +59,6 @@ protected:
 	virtual void handleResizeImpl(const int width, const int height, const int xdpi, const int ydpi) override;
 
 	virtual bool saveScreenshot(const Common::String &filename) const override;
-	void saveScreenshot() override;
 
 	virtual int getGraphicsModeScale(int mode) const override { return 1; }
 


Commit: b6186ccdd6e15153e82431ee5c2171555dfbb599
    https://github.com/scummvm/scummvm/commit/b6186ccdd6e15153e82431ee5c2171555dfbb599
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-04-07T00:09:50+01:00

Commit Message:
OPENGL: Fix hidden overladed virtual saveScreenshot() warning

This noisy warning at least occur when building for Android
(OpenGL, but not SDL).

Changed paths:
    backends/graphics/opengl/opengl-graphics.h


diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
index 772ecd101a..37722737c9 100644
--- a/backends/graphics/opengl/opengl-graphics.h
+++ b/backends/graphics/opengl/opengl-graphics.h
@@ -265,6 +265,9 @@ protected:
 	 */
 	bool saveScreenshot(const Common::String &filename) const;
 
+	// Do not hide the argument-less saveScreenshot from the base class
+	using WindowedGraphicsManager::saveScreenshot;
+
 private:
 	//
 	// OpenGL utilities