COMMON: Change TaskbarManager to the new module slot interface

2 files changed, 5 insertions, 26 deletions

diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp
index 4b306be228..525170d685 100644
--- a/backends/modular-backend.cpp
+++ b/backends/modular-backend.cpp
@@ -35,9 +35,7 @@ ModularBackend::ModularBackend()
 	_mutexManager(0),
 	_graphicsManager(0),
 	_mixer(0) {
-#if defined(USE_TASKBAR)
-	_taskbarManager = 0;
-#endif
+
 }
 
 ModularBackend::~ModularBackend() {
@@ -45,10 +43,6 @@ ModularBackend::~ModularBackend() {
 	_graphicsManager = 0;
 	delete _mixer;
 	_mixer = 0;
-#if defined(USE_TASKBAR)
-	delete _taskbarManager;
-	_taskbarManager = 0;
-#endif
 	delete _mutexManager;
 	_mutexManager = 0;
 }
@@ -241,11 +235,3 @@ void ModularBackend::displayMessageOnOSD(const char *msg) {
 void ModularBackend::quit() {
 	exit(0);
 }
-
-#if defined(USE_TASKBAR)
-Common::TaskbarManager *ModularBackend::getTaskbarManager() {
-	assert(_taskbarManager);
-	return _taskbarManager;
-}
-#endif
-
diff --git a/backends/modular-backend.h b/backends/modular-backend.h
index fab7fb6a4d..3593130bf5 100644
--- a/backends/modular-backend.h
+++ b/backends/modular-backend.h
@@ -27,21 +27,20 @@
 
 class GraphicsManager;
 class MutexManager;
-class TaskbarManager;
 
 /**
  * Base class for modular backends.
- *
+ * 
  * It wraps most functions to their manager equivalent, but not
  * all OSystem functions are implemented here.
- *
+ * 
  * A backend derivated from this class, will need to implement
  * these functions on its own:
  *   OSystem::pollEvent()
  *   OSystem::getMillis()
  *   OSystem::delayMillis()
  *   OSystem::getTimeAndDate()
- *
+ * 
  * And, it should also initialize all the managers variables
  * declared in this class, or override their related functions.
  */
@@ -112,7 +111,7 @@ public:
 	virtual Common::HardwareKeySet *getHardwareKeySet() { return 0; }
 
 	//@}
-
+	
 	/** @name Mutex handling */
 	//@{
 
@@ -134,9 +133,6 @@ public:
 	//@{
 
 	virtual void quit();
-#if defined(USE_TASKBAR)
-	virtual TaskbarManager *getTaskbarManager();
-#endif
 	virtual void displayMessageOnOSD(const char *msg);
 
 	//@}
@@ -145,9 +141,6 @@ protected:
 	/** @name Managers variables */
 	//@{
 
-#if defined(USE_TASKBAR)
-	TaskbarManager *_taskbarManager;
-#endif
 	MutexManager *_mutexManager;
 	GraphicsManager *_graphicsManager;
 	Audio::Mixer *_mixer;