From: David ‘Bombe’ Roden Date: Sat, 5 Jul 2008 13:53:18 +0000 (+0200) Subject: don't use an instance X-Git-Tag: 0.1~45 X-Git-Url: https://git.pterodactylus.net/?p=ecparse.git;a=commitdiff_plain;h=32c400b49b79aaebf2bd9b305a67e74ac115b5a0 don't use an instance --- 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; };