diff options
| author | Eugene Sandulenko | 2017-07-10 21:17:41 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-07-10 21:17:41 +0200 |
| commit | 940b2a20f1cd490afb6e541a3cd26f0d3bdd1687 (patch) | |
| tree | ed080d2edfcc191e2edd4ad61cb8e778e660d422 /gui | |
| parent | c61c0cb0ff6edb53d2ff32efa559e76dd4d086ec (diff) | |
| download | scummvm-rg350-940b2a20f1cd490afb6e541a3cd26f0d3bdd1687.tar.gz scummvm-rg350-940b2a20f1cd490afb6e541a3cd26f0d3bdd1687.tar.bz2 scummvm-rg350-940b2a20f1cd490afb6e541a3cd26f0d3bdd1687.zip | |
Revert "COMMON: Change way the Singleton instances are instantiated"
This reverts commit eefa72afa1978a9dea10f5b1833fcc8f58a3468e.
With this patch ConfigManager is broken.
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/EventRecorder.cpp | 4 | ||||
| -rw-r--r-- | gui/gui-manager.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gui/EventRecorder.cpp b/gui/EventRecorder.cpp index ccf051f6d8..3f91cfa259 100644 --- a/gui/EventRecorder.cpp +++ b/gui/EventRecorder.cpp @@ -25,6 +25,10 @@ #ifdef ENABLE_EVENTRECORDER +namespace Common { +DECLARE_SINGLETON(GUI::EventRecorder); +} + #include "common/debug-channels.h" #include "backends/timer/sdl/sdl-timer.h" #include "backends/mixer/sdl/sdl-mixer.h" diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp index 12a0320a8c..76f557711d 100644 --- a/gui/gui-manager.cpp +++ b/gui/gui-manager.cpp @@ -41,6 +41,10 @@ #include "graphics/cursorman.h" +namespace Common { +DECLARE_SINGLETON(GUI::GuiManager); +} + namespace GUI { enum { |