Make Collection::contains check for type

Checking item existence without type information is not particularly
useful, since there's no guarantee that the object can be used for its
intended purpose.

diff --git a/source/collection.cpp b/source/collection.cpp
index e60b2009a4fc2c2cebf723ba700e5ab59967a00f..d40ab1997f9b78fcec8777f7ce14bd06fc153aea 100644 (file)
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -9,11 +9,6 @@ Collection::~Collection()
                delete *i;
 }
 
-bool Collection::contains(const std::string &n) const
-{
-       return items.count(n);
-}
-
 
 Collection::Loader::Loader(Collection &c):
        coll(c)

diff --git a/source/collection.h b/source/collection.h
index 5dd2fe67ff2769083532605e2b33bd5fe3c9dec1..d5e0806afeebad9fbfa2f043ef80d3ef9bc64878 100644 (file)
--- a/source/collection.h
+++ b/source/collection.h
@@ -151,9 +151,16 @@ public:
                return result;
        }
 
-       /** Checks whether a name exists in the collection.  Does not care about the
-       type of the object. */
-       bool contains(const std::string &n) const;
+       /// Checks whether a typed object exists in the collection.
+       template<typename T>
+       bool contains(const std::string &name) const
+       {
+               ItemMap::const_iterator i = items.find(name);
+               if(i==items.end())
+                       return false;
+
+               return i->second.check_type<typename RemoveConst<T>::Type>();
+       }
 
        /// Returns the name of an item in the collection.
        template<typename T>