X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcatalogue.h;h=cd59e9ca2922e06ac723af9f432fbb45de517403;hb=11c68656ac53318801dcb36078509a07ae2c2a94;hp=21ebd38a90a6382c931f08809ac46e25051b7036;hpb=d405b9943c888e3945c7ea4e496f9d300b114fe0;p=r2c2.git

diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index 21ebd38..cd59e9c 100644
--- a/source/libr2c2/catalogue.h
+++ b/source/libr2c2/catalogue.h
@@ -2,7 +2,7 @@
 #define LIBR2C2_CATALOGUE_H_
 
 #include <map>
-#include <msp/datafile/objectloader.h>
+#include <msp/datafile/collection.h>
 #include "articlenumber.h"
 #include "layout.h"
 #include "trackappearance.h"
@@ -11,50 +11,33 @@ namespace R2C2 {
 
 class ObjectType;
 
-class Catalogue
+class Catalogue: public Msp::DataFile::Collection
 {
 public:
-	class Loader: public Msp::DataFile::ObjectLoader<Catalogue>
+	class Loader: public Msp::DataFile::Collection::Loader
 	{
+	private:
+		Catalogue &cat;
+
 	public:
 		Loader(Catalogue &);
 	private:
-		void gauge(float);
 		void layout();
 		void scale(float, float);
-		void signal(ArticleNumber);
-		void terrain(ArticleNumber);
-		void track(ArticleNumber);
-		void track_appearance();
-		void vehicle(ArticleNumber);
+		void signal(const std::string &);
+		void terrain(const std::string &);
+		void track(const std::string &);
+		void vehicle(const std::string &);
 	};
 
-	typedef std::map<ArticleNumber, ObjectType *> ObjectMap;
-
-	sigc::signal<void, const ObjectType &> signal_object_added;
-
 private:
 	float scale;
-	float gauge;
-	TrackAppearance appearance;
-	ObjectMap objects;
 	Layout layout;
 
 public:
 	Catalogue();
-	~Catalogue();
 
 	float get_scale() const { return scale; }
-	float get_gauge() const { return gauge; }
-
-	void add(ObjectType &);
-	const ObjectType &get(const ArticleNumber &) const;
-	const ObjectMap &get_all() const { return objects; }
-
-	template<typename T>
-	const T &get(const ArticleNumber &an) const
-	{ return dynamic_cast<const T &>(get(an)); }
-
 	Layout &get_layout() { return layout; }
 };