Convert Catalogue to a Collection

[r2c2.git] / source / libr2c2 / catalogue.h

diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index 92d1149f1f4162a0030857782af9b95f472cc310..e8a474432251adfafec5e514fb794a93575e6942 100644 (file)
--- 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,47 +11,35 @@ 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 layout();
                void scale(float, float);
-               void signal(ArticleNumber);
-               void terrain(ArticleNumber);
-               void track(ArticleNumber);
+               void signal(const std::string &);
+               void terrain(const std::string &);
+               void track(const std::string &);
                void track_appearance();
-               void vehicle(ArticleNumber);
+               void vehicle(const std::string &);
        };
 
-       typedef std::map<ArticleNumber, ObjectType *> ObjectMap;
-
-       sigc::signal<void, const ObjectType &> signal_object_added;
-
 private:
        float scale;
        TrackAppearance appearance;
-       ObjectMap objects;
        Layout layout;
 
 public:
        Catalogue();
-       ~Catalogue();
 
        float get_scale() const { return scale; }
-
-       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; }
 };