Remove some long-deprecated things

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

diff --git a/source/collection.h b/source/collection.h
index d0e8a1a8bb9b25c636ab23a8c1e4bbdcfa5c04a7..0cd799abf060e399a20c55027371917e14f563c5 100644 (file)
--- a/source/collection.h
+++ b/source/collection.h
@@ -3,6 +3,7 @@
 
 #include <msp/core/attributes.h>
 #include <msp/core/maputils.h>
+#include <msp/core/noncopyable.h>
 #include <msp/core/refptr.h>
 #include "collectionsource.h"
 #include "loader.h"
@@ -49,7 +50,7 @@ that are not present.  Items retrieted from the fallback collection are shared
 between the collections, and are only deleted when all collections in the chain
 have been destroyed.
 */
-class Collection
+class Collection: private NonCopyable
 {
 public:
        /**
@@ -91,8 +92,6 @@ private:
        SourceList sources;
        Collection *fallback;
 
-       Collection(const Collection &);
-       Collection &operator=(const Collection &);
 public:
        Collection();
        virtual ~Collection();
@@ -135,8 +134,27 @@ public:
                return extract<NCT>(get_var(name, get_type<NCT>(name)));
        }
 
+       /** Finds a typed object in the collection.  Returns null if the name does
+       not exist.  Throws if the name exists but the object is of an incorrect
+       type. */
+       template<typename T>
+       T *find(const std::string &name) const
+       {
+               ItemMap::const_iterator i = items.find(name);
+               return (i!=items.end() ? extract<typename RemoveConst<T>::Type>(i->second) : 0);
+       }
+
+       template<typename T>
+       T *find(const std::string &name)
+       {
+               typedef typename RemoveConst<T>::Type NCT;
+               const Variant *var = find_var(name, get_type<NCT>(name));
+               return (var ? &extract<NCT>(*var) : 0);
+       }
+
 private:
        const Variant &get_var(const std::string &, const CollectionItemTypeBase *);
+       const Variant *find_var(const std::string &, const CollectionItemTypeBase *);
 
        template<typename T>
        T &extract(const Variant &var) const;
@@ -279,10 +297,6 @@ public:
        object when done with it. */
        IO::Seekable *open_raw(const std::string &) const;
 
-protected:
-       // Deprecated.  Use open_raw instead.
-       DEPRECATED IO::Seekable *open_from_sources(const std::string &n) { return open_raw(n); }
-
 private:
        void gather_names_from_sources(std::list<std::string> &, const CollectionItemTypeBase &) const;