diff options
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/modular-backend.cpp | 26 | ||||
| -rw-r--r-- | backends/modular-backend.h | 8 | 
2 files changed, 2 insertions, 32 deletions
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);  } diff --git a/backends/modular-backend.h b/backends/modular-backend.h index 42bd0ed73a..d2c3ce2067 100644 --- a/backends/modular-backend.h +++ b/backends/modular-backend.h @@ -24,8 +24,6 @@  #define BACKENDS_MODULAR_BACKEND_H  #include "common/system.h" -#include "common/timer.h" -#include "common/savefile.h"  class GraphicsManager;  class MutexManager; @@ -110,7 +108,6 @@ public:  	/** @name Events and Time */  	//@{ -	virtual Common::TimerManager *getTimerManager();  	virtual Common::HardwareKeySet *getHardwareKeySet() { return 0; }  	//@} @@ -135,8 +132,6 @@ public:  	/** @name Miscellaneous */  	//@{ -	virtual Common::SaveFileManager *getSavefileManager(); -	virtual FilesystemFactory *getFilesystemFactory();  	virtual void quit();  	virtual void displayMessageOnOSD(const char *msg); @@ -146,9 +141,6 @@ protected:  	/** @name Managers variables */  	//@{ -	FilesystemFactory *_fsFactory; -	Common::SaveFileManager *_savefileManager; -	Common::TimerManager *_timerManager;  	MutexManager *_mutexManager;  	GraphicsManager *_graphicsManager;  	Audio::Mixer *_mixer;  | 
