From 32c400b49b79aaebf2bd9b305a67e74ac115b5a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sat, 5 Jul 2008 15:53:18 +0200 Subject: [PATCH] don't use an instance --- GlobalSettings.cpp | 19 +------------------ GlobalSettings.h | 13 +++---------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/GlobalSettings.cpp b/GlobalSettings.cpp index ba44fbc..214d90e 100644 --- a/GlobalSettings.cpp +++ b/GlobalSettings.cpp @@ -4,28 +4,11 @@ #include "GlobalSettings.h" -GlobalSettings::GlobalSettings() { - verbose = false; -} - -GlobalSettings::~GlobalSettings() { -} - -GlobalSettings* GlobalSettings::instance = 0; - -GlobalSettings* GlobalSettings::getInstance() { - if (instance) { - return instance; - } - instance = new GlobalSettings(); - return instance; -} - bool GlobalSettings::isVerbose() { return verbose; } void GlobalSettings::setVerbose(bool verbose) { - this->verbose = verbose; + GlobalSettings::verbose = verbose; } diff --git a/GlobalSettings.h b/GlobalSettings.h index 8eaa1cd..b34052a 100644 --- a/GlobalSettings.h +++ b/GlobalSettings.h @@ -6,19 +6,12 @@ class GlobalSettings { -private: - GlobalSettings(); - ~GlobalSettings(); - public: - static GlobalSettings* getInstance(); - - bool isVerbose(); - void setVerbose(bool verbose); + static bool isVerbose(); + static void setVerbose(bool verbose); private: - static GlobalSettings* instance; - bool verbose; + static bool verbose; }; -- 2.7.4