X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.h;h=0cd799abf060e399a20c55027371917e14f563c5;hb=f19f861eb6858f396d574f0d45c5e967221a384b;hp=87af3a2c2c606cde35d00abd8a20bf092744e19d;hpb=b26fbba2bf5d53554325762b8022c501b3b8c8fb;p=libs%2Fdatafile.git

diff --git a/source/collection.h b/source/collection.h
index 87af3a2..0cd799a 100644
--- 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();
@@ -298,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;