Convert Catalogue to a Collection

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

diff --git a/source/libr2c2/signaltype.h b/source/libr2c2/signaltype.h
index 4499d7ee0b6573b6e8090ac5d67519d5125b9df8..be3857a8da2a7186f6d1d966184813de8680d745 100644 (file)
--- a/source/libr2c2/signaltype.h
+++ b/source/libr2c2/signaltype.h
@@ -2,11 +2,11 @@
 #define LIBR2C2_SIGNALTYPE_H_
 
 #include <msp/datafile/objectloader.h>
-#include "articlenumber.h"
+#include "objecttype.h"
 
 namespace R2C2 {
 
-class SignalType
+class SignalType: public ObjectType
 {
 public:
        struct Indication
@@ -22,7 +22,7 @@ public:
                unsigned free_blocks;
        };
 
-       class Loader: public Msp::DataFile::ObjectLoader<SignalType>
+       class Loader: public Msp::DataFile::DerivedObjectLoader<SignalType, ObjectType::Loader>
        {
        public:
                Loader(SignalType &);
@@ -33,15 +33,12 @@ public:
        typedef std::list<Indication> IndicationList;
 
 private:
-       ArticleNumber art_nr;
-       std::string description;
        IndicationList indications;
        std::string object;
 
 public:
-       SignalType(const ArticleNumber &);
+       SignalType(const ArticleNumber & = ArticleNumber());
 
-       const ArticleNumber &get_article_number() const { return art_nr; }
        const IndicationList &get_indications() const { return indications; }
        const std::string &get_object() const { return object; }
 };