destroyed global classes; view hierarchy instead

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

diff --git a/src/Moof/Settings.hh b/src/Moof/Settings.hh
index f7503dd7b8d1f34806b5ccce86a185ababdb3065..42ef70ce54719d2431e0a9260899d63ecc658209 100644 (file)
--- a/src/Moof/Settings.hh
+++ b/src/Moof/Settings.hh
@@ -33,10 +33,13 @@ class Settings
 {
 public:
 
-       Settings()
+       Settings(int argc, char* argv[], const std::string& path)
        {
                mScript.importBaseLibrary();
                importLogFunctions(mScript);
+
+               parseArgs(argc, argv);
+               loadFromFiles(path);
        }
 
        ~Settings();
@@ -93,9 +96,6 @@ bool Settings::get(const std::string& key, T& value) const
 }
 
 
-extern Settings settings;
-
-
 } // namepsace Mf
 
 #endif // _MOOF_SETTINGS_HH_