Update Collection terminology

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

diff --git a/source/collection.h b/source/collection.h
index 89e801ffa87850ebcba5b5452c03a4a15a4dbf0b..39e6f43b2b3674b12c9d96e4de64f1fc1a2d4e49 100644 (file)
--- a/source/collection.h
+++ b/source/collection.h
@@ -2,10 +2,10 @@
 #define MSP_DATAFILE_COLLECTION_H_
 
 #include <msp/core/maputils.h>
-#include <msp/core/meta.h>
 #include <msp/core/refptr.h>
 #include "collectionsource.h"
 #include "loader.h"
+#include "meta.h"
 
 /* XXX This file is a big mess with too many things in it.  However, the
 dependencies between those things make it difficult to split up. */
@@ -13,20 +13,6 @@ dependencies between those things make it difficult to split up. */
 namespace Msp {
 namespace DataFile {
 
-/**
-Helper struct to determine whether a Loader has a Collection typedef.
-*/
-template<typename T>
-struct NeedsCollection: public Sfinae
-{
-       template<typename U>
-       static Yes f(typename U::Collection *);
-       template<typename U>
-       static No f(...);
-
-       enum { value = Evaluate<sizeof(f<T>(0))>::value };
-};
-
 class CollectionItemTypeBase;
 
 template<typename T>
@@ -417,7 +403,7 @@ public:
                return *this;
        }
 
-       /** Adds a suffix that is used to match names when looking for future
+       /** Adds a suffix that is used to match names when looking for loadable
        objects.  There is no implied separator; a name matches if it ends with the
        suffix.  If a keyword is defined before any suffixes, then "."+keyword is
        added as a suffix. */