Redesign the Collection class

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

diff --git a/source/collection.cpp b/source/collection.cpp
index c1d72ca8e3b82e2f3b24b2d550d089efc8e2967c..e60b2009a4fc2c2cebf723ba700e5ab59967a00f 100644 (file)
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -5,11 +5,7 @@ namespace DataFile {
 
 Collection::~Collection()
 {
-       for(ItemMap::iterator i = items.begin(); i!=items.end(); ++i)
-               delete i->second;
-       for(ItemKeywordSeq::iterator i = keywords.begin(); i!=keywords.end(); ++i)
-               delete *i;
-       for(ItemCreatorSeq::iterator i = creators.begin(); i!=creators.end(); ++i)
+       for(TypeList::iterator i = types.begin(); i!=types.end(); ++i)
                delete *i;
 }
 
@@ -22,7 +18,7 @@ bool Collection::contains(const std::string &n) const
 Collection::Loader::Loader(Collection &c):
        coll(c)
 {      
-       for(ItemKeywordSeq::const_iterator i = coll.keywords.begin(); i!=coll.keywords.end(); ++i)
+       for(TypeList::const_iterator i = coll.types.begin(); i!=coll.types.end(); ++i)
                (*i)->add_to_loader(*this);
 }