Add a common base class for tangible objects

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

diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h
index dd2a7c4ddf29f83c67d8bed648382d449412db46..afc85215bfe0366e0e107d21371a218ea8ab282a 100644 (file)
--- a/source/libr2c2/tracktype.h
+++ b/source/libr2c2/tracktype.h
@@ -4,11 +4,12 @@
 #include <msp/datafile/objectloader.h>
 #include "articlenumber.h"
 #include "geometry.h"
+#include "objecttype.h"
 #include "trackpart.h"
 
 namespace R2C2 {
 
-class TrackType
+class TrackType: public ObjectType
 {
 public:
        struct Endpoint
@@ -23,7 +24,7 @@ public:
                bool has_common_paths(const Endpoint &e) const { return paths&e.paths; }
        };
 
-       class Loader: public Msp::DataFile::ObjectLoader<TrackType>
+       class Loader: public Msp::DataFile::DerivedObjectLoader<TrackType, ObjectType::Loader>
        {
        private:
                bool state_bits_set;
@@ -38,8 +39,6 @@ public:
        };
 
 private:
-       ArticleNumber art_nr;
-       std::string description;
        std::vector<TrackPart> parts;
        std::vector<Endpoint> endpoints;
        unsigned state_bits;
@@ -49,8 +48,6 @@ private:
 public:
        TrackType(const ArticleNumber &);
 
-       const ArticleNumber &get_article_number() const { return art_nr; }
-       const std::string &get_description() const { return description; }
        float get_total_length() const;
        float get_path_length(int) const;
        unsigned get_paths() const;