From 04afdf7c7d2c70e4c31b65741d22545a8979367e Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 6 Jun 2011 23:25:37 +0200
Subject: BACKENDS: Move more 'manager slots' from ModularBackend to OSystem

---
 backends/modular-backend.cpp | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

(limited to 'backends/modular-backend.cpp')

diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp
index bbf6a6c1ed..e36348abd5 100644
--- a/backends/modular-backend.cpp
+++ b/backends/modular-backend.cpp
@@ -30,14 +30,13 @@
 
 #include "audio/mixer.h"
 #include "common/events.h"
+#include "common/timer.h"
+#include "common/savefile.h"
 #include "gui/message.h"
 #include "graphics/pixelformat.h"
 
 ModularBackend::ModularBackend()
 	:
-	_fsFactory(0),
-	_savefileManager(0),
-	_timerManager(0),
 	_mutexManager(0),
 	_graphicsManager(0),
 	_mixer(0) {
@@ -45,16 +44,10 @@ ModularBackend::ModularBackend()
 }
 
 ModularBackend::~ModularBackend() {
-	delete _fsFactory;
-	_fsFactory = 0;
 	delete _graphicsManager;
 	_graphicsManager = 0;
 	delete _mixer;
 	_mixer = 0;
-	delete _savefileManager;
-	_savefileManager = 0;
-	delete _timerManager;
-	_timerManager = 0;
 	delete _mutexManager;
 	_mutexManager = 0;
 }
@@ -215,11 +208,6 @@ void ModularBackend::setCursorPalette(const byte *colors, uint start, uint num)
 	_graphicsManager->setCursorPalette(colors, start, num);
 }
 
-Common::TimerManager *ModularBackend::getTimerManager() {
-	assert(_timerManager);
-	return _timerManager;
-}
-
 OSystem::MutexRef ModularBackend::createMutex() {
 	assert(_mutexManager);
 	return _mutexManager->createMutex();
@@ -249,16 +237,6 @@ void ModularBackend::displayMessageOnOSD(const char *msg) {
 	_graphicsManager->displayMessageOnOSD(msg);
 }
 
-Common::SaveFileManager *ModularBackend::getSavefileManager() {
-	assert(_savefileManager);
-	return _savefileManager;
-}
-
-FilesystemFactory *ModularBackend::getFilesystemFactory() {
-	assert(_fsFactory);
-	return _fsFactory;
-}
-
 void ModularBackend::quit() {
 	exit(0);
 }
-- 
cgit v1.2.3