From 940b2a20f1cd490afb6e541a3cd26f0d3bdd1687 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 10 Jul 2017 21:17:41 +0200 Subject: Revert "COMMON: Change way the Singleton instances are instantiated" This reverts commit eefa72afa1978a9dea10f5b1833fcc8f58a3468e. With this patch ConfigManager is broken. --- gui/EventRecorder.cpp | 4 ++++ gui/gui-manager.cpp | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'gui') 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 { -- cgit v1.2.3