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

diff --git a/src/Moof/Settings.hh b/src/Moof/Settings.hh
index d31b57d..192e2a7 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_
@@ -50,43 +33,43 @@ class Settings
 {
 public:
 
-	Settings()
+	Settings(int argc, char* argv[], const std::string& path)
 	{
 		mScript.importBaseLibrary();
 		importLogFunctions(mScript);
+
+		parseArgs(argc, argv);
+		loadFromFiles(path);
 	}
 
 	~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);
+	template <class T>
+	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)
+template <class T>
+bool Settings::get(const std::string& key, T& value) const
 {
 	Script::Slot top = mScript[-1];
-	Script::Slot globals = mScript.getGlobalTable();
+	Script::Slot globals = mScript.globals();
 
 	std::vector<std::string> fields;
 	boost::split(fields, key, boost::is_any_of("."));
@@ -102,13 +85,13 @@ bool Settings::get(const std::string& key, T& value)
 		}
 		else
 		{
-			mScript.clear();
+			mScript.clearStack();
 			return false;
 		}
 	}
 
 	bool got = top.get(value);
-	mScript.clear();
+	mScript.clearStack();
 	return got;
 }
 
@@ -117,5 +100,3 @@ bool Settings::get(const std::string& key, T& value)
 
 #endif // _MOOF_SETTINGS_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-