diff options
Diffstat (limited to 'project2/common/environment.cpp')
| -rw-r--r-- | project2/common/environment.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/project2/common/environment.cpp b/project2/common/environment.cpp index 7d24c5c..71327f8 100644 --- a/project2/common/environment.cpp +++ b/project2/common/environment.cpp @@ -40,7 +40,7 @@ Environment::Environment() { currentEnv = this; typedef std::map<std::string, boost::shared_ptr<OptionsSourceLoader> > ConfigParsersMap; - BOOST_FOREACH(const ConfigParsersMap::value_type & cp, *LoaderBase::objLoaders<OptionsSourceLoader>()) { + BOOST_FOREACH(const ConfigParsersMap::value_type & cp, *Plugable::objLoaders<OptionsSourceLoader>()) { configs.push_back(cp.second->create()); } } @@ -50,11 +50,11 @@ typedef std::vector<const Options *> AllOptions; class DefaultConfigConsumer : public ConfigConsumer { public: void operator()(const Glib::ustring & n, const Glib::ustring & p, const Glib::ustring & v) const { - LoaderBase::onAll<Options>(boost::bind(&Options::consume, _1, n, p, v)); + Plugable::onAll<Options>(boost::bind(&Options::consume, _1, n, p, v)); } const Options::Option * get(const Glib::ustring & n) const { const Options::Option * rtn = NULL; - LoaderBase::onAll<Options>([n,&rtn](const Options * os) { + Plugable::onAll<Options>([n,&rtn](const Options * os) { const Options::Option * o = os->find(n); if (o) { rtn = o; @@ -70,12 +70,12 @@ Environment::init() if (std::find_if(configs.begin(), configs.end(), boost::bind(&OptionsSource::needReload, _1)) != configs.end()) { DefaultConfigConsumer dcc; - LoaderBase::onAll<Options>(boost::bind(&Options::reset, _1)); + Plugable::onAll<Options>(boost::bind(&Options::reset, _1)); BOOST_FOREACH(const ConfigsMap::value_type & c, configs) { c->loadInto(dcc); } - LoaderBase::onAllComponents(boost::bind(&ComponentLoader::onConfigLoad, _1)); + Plugable::onAllComponents(boost::bind(&ComponentLoader::onConfigLoad, _1)); Logger()->clear(); if (clLevel >= 0) { @@ -111,7 +111,7 @@ Environment::resolveScript(const std::string & group, const std::string & name, return i->second; } else { - BOOST_FOREACH(const ReaderLoaders::value_type & rl, *LoaderBase::objLoaders<ScriptReaderLoader>()) { + BOOST_FOREACH(const ReaderLoaders::value_type & rl, *Plugable::objLoaders<ScriptReaderLoader>()) { ScriptReaderPtr rs = rl.second->resolveScript(group, e.string()); if (rs) { return (scriptCache[sk] = rs); |