X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSettings.hh;h=f7503dd7b8d1f34806b5ccce86a185ababdb3065;hp=d31b57dcf763c2fe0d38b1f3f96cc1fa24583223;hb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827;hpb=b357615aba1dbde81e3c6999366604e6001010a7

diff --git a/src/Moof/Settings.hh b/src/Moof/Settings.hh
index d31b57d..f7503dd 100644
--- a/src/Moof/Settings.hh
+++ b/src/Moof/Settings.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_SETTINGS_HH_
 #define _MOOF_SETTINGS_HH_
@@ -58,32 +41,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,9 +93,10 @@ bool Settings::get(const std::string& key, T& value)
 }
 
 
+extern Settings settings;
+
+
 } // namepsace Mf
 
 #endif // _MOOF_SETTINGS_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-