Use C++11 features to manipulate containers

[libs/datafile.git] / source / collection.cpp

diff --git a/source/collection.cpp b/source/collection.cpp
index f86adf65c71ace3370e7a57537eaa4fe6cd8243a..c168d8abd002a5bd82134914a9ee9205a1ab06fb 100644 (file)
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -1,4 +1,5 @@
 #include <set>
+#include <msp/core/algorithm.h>
 #include "collection.h"
 
 using namespace std;
@@ -12,8 +13,8 @@ Collection::Collection():
 
 Collection::~Collection()
 {
-       for(TypeList::iterator i = types.begin(); i!=types.end(); ++i)
-               delete *i;
+       for(CollectionItemTypeBase *t: types)
+               delete t;
 }
 
 void Collection::add_var(const string &name, const CollectionItemTypeBase *type, const Variant &var)
@@ -46,7 +47,7 @@ const Variant *Collection::find_var(const string &name, const CollectionItemType
                        type->create_item(*this, name);
                        loaded = items.count(name);
                }
-               for(SourceList::iterator j=sources.begin(); (!loaded && j!=sources.end()); ++j)
+               for(auto j=sources.begin(); (!loaded && j!=sources.end()); ++j)
                {
                        (*j)->load(*this, *type, name);
                        loaded = items.count(name);
@@ -63,13 +64,13 @@ const Variant *Collection::find_var(const string &name, const CollectionItemType
 
 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))
+       for(const auto &kvp: items)
+               if(type.check_item_type(kvp.second))
                {
                        if(vars)
-                               vars->push_back(&i->second);
+                               vars->push_back(&kvp.second);
                        if(names)
-                               names->push_back(i->first);
+                               names->push_back(kvp.first);
                }
 
        if(include_sources && names)
@@ -81,9 +82,9 @@ unsigned Collection::get_status(const string &name, const CollectionItemTypeBase
        ItemMap::const_iterator i = items.find(name);
        if(i==items.end())
        {
-               for(SourceList::const_iterator j=sources.begin(); j!=sources.end(); ++j)
-                       if((*j)->is_loadable(type, name))
-                               return 2;
+               auto j = find_if(sources, [&name, &type](const CollectionSource *s){ return s->is_loadable(type, name); });
+               if(j!=sources.end())
+                       return 2;
                if(fallback)
                        if(CollectionItemTypeBase *fb_type = fallback->get_type(type))
                                return fallback->get_status(name, *fb_type);
@@ -95,17 +96,17 @@ unsigned Collection::get_status(const string &name, const CollectionItemTypeBase
 
 CollectionItemTypeBase *Collection::get_type(const CollectionItemTypeBase &type) const
 {
-       for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
-               if((*j)->is_same_type(type))
-                       return *j;
+       for(CollectionItemTypeBase *t: types)
+               if(t->is_same_type(type))
+                       return t;
        return 0;
 }
 
 CollectionItemTypeBase *Collection::get_type_for_item(const Variant &var) const
 {
-       for(TypeList::const_iterator i=types.begin(); i!=types.end(); ++i)
-               if((*i)->check_item_type(var))
-                       return *i;
+       for(CollectionItemTypeBase *t: types)
+               if(t->check_item_type(var))
+                       return t;
        return 0;
 }
 
@@ -116,8 +117,8 @@ void Collection::add_source(const CollectionSource &s)
 
 IO::Seekable *Collection::open_raw(const string &name) const
 {
-       for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-               if(IO::Seekable *io = (*i)->open(name))
+       for(const CollectionSource *s: sources)
+               if(IO::Seekable *io = s->open(name))
                        return io;
 
        return 0;
@@ -126,34 +127,28 @@ IO::Seekable *Collection::open_raw(const string &name) const
 void Collection::gather_names_from_sources(list<string> &names, const CollectionItemTypeBase &type) const
 {
        set<string> new_names;
-       for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-       {
-               std::list<std::string> available_names = (*i)->get_names(type);
-               for(std::list<std::string>::iterator j=available_names.begin(); j!=available_names.end(); ++j)
-                       if(!items.count(*j))
-                               new_names.insert(*j);
-       }
+       for(const CollectionSource *s: sources)
+               for(const string &n: s->get_names(type))
+                       if(!items.count(n))
+                               new_names.insert(n);
        names.insert(names.end(), new_names.begin(), new_names.end());
 }
 
 void Collection::load_items_from_sources(const CollectionItemTypeBase &type)
 {
-       for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-       {
-               std::list<std::string> available_names = (*i)->get_names(type);
-               for(std::list<std::string>::iterator j=available_names.begin(); j!=available_names.end(); ++j)
-                       if(!items.count(*j))
+       for(const CollectionSource *s: sources)
+               for(const string &n: s->get_names(type))
+                       if(!items.count(n))
                        {
                                bool loaded = false;
                                if(type.can_create())
                                {
-                                       type.create_item(*this, *j);
-                                       loaded = items.count(*j);
+                                       type.create_item(*this, n);
+                                       loaded = items.count(n);
                                }
                                if(!loaded)
-                                       (*i)->load(*this, type, *j);
+                                       s->load(*this, type, n);
                        }
-       }
 }
 
 void Collection::set_fallback(Collection *f)
@@ -165,15 +160,15 @@ void Collection::set_fallback(Collection *f)
 Collection::Loader::Loader(Collection &c):
        coll(c)
 {      
-       for(TypeList::const_iterator i = coll.types.begin(); i!=coll.types.end(); ++i)
-               (*i)->add_to_loader(*this);
+       for(const CollectionItemTypeBase *t: coll.types)
+               t->add_to_loader(*this);
 }
 
 
 CollectionItemTypeBase::~CollectionItemTypeBase()
 {
-       for(vector<ExtractorBase *>::iterator i=extractors.begin(); i!=extractors.end(); ++i)
-               delete *i;
+       for(ExtractorBase *e: extractors)
+               delete e;
 }
 
 void CollectionItemTypeBase::set_keyword(const string &k)
@@ -190,8 +185,8 @@ void CollectionItemTypeBase::add_suffix(const string &s)
 
 bool CollectionItemTypeBase::match_name(const string &name) const
 {
-       for(vector<string>::const_iterator i=suffixes.begin(); i!=suffixes.end(); ++i)
-               if(name.size()>i->size() && !name.compare(name.size()-i->size(), string::npos, *i))
+       for(const string &s: suffixes)
+               if(name.size()>s.size() && !name.compare(name.size()-s.size(), string::npos, s))
                        return true;
        return false;
 }