Use C++11 features to manipulate containers

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

diff --git a/source/collection.h b/source/collection.h
index 473b58ed76329cf72d971f728d29ba0aae296760..98b359e5eaedd28604a5d1f0a0085f470a657219 100644 (file)
--- a/source/collection.h
+++ b/source/collection.h
@@ -85,12 +85,10 @@ public:
 
 private:
        typedef std::map<std::string, Variant> ItemMap;
-       typedef std::vector<CollectionItemTypeBase *> TypeList;
-       typedef std::vector<const CollectionSource *> SourceList;
 
-       TypeList types;
+       std::vector<CollectionItemTypeBase *> types;
        ItemMap items;
-       SourceList sources;
+       std::vector<const CollectionSource *> sources;
        Collection *fallback;
 
 public:
@@ -166,8 +164,8 @@ private:
        std::list<T *> extract_list(const std::vector<const Variant *> &vars) const
        {
                std::list<T *> result;
-               for(std::vector<const Variant *>::const_iterator i=vars.begin(); i!=vars.end(); ++i)
-                       result.push_back(&extract<T>(**i));
+               for(const Variant *v: vars)
+                       result.push_back(&extract<T>(*v));
                return result;
        }
 
@@ -257,10 +255,10 @@ public:
        {
                typedef RefPtr<typename std::remove_cv<T>::type> RPNCT;
 
-               for(ItemMap::const_iterator i=items.begin(); i!=items.end(); ++i)
-                       if(i->second.check_type<RPNCT>())
-                               if(i->second.value<RPNCT>().get()==d)
-                                       return i->first;
+               for(const auto &kvp: items)
+                       if(kvp.second.check_type<RPNCT>())
+                               if(kvp.second.value<RPNCT>().get()==d)
+                                       return kvp.first;
        
                // XXX Need better exception class
                throw std::runtime_error("Item not found in collection");
@@ -371,8 +369,8 @@ public:
        template<typename T>
        bool can_extract() const
        {
-               for(std::vector<ExtractorBase *>::const_iterator i=extractors.begin(); i!=extractors.end(); ++i)
-                       if(dynamic_cast<Extractor<T> *>(*i))
+               for(ExtractorBase *e: extractors)
+                       if(dynamic_cast<Extractor<T> *>(e))
                                return true;
                return false;
        }
@@ -380,8 +378,8 @@ public:
        template<typename T>
        T *extract(const Variant &var) const
        {
-               for(std::vector<ExtractorBase *>::const_iterator i=extractors.begin(); i!=extractors.end(); ++i)
-                       if(Extractor<T> *ex = dynamic_cast<Extractor<T> *>(*i))
+               for(ExtractorBase *e: extractors)
+                       if(Extractor<T> *ex = dynamic_cast<Extractor<T> *>(e))
                                return &ex->extract(var);
                return 0;
        }
@@ -454,8 +452,8 @@ public:
        ~CollectionItemType()
        {
                delete creat;
-               for(typename std::vector<NotifyeeBase *>::const_iterator i=notif.begin(); i!=notif.end(); ++i)
-                       delete *i;
+               for(NotifyeeBase *n: notif)
+                       delete n;
        }
 
        /** Sets a datafile keyword for this item type.  The Collection's loader
@@ -535,8 +533,8 @@ public:
        virtual void notify_item(Collection &coll, const std::string &name, const Variant &var) const
        {
                RefPtr<T> obj = var.value<RefPtr<T> >();
-               for(typename std::vector<NotifyeeBase *>::const_iterator i=notif.begin(); i!=notif.end(); ++i)
-                       (*i)->notify(coll, name, *obj);
+               for(NotifyeeBase *n: notif)
+                       n->notify(coll, name, *obj);
        }
 };
 
@@ -581,9 +579,9 @@ typename CollectionItemTypeChooser<T>::Type &Collection::add_type()
 template<typename T>
 typename CollectionItemTypeChooser<T>::Type &Collection::modify_type()
 {
-       for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
-               if(CollectionItemType<T> *t = dynamic_cast<CollectionItemType<T> *>(*j))
-                       return *t;
+       for(CollectionItemTypeBase *t: types)
+               if(CollectionItemType<T> *tt = dynamic_cast<CollectionItemType<T> *>(t))
+                       return *tt;
 
        throw std::logic_error("type not found in collection");
 }
@@ -591,16 +589,16 @@ typename CollectionItemTypeChooser<T>::Type &Collection::modify_type()
 template<typename T>
 CollectionItemTypeBase *Collection::get_type(const std::string &name) const
 {
-       for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
-               if(dynamic_cast<CollectionItemType<T> *>(*j))
-                       return *j;
+       for(CollectionItemTypeBase *t: types)
+               if(dynamic_cast<CollectionItemType<T> *>(t))
+                       return t;
        CollectionItemTypeBase *type = 0;
-       for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
-               if((*j)->can_extract<T>())
+       for(CollectionItemTypeBase *t: types)
+               if(t->can_extract<T>())
                {
-                       if(!name.empty() && (*j)->match_name(name))
-                               return *j;
-                       type = *j;
+                       if(!name.empty() && t->match_name(name))
+                               return t;
+                       type = t;
                }
        return type;
 }