[Scummvm-git-logs] scummvm master -> 981b771e38daceb390f759852cb5294d116d8a7b

bluegr bluegr at gmail.com
Mon Mar 9 20:14:42 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:
981b771e38 BACKENDS: Remove unused feature kFeatureDisableKeyFiltering


Commit: 981b771e38daceb390f759852cb5294d116d8a7b
    https://github.com/scummvm/scummvm/commit/981b771e38daceb390f759852cb5294d116d8a7b
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-03-09T22:14:38+02:00

Commit Message:
BACKENDS: Remove unused feature kFeatureDisableKeyFiltering

Changed paths:
    backends/graphics/symbiansdl/symbiansdl-graphics.cpp
    backends/graphics/symbiansdl/symbiansdl-graphics.h
    common/system.h


diff --git a/backends/graphics/symbiansdl/symbiansdl-graphics.cpp b/backends/graphics/symbiansdl/symbiansdl-graphics.cpp
index ca79a619f6..ceb0719ddd 100644
--- a/backends/graphics/symbiansdl/symbiansdl-graphics.cpp
+++ b/backends/graphics/symbiansdl/symbiansdl-graphics.cpp
@@ -25,7 +25,6 @@
 #ifdef __SYMBIAN32__
 
 #include "backends/graphics/symbiansdl/symbiansdl-graphics.h"
-#include "backends/platform/symbian/src/SymbianActions.h"
 
 SymbianSdlGraphicsManager::SymbianSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window)
 	: SurfaceSdlGraphicsManager(sdlEventSource, window) {
@@ -41,16 +40,4 @@ bool SymbianSdlGraphicsManager::hasFeature(OSystem::Feature f) const {
 	}
 }
 
-void SymbianSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
-	switch (f) {
-	case OSystem::kFeatureVirtualKeyboard:
-		break;
-	case OSystem::kFeatureDisableKeyFiltering:
-		GUI::Actions::Instance()->beginMapping(enable);
-		break;
-	default:
-		SurfaceSdlGraphicsManager::setFeatureState(f, enable);
-	}
-}
-
 #endif
diff --git a/backends/graphics/symbiansdl/symbiansdl-graphics.h b/backends/graphics/symbiansdl/symbiansdl-graphics.h
index 17e3a2facb..cf8a76f349 100644
--- a/backends/graphics/symbiansdl/symbiansdl-graphics.h
+++ b/backends/graphics/symbiansdl/symbiansdl-graphics.h
@@ -31,7 +31,6 @@ public:
 
 public:
 	virtual bool hasFeature(OSystem::Feature f) const override;
-	virtual void setFeatureState(OSystem::Feature f, bool enable) override;
 };
 
 #endif
diff --git a/common/system.h b/common/system.h
index 88937476a4..05db7e4e40 100644
--- a/common/system.h
+++ b/common/system.h
@@ -357,25 +357,6 @@ public:
 		 */
 		kFeatureIconifyWindow,
 
-		/**
-		 * Setting the state of this feature to true tells the backend to disable
-		 * all key filtering/mapping, in cases where it would be beneficial to do so.
-		 * As an example case, this is used in the AGI engine's predictive dialog.
-		 * When the dialog is displayed this feature is set so that backends with
-		 * phone-like keypad temporarily unmap all user actions which leads to
-		 * comfortable word entry. Conversely, when the dialog exits the feature
-		 * is set to false.
-		 *
-		 * TODO: The word 'beneficial' above is very unclear. Beneficial to
-		 * whom and for what??? Just giving an example is not enough.
-		 *
-		 * TODO: Fingolfin suggests that the way the feature is used can be
-		 * generalized in this sense: Have a keyboard mapping feature, which the
-		 * engine queries for to assign keys to actions ("Here's my default key
-		 * map for these actions, what do you want them set to?").
-		 */
-		kFeatureDisableKeyFiltering,
-
 		/**
 		 * The presence of this feature indicates whether the displayLogFile()
 		 * call is supported.




More information about the Scummvm-git-logs mailing list