Revert "COMMON: Change way the Singleton instances are instantiated"

This reverts commit eefa72afa1978a9dea10f5b1833fcc8f58a3468e.

With this patch ConfigManager is broken.

4 files changed, 16 insertions, 0 deletions

diff --git a/graphics/cursorman.cpp b/graphics/cursorman.cpp
index 53e13da9a1..5fcd2a3602 100644
--- a/graphics/cursorman.cpp
+++ b/graphics/cursorman.cpp
@@ -25,6 +25,10 @@
 #include "common/system.h"
 #include "common/stack.h"
 
+namespace Common {
+DECLARE_SINGLETON(Graphics::CursorManager);
+}
+
 namespace Graphics {
 
 CursorManager::~CursorManager() {
diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp
index bb3ee03330..5cf52416cf 100644
--- a/graphics/fontman.cpp
+++ b/graphics/fontman.cpp
@@ -26,6 +26,10 @@
 
 #include "common/translation.h"
 
+namespace Common {
+DECLARE_SINGLETON(Graphics::FontManager);
+}
+
 namespace Graphics {
 
 FORWARD_DECLARE_FONT(g_sysfont);
diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
index cb9520bb86..76b7f731be 100644
--- a/graphics/fonts/ttf.cpp
+++ b/graphics/fonts/ttf.cpp
@@ -668,5 +668,9 @@ Font *loadTTFFont(Common::SeekableReadStream &stream, int size, TTFSizeMode size
 
 } // End of namespace Graphics
 
+namespace Common {
+DECLARE_SINGLETON(Graphics::TTFLibrary);
+} // End of namespace Common
+
 #endif
 
diff --git a/graphics/yuv_to_rgb.cpp b/graphics/yuv_to_rgb.cpp
index 99cd208ec0..2a485fa664 100644
--- a/graphics/yuv_to_rgb.cpp
+++ b/graphics/yuv_to_rgb.cpp
@@ -86,6 +86,10 @@
 #include "graphics/surface.h"
 #include "graphics/yuv_to_rgb.h"
 
+namespace Common {
+DECLARE_SINGLETON(Graphics::YUVToRGBManager);
+}
+
 namespace Graphics {
 
 class YUVToRGBLookup {