delete *i;
}
+void Collection::add_var(const string &name, const CollectionItemTypeBase *type, const Variant &var)
+{
+ insert_unique(items, name, var);
+ if(type)
+ type->notify_item(*this, name, var);
+}
+
const Variant &Collection::get_var(const string &name, const CollectionItemTypeBase *type)
+{
+ const Variant *var = find_var(name, type);
+ if(var)
+ return *var;
+
+ throw key_error(name);
+}
+
+const Variant *Collection::find_var(const string &name, const CollectionItemTypeBase *type)
{
ItemMap::iterator i = items.find(name);
if(i!=items.end())
- return i->second;
+ return &i->second;
if(type)
{
if(!loaded && fallback)
if(CollectionItemTypeBase *fb_type = fallback->get_type(*type))
if(fallback->get_status(name, *fb_type))
- return fallback->get_var(name, fb_type);
+ return fallback->find_var(name, fb_type);
}
- return get_item(items, name);
+ i = items.find(name);
+ return (i!=items.end() ? &i->second : 0);
}
-void Collection::gather_items(list<const Variant *> *vars, list<string> *names, const CollectionItemTypeBase &type, bool include_sources) const
+void Collection::gather_items(vector<const Variant *> *vars, list<string> *names, const CollectionItemTypeBase &type, bool include_sources) const
{
for(ItemMap::const_iterator i=items.begin(); i!=items.end(); ++i)
if(type.check_item_type(i->second))
return 0;
}
-void Collection::add_source(CollectionSource &s)
+void Collection::add_source(const CollectionSource &s)
{
sources.push_back(&s);
}