diff options
| author | CeRiAl | 2011-07-07 02:47:46 +0200 |
|---|---|---|
| committer | CeRiAl | 2011-07-19 21:35:37 +0200 |
| commit | f60d6f7a9776253ad4716eb8a72fba18c91a7588 (patch) | |
| tree | e99be3fb64f837609e13d9219ead8ab69c291226 /backends | |
| parent | 828f1884b463c49eb39b7f63def0e4bda15d11c6 (diff) | |
| download | scummvm-rg350-f60d6f7a9776253ad4716eb8a72fba18c91a7588.tar.gz scummvm-rg350-f60d6f7a9776253ad4716eb8a72fba18c91a7588.tar.bz2 scummvm-rg350-f60d6f7a9776253ad4716eb8a72fba18c91a7588.zip | |
MACOSX/UPDATES: Streamline UpdateManager
Moved UpdateManager related code from backends/modular-backend.* to
common/system.*. Added switch --enable/disable-updates to be able
to disable updates support generally.
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/modular-backend.cpp | 6 | ||||
| -rw-r--r-- | backends/modular-backend.h | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp index db9d816cba..525170d685 100644 --- a/backends/modular-backend.cpp +++ b/backends/modular-backend.cpp @@ -26,7 +26,6 @@ #include "backends/graphics/graphics.h" #include "backends/mutex/mutex.h" -#include "common/updates.h" #include "audio/mixer.h" #include "graphics/pixelformat.h" @@ -35,8 +34,7 @@ ModularBackend::ModularBackend() : _mutexManager(0), _graphicsManager(0), - _mixer(0), - _updateManager(0) { + _mixer(0) { } @@ -45,8 +43,6 @@ ModularBackend::~ModularBackend() { _graphicsManager = 0; delete _mixer; _mixer = 0; - delete _updateManager; - _updateManager = 0; delete _mutexManager; _mutexManager = 0; } diff --git a/backends/modular-backend.h b/backends/modular-backend.h index be1d328c1f..b864da0df5 100644 --- a/backends/modular-backend.h +++ b/backends/modular-backend.h @@ -24,7 +24,6 @@ #define BACKENDS_MODULAR_BACKEND_H #include "backends/base-backend.h" -#include "common/updates.h" class GraphicsManager; class MutexManager; @@ -142,10 +141,9 @@ protected: /** @name Managers variables */ //@{ - MutexManager *_mutexManager; - GraphicsManager *_graphicsManager; - Audio::Mixer *_mixer; - Common::UpdateManager *_updateManager; + MutexManager *_mutexManager; + GraphicsManager *_graphicsManager; + Audio::Mixer *_mixer; //@} }; |