poe(p)
{
add("abstract", &Filter::abstract);
+ add("cancel", &Loader::cancel);
add("hide", &Loader::hide);
add("include", &Loader::include);
add("show", &Loader::show);
void Filter::Loader::add_categories(const string &name, bool show)
{
- list<const Category *> categs;
+ vector<const Category *> categs;
if(name.find('*')!=string::npos)
{
poe.find_categories(glob_to_re(name), categs);
if(categs.empty())
throw key_error(name);
- categs.sort(&category_order);
+ sort(categs, &category_order);
}
else
categs.push_back(&poe.get_category(name));
- for(list<const Category *>::const_iterator i=categs.begin(); i!=categs.end(); ++i)
+ for(vector<const Category *>::const_iterator i=categs.begin(); i!=categs.end(); ++i)
{
bool found = false;
for(list<Block>::const_iterator j=obj.blocks.begin(); (!found && j!=obj.blocks.end()); ++j)
void Filter::Loader::cancel(const string &name)
{
- list<const Category *> categs;
+ vector<const Category *> categs;
if(name.find('*')!=string::npos)
{
poe.find_categories(glob_to_re(name), categs);
else
categs.push_back(&poe.get_category(name));
- for(list<const Category *>::const_iterator i=categs.begin(); i!=categs.end(); ++i)
+ for(vector<const Category *>::const_iterator i=categs.begin(); i!=categs.end(); ++i)
for(list<Block>::iterator j=obj.blocks.begin(); j!=obj.blocks.end(); ++j)
if(j->category==*i)
{