aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorJohannes Schickel2007-05-22 14:17:44 +0000
committerJohannes Schickel2007-05-22 14:17:44 +0000
commit8ff17142c5f47dacaa6ae247b92e6d6b5a16d8ac (patch)
treebbf31da0b37041247662d2cba2d4c9fc00e3fce4 /graphics
parenta178c25ea2b35d226350ab2aee23c61290281124 (diff)
downloadscummvm-rg350-8ff17142c5f47dacaa6ae247b92e6d6b5a16d8ac.tar.gz
scummvm-rg350-8ff17142c5f47dacaa6ae247b92e6d6b5a16d8ac.tar.bz2
scummvm-rg350-8ff17142c5f47dacaa6ae247b92e6d6b5a16d8ac.zip
Simpilified Singleton implementation and usage.
svn-id: r26922
Diffstat (limited to 'graphics')
-rw-r--r--graphics/cursorman.cpp2
-rw-r--r--graphics/fontman.cpp2
-rw-r--r--graphics/imageman.cpp3
3 files changed, 1 insertions, 6 deletions
diff --git a/graphics/cursorman.cpp b/graphics/cursorman.cpp
index 06364b860a..397d74789f 100644
--- a/graphics/cursorman.cpp
+++ b/graphics/cursorman.cpp
@@ -24,8 +24,6 @@
#include "common/system.h"
#include "common/stack.h"
-DECLARE_SINGLETON(Graphics::CursorManager);
-
namespace Graphics {
static bool g_initialized = false;
diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp
index 9b567c0be8..fad8654d02 100644
--- a/graphics/fontman.cpp
+++ b/graphics/fontman.cpp
@@ -22,8 +22,6 @@
#include "graphics/fontman.h"
//#include "gui/consolefont.h"
-DECLARE_SINGLETON(Graphics::FontManager);
-
namespace Graphics {
#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
diff --git a/graphics/imageman.cpp b/graphics/imageman.cpp
index d4fc9da72d..98c5310ffb 100644
--- a/graphics/imageman.cpp
+++ b/graphics/imageman.cpp
@@ -23,14 +23,13 @@
#include "graphics/imageman.h"
#include "graphics/surface.h"
-DECLARE_SINGLETON(Graphics::ImageManager);
-
namespace Graphics {
ImageManager::ImageManager() : _surfaces()
#ifdef USE_ZLIB
, _archives()
#endif
{
+ debug("foo");
}
ImageManager::~ImageManager() {