X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.cpp;h=e60b2009a4fc2c2cebf723ba700e5ab59967a00f;hb=e0af585ed57bdb5b1ea4f4a415fda13b5d99d2dc;hp=ea1095b39a93f61e0a14930b8e8edf039da9089e;hpb=1d9c21a8a301007fb242e05b69cc6390ec566273;p=libs%2Fdatafile.git

diff --git a/source/collection.cpp b/source/collection.cpp
index ea1095b..e60b200 100644
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "collection.h"
 
 namespace Msp {
@@ -12,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;
 }
 
@@ -29,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);
 }