Make Collection::contains check for type

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

diff --git a/source/collection.cpp b/source/collection.cpp
index ea1095b39a93f61e0a14930b8e8edf039da9089e..d40ab1997f9b78fcec8777f7ce14bd06fc153aea 100644 (file)
--- 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,24 +5,15 @@ 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;
 }
 
-bool Collection::contains(const std::string &n) const
-{
-       return items.count(n);
-}
-
 
 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);
 }