script API improvements

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

diff --git a/src/Moof/Settings.hh b/src/Moof/Settings.hh
index 42ef70ce54719d2431e0a9260899d63ecc658209..192e2a764254ba61a4b476a23c51c989422c1db8 100644 (file)
--- a/src/Moof/Settings.hh
+++ b/src/Moof/Settings.hh
@@ -54,7 +54,7 @@ public:
        void saveAs(const std::string& path);
        void save() const;
 
-       template <typename T>
+       template <class T>
        bool get(const std::string& key, T& value) const;
 
 private:
@@ -65,11 +65,11 @@ private:
 };
 
 
-template <typename T>
+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("."));
@@ -85,13 +85,13 @@ bool Settings::get(const std::string& key, T& value) const
                }
                else
                {
-                       mScript.clear();
+                       mScript.clearStack();
                        return false;
                }
        }
 
        bool got = top.get(value);
-       mScript.clear();
+       mScript.clearStack();
        return got;
 }