X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSettings.hh;fp=src%2FMoof%2FSettings.hh;h=42e7d3a7a5f26e159237a3b37682efb2a4a9f015;hp=dc29deb3ad260e772348bd8c40abe7e080a271c4;hb=a31d65a998121df0651c57bfb68782e2a07d2e2f;hpb=31d52677b38d935297d132bdbd956c655cd3feee diff --git a/src/Moof/Settings.hh b/src/Moof/Settings.hh index dc29deb..42e7d3a 100644 --- a/src/Moof/Settings.hh +++ b/src/Moof/Settings.hh @@ -49,11 +49,12 @@ namespace Mf { class Settings { public: + Settings() : - globals_(script_.getGlobalTable()), - top_(script_[-1]) + mGlobals(mScript.getGlobalTable()), + mTop(mScript[-1]) { - importLogScript(script_); + importLogScript(mScript); } // get global instance @@ -68,8 +69,9 @@ public: bool get(const std::string& key, T& value); private: - Script script_; - Script::Value globals_, top_; + + Script mScript; + Script::Value mGlobals, mTop; }; @@ -79,24 +81,24 @@ bool Settings::get(const std::string& key, T& value) std::vector fields; boost::split(fields, key, boost::is_any_of(".")); - globals_.pushCopy(); + mGlobals.pushCopy(); std::vector::iterator it; for (it = fields.begin(); it != fields.end(); ++it) { - if (top_.isTable()) + if (mTop.isTable()) { - top_.pushField(*it); + mTop.pushField(*it); } else { - script_.clear(); + mScript.clear(); return false; } } - bool got = top_.get(value); - script_.clear(); + bool got = mTop.get(value); + mScript.clear(); return got; }