From ea6d38d5f3b123b765e5bf8e2dc4f957e4b43eb6 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 24 Oct 2013 00:06:32 +0200
Subject: SDL: Make activateManager/deactivateManager SdlGraphicsManager
 specific.

We can do this now that we can use virtual inheritance and dynamic_cast
because we enabled RTTI.
---
 backends/graphics/graphics.h                        | 21 ---------------------
 backends/graphics/openglsdl/openglsdl-graphics.cpp  |  4 ++--
 backends/graphics/sdl/sdl-graphics.h                | 13 +++++++++++++
 .../graphics/surfacesdl/surfacesdl-graphics.cpp     |  4 ++--
 4 files changed, 17 insertions(+), 25 deletions(-)

(limited to 'backends/graphics')

diff --git a/backends/graphics/graphics.h b/backends/graphics/graphics.h
index 74258b8910..24397228e6 100644
--- a/backends/graphics/graphics.h
+++ b/backends/graphics/graphics.h
@@ -37,27 +37,6 @@ class GraphicsManager : public PaletteManager {
 public:
 	virtual ~GraphicsManager() {}
 
-	/**
-	 * Makes this graphics manager active. That means it should be ready to
-	 * process inputs now. However, even without being active it should be
-	 * able to query the supported modes and other bits.
-	 *
-	 * HACK: Actually this is specific to SdlGraphicsManager subclasses.
-	 * But sadly we cannot cast from GraphicsManager to SdlGraphicsManager
-	 * because there is no relation between these two.
-	 */
-	virtual void activateManager() {}
-
-	/**
-	 * Makes this graphics manager inactive. This should allow another
-	 * graphics manager to become active again.
-	 *
-	 * HACK: Actually this is specific to SdlGraphicsManager subclasses.
-	 * But sadly we cannot cast from GraphicsManager to SdlGraphicsManager
-	 * because there is no relation between these two.
-	 */
-	virtual void deactivateManager() {}
-
 	virtual bool hasFeature(OSystem::Feature f) = 0;
 	virtual void setFeatureState(OSystem::Feature f, bool enable) = 0;
 	virtual bool getFeatureState(OSystem::Feature f) = 0;
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index e39cd35870..f76d7b2ec0 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -73,7 +73,7 @@ OpenGLSdlGraphicsManager::~OpenGLSdlGraphicsManager() {
 }
 
 void OpenGLSdlGraphicsManager::activateManager() {
-	OpenGLGraphicsManager::activateManager();
+	SdlGraphicsManager::activateManager();
 	initEventSource();
 
 	// Register the graphics manager as a event observer
@@ -87,7 +87,7 @@ void OpenGLSdlGraphicsManager::deactivateManager() {
 	}
 
 	deinitEventSource();
-	OpenGLGraphicsManager::deactivateManager();
+	SdlGraphicsManager::deactivateManager();
 }
 
 bool OpenGLSdlGraphicsManager::hasFeature(OSystem::Feature f) {
diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h
index ebf8078f23..fea743b3ca 100644
--- a/backends/graphics/sdl/sdl-graphics.h
+++ b/backends/graphics/sdl/sdl-graphics.h
@@ -39,6 +39,19 @@ public:
 	SdlGraphicsManager(SdlEventSource *source);
 	virtual ~SdlGraphicsManager();
 
+	/**
+	 * Makes this graphics manager active. That means it should be ready to
+	 * process inputs now. However, even without being active it should be
+	 * able to query the supported modes and other bits.
+	 */
+	virtual void activateManager() {}
+
+	/**
+	 * Makes this graphics manager inactive. This should allow another
+	 * graphics manager to become active again.
+	 */
+	virtual void deactivateManager() {}
+
 	/**
 	 * Notify the graphics manager that the graphics needs to be redrawn, since
 	 * the application window was modified.
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index c946b8e747..15193e2da4 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -198,7 +198,7 @@ SurfaceSdlGraphicsManager::~SurfaceSdlGraphicsManager() {
 }
 
 void SurfaceSdlGraphicsManager::activateManager() {
-	GraphicsManager::activateManager();
+	SdlGraphicsManager::activateManager();
 	initEventSource();
 
 	// Register the graphics manager as a event observer
@@ -212,7 +212,7 @@ void SurfaceSdlGraphicsManager::deactivateManager() {
 	}
 
 	deinitEventSource();
-	GraphicsManager::deactivateManager();
+	SdlGraphicsManager::deactivateManager();
 }
 
 bool SurfaceSdlGraphicsManager::hasFeature(OSystem::Feature f) {
-- 
cgit v1.2.3