[Scummvm-git-logs] scummvm master -> 780c4568c18b8aca22f3959d999f6696049bb210

[orgads]

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:
780c4568c1 GUI: Fix compiler warning


Commit: 780c4568c18b8aca22f3959d999f6696049bb210
    https://github.com/scummvm/scummvm/commit/780c4568c18b8aca22f3959d999f6696049bb210
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-06-24T11:34:45+03:00

Commit Message:
GUI: Fix compiler warning

../scummvm/gui/options.cpp: In member function 'virtual void GUI::OptionsDialog::apply()':
../scummvm/gui/options.cpp:647:82: warning: comparison of integer expressions of different signedness: 'uint' {aka 'unsigned int'} and 'int' [-Wsign-compare]
  647 |     else if (scalerPlugins[defaultScaler]->get<ScalerPluginObject>().getFactor() != g_system->getDefaultScaleFactor())
      |              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Changed paths:
    backends/graphics/graphics.h
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp
    backends/graphics/surfacesdl/surfacesdl-graphics.h
    backends/modular-backend.cpp
    backends/modular-backend.h
    common/system.h


diff --git a/backends/graphics/graphics.h b/backends/graphics/graphics.h
index f6f297571c..3b56f5138d 100644
--- a/backends/graphics/graphics.h
+++ b/backends/graphics/graphics.h
@@ -64,7 +64,7 @@ public:
 	virtual bool setStretchMode(int mode) { return false; }
 	virtual int getStretchMode() const { return 0; }
 	virtual uint getDefaultScaler() const { return 0; }
-	virtual int getDefaultScaleFactor() const { return 1; }
+	virtual uint getDefaultScaleFactor() const { return 1; }
 	virtual bool setScaler(uint mode, int factor) { return false; }
 	virtual uint getScaler() const { return 0; }
 
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index e491164ceb..66d5a958ac 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -557,7 +557,7 @@ uint SurfaceSdlGraphicsManager::getDefaultScaler() const {
 	return ScalerMan.findScalerPluginIndex("normal");
 }
 
-int SurfaceSdlGraphicsManager::getDefaultScaleFactor() const {
+uint SurfaceSdlGraphicsManager::getDefaultScaleFactor() const {
 #ifdef USE_SCALERS
 	return 2;
 #else
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.h b/backends/graphics/surfacesdl/surfacesdl-graphics.h
index 061a87f331..34310369ab 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.h
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.h
@@ -74,7 +74,7 @@ public:
 	virtual bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;
 	virtual int getGraphicsMode() const override;
 	virtual uint getDefaultScaler() const override;
-	virtual int getDefaultScaleFactor() const override;
+	virtual uint getDefaultScaleFactor() const override;
 	virtual bool setScaler(uint mode, int factor) override;
 	virtual uint getScaler() const override;
 #ifdef USE_RGB_COLOR
diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp
index e0ac0ffe04..21992de2d0 100644
--- a/backends/modular-backend.cpp
+++ b/backends/modular-backend.cpp
@@ -112,7 +112,7 @@ uint ModularGraphicsBackend::getDefaultScaler() const {
 	return _graphicsManager->getDefaultScaler();
 }
 
-int ModularGraphicsBackend::getDefaultScaleFactor() const {
+uint ModularGraphicsBackend::getDefaultScaleFactor() const {
 	return _graphicsManager->getDefaultScaleFactor();
 }
 
diff --git a/backends/modular-backend.h b/backends/modular-backend.h
index db22cfe29a..ca4a8309ff 100644
--- a/backends/modular-backend.h
+++ b/backends/modular-backend.h
@@ -77,7 +77,7 @@ public:
 	virtual bool setStretchMode(int mode) override final;
 	virtual int getStretchMode() const override final;
 	virtual uint getDefaultScaler() const override final;
-	virtual int getDefaultScaleFactor() const override final;
+	virtual uint getDefaultScaleFactor() const override final;
 	virtual bool setScaler(uint mode, int factor) override final;
 	virtual uint getScaler() const override final;
 #ifdef USE_RGB_COLOR
diff --git a/common/system.h b/common/system.h
index 99445b1dc6..d1afdd888d 100644
--- a/common/system.h
+++ b/common/system.h
@@ -886,7 +886,7 @@ public:
 	 *
 	 * @return The 'default' scale factor.
 	 */
-	virtual int getDefaultScaleFactor() const { return 1; }
+	virtual uint getDefaultScaleFactor() const { return 1; }
 
 	/**
 	 * Switch to the specified scaler.