X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.cpp;h=e60b2009a4fc2c2cebf723ba700e5ab59967a00f;hb=19179a622c1de88de5ed7047643eec79f285bf2a;hp=c1d72ca8e3b82e2f3b24b2d550d089efc8e2967c;hpb=7df5e45c7f414f6a07681dc4ec2abb63b091a309;p=libs%2Fdatafile.git

diff --git a/source/collection.cpp b/source/collection.cpp
index c1d72ca..e60b200 100644
--- 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);
 }