Use const sources in Collection

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

diff --git a/source/collection.h b/source/collection.h
index 7a09f5047d501dc0d361744b25c3714b36a5409a..612a0af01879deaac213f1883db29df76d3cd57d 100644 (file)
--- a/source/collection.h
+++ b/source/collection.h
@@ -17,17 +17,14 @@ namespace DataFile {
 Helper struct to determine whether a Loader has a Collection typedef.
 */
 template<typename T>
-struct NeedsCollection
+struct NeedsCollection: public Sfinae
 {
-       struct Yes { char c[2]; };
-       struct No { char c; };
-
        template<typename U>
        static Yes f(typename U::Collection *);
        template<typename U>
        static No f(...);
 
-       enum { value = (sizeof(f<T>(0))==sizeof(Yes)) };
+       enum { value = Evaluate<sizeof(f<T>(0))>::value };
 };
 
 class CollectionItemTypeBase;
@@ -86,7 +83,7 @@ public:
 private:
        typedef std::map<std::string, Variant> ItemMap;
        typedef std::list<CollectionItemTypeBase *> TypeList;
-       typedef std::list<CollectionSource *> SourceList;
+       typedef std::list<const CollectionSource *> SourceList;
 
        TypeList types;
        ItemMap items;
@@ -258,18 +255,25 @@ private:
        template<typename T>
        CollectionItemTypeBase *get_type() const;
 
+       /// Gets a descriptor with the same type as another descriptor.
+       CollectionItemTypeBase *get_type(const CollectionItemTypeBase &) const;
+
        /// Returns the descriptor for an item, or null if it's of an unknown type.
        CollectionItemTypeBase *get_type_for_item(const Variant &) const;
 
 protected:
        /** Adds a source for automatically loading items.  Sources are consulted
        in the order they are added. */
-       void add_source(CollectionSource &);
+       void add_source(const CollectionSource &);
 
+public:
        /** Opens a raw resource, without interpreting it as object data.  Null is
        returned if no such file is found.  The caller must dispose of the returned
        object when done with it. */
-       IO::Seekable *open_from_sources(const std::string &);
+       IO::Seekable *open_raw(const std::string &) const;
+
+protected:
+       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;
@@ -379,7 +383,7 @@ private:
                Creator(FuncPtr f): func(f) { }
 
                virtual T *create(Collection &coll, const std::string &name) const
-               { return (static_cast<C &>(coll).*func)(name); }
+               { return (dynamic_cast<C &>(coll).*func)(name); }
        };
 
        template<typename B>