Major code refactoring:

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

diff --git a/source/libmarklin/catalogue.h b/source/libmarklin/catalogue.h
index 1a328bba1a70431b7486b55e3b78762a4049d8b0..6277158df699246952fe29e5286c6bd3bb02f60f 100644 (file)
--- a/source/libmarklin/catalogue.h
+++ b/source/libmarklin/catalogue.h
@@ -2,16 +2,16 @@
 #define LIBMARKLIN_CATALOGUE_H_
 
 #include <map>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 
 namespace Marklin {
 
-class Track;
+class TrackType;
 
 class Catalogue
 {
 public:
-       class Loader: public Msp::Parser::Loader
+       class Loader: public Msp::DataFile::Loader
        {
        public:
                Loader(Catalogue &);
@@ -20,14 +20,15 @@ public:
 
                void track(unsigned);
        };
-       typedef std::map<unsigned, Track *> TrackMap;
+private:
+       std::map<unsigned, TrackType *> tracks;
 
-       Track *get_track(unsigned);
-       const TrackMap &get_tracks() const { return tracks; }
-       void  load(const std::string &);
+public:
        ~Catalogue();
-private:
-       TrackMap tracks;
+
+       TrackType &get_track(unsigned);
+       const std::map<unsigned, TrackType *> &get_tracks() const { return tracks; }
+       void  load(const std::string &);
 };
 
 } // namespace Marklin