cade lab fixes

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

diff --git a/src/Moof/Settings.hh b/src/Moof/Settings.hh
index d31b57dcf763c2fe0d38b1f3f96cc1fa24583223..d4cbb9fa0cd47e0a06a0f21a4ea5a3923f6a5d7d 100644 (file)
--- a/src/Moof/Settings.hh
+++ b/src/Moof/Settings.hh
@@ -58,32 +58,29 @@ public:
 
        ~Settings();
 
-       // get global instance
-       static Settings& getInstance();
-
        void parseArgs(int argc, char* argv[]);
 
-       void loadFromFile(const std::string& filePath);
-       void loadFromFiles(const std::vector<std::string>& filePaths);
+       void loadFromFiles(const std::string& path);
+       void loadFromFiles(const std::vector<std::string>& path);
 
        void clear();           // remove all settings
 
-       void saveAs(const std::string& filePath);
+       void saveAs(const std::string& path);
        void save() const;
 
        template <typename T>
-       bool get(const std::string& key, T& value);
+       bool get(const std::string& key, T& value) const;
 
 private:
 
-       Script                  mScript;
+       mutable Script  mScript;
 
        std::string             mUserFile;
 };
 
 
 template <typename T>
-bool Settings::get(const std::string& key, T& value)
+bool Settings::get(const std::string& key, T& value) const
 {
        Script::Slot top = mScript[-1];
        Script::Slot globals = mScript.getGlobalTable();
@@ -113,6 +110,9 @@ bool Settings::get(const std::string& key, T& value)
 }
 
 
+extern Settings settings;
+
+
 } // namepsace Mf
 
 #endif // _MOOF_SETTINGS_HH_