Change terminology to better distinguish routes on the layout from paths across track...

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

diff --git a/source/libmarklin/tracktype.h b/source/libmarklin/tracktype.h
index df6ba022caf6addea2cc3ad511c4153bb98fcffc..45d8720bd4ae02da8d72f5fc299063017e8302ff 100644 (file)
--- a/source/libmarklin/tracktype.h
+++ b/source/libmarklin/tracktype.h
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef LIBMARKLIN_TRACKTYPE_H_
 #define LIBMARKLIN_TRACKTYPE_H_
 
@@ -10,24 +17,19 @@ namespace Marklin {
 class TrackType
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::BasicLoader<TrackType>
        {
-       private:
-               TrackType &ttype;
-
        public:
                Loader(TrackType &);
-               TrackType &get_object() { return ttype; }
        private:
                virtual void finish();
-
                void part();
                void position(float, float, float);
        };
 
 private:
-       unsigned     art_nr;
-       std::string  description;
+       unsigned art_nr;
+       std::string description;
        std::vector<TrackPart> parts;
        std::vector<Endpoint> endpoints;
 
@@ -37,13 +39,13 @@ public:
        unsigned get_article_number() const { return art_nr; }
        const std::string &get_description() const { return description; }
        float get_total_length() const;
-       float get_route_length(int) const;
-       unsigned get_n_routes() const;
+       float get_path_length(int) const;
+       unsigned get_n_paths() const;
        const std::vector<TrackPart> &get_parts() const { return parts; }
-       const std::vector<Endpoint>  &get_endpoints() const { return endpoints; }
+       const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
 
 private:
-       void  collect_endpoints();
+       void collect_endpoints();
 };
 
 } // namespace Marklin