no more useless singleton class

[chaz/yoink] / src / Moof / Settings.hh

diff --git a/src/Moof/Settings.hh b/src/Moof/Settings.hh
index 9c29007613f90d6b35a7c8500208581dae05a5a5..faad547c86f20820e91cbe80a1b5a88b87d32d49 100644 (file)
--- a/src/Moof/Settings.hh
+++ b/src/Moof/Settings.hh
@@ -37,19 +37,21 @@
 #include <map>
 #include <string>
 
 #include <map>
 #include <string>
 

-#include <Moof/Singleton.hh>

 #include <Moof/Serializable.hh>
 
 
 namespace Mf {
 
 
 #include <Moof/Serializable.hh>
 
 
 namespace Mf {
 
 

-class Settings : public Singleton<Settings>
+class Settings

 {
 public:
        Settings() {}
        Settings(int argc, char* argv[]);
 
 {
 public:
        Settings() {}
        Settings(int argc, char* argv[]);
 

+       // get global instance
+       static Settings& getInstance();
+

        void parseArgs(int argc, char* argv[]);
 
        void loadFromFile(const std::string& filePath, bool precedence = false);
        void parseArgs(int argc, char* argv[]);
 
        void loadFromFile(const std::string& filePath, bool precedence = false);