Full vehicle unification

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

diff --git a/source/libmarklin/catalogue.h b/source/libmarklin/catalogue.h
index f1654a19d62add8b8f5c31fdd95295acb837e10b..d529cfc07969e18f8c17983359aadc5cd543e45b 100644 (file)
--- a/source/libmarklin/catalogue.h
+++ b/source/libmarklin/catalogue.h
@@ -15,8 +15,8 @@ Distributed under the GPL
 
 namespace Marklin {
 
-class LocoType;
 class TrackType;
+class VehicleType;
 
 class Catalogue
 {
@@ -29,14 +29,14 @@ public:
                void ballast_profile();
                void gauge(float);
                void layout();
-               void locomotive(unsigned);
                void rail_profile();
                void scale(float, float);
                void track(unsigned);
+               void vehicle(unsigned);
        };
 
        sigc::signal<void, const TrackType &> signal_track_added;
-       sigc::signal<void, const LocoType &> signal_loco_added;
+       sigc::signal<void, const VehicleType &> signal_vehicle_added;
 
 private:
        float scale;
@@ -45,7 +45,7 @@ private:
        Profile ballast_profile;
        Profile path_profile;
        std::map<unsigned, TrackType *> tracks;
-       std::map<unsigned, LocoType *> locos;
+       std::map<unsigned, VehicleType *> vehicles;
        Layout layout;
 
 public:
@@ -62,9 +62,9 @@ public:
        const TrackType &get_track(unsigned) const;
        const std::map<unsigned, TrackType *> &get_tracks() const { return tracks; }
 
-       void add_locomotive(LocoType &);
-       const LocoType &get_locomotive(unsigned) const;
-       const std::map<unsigned, LocoType *> &get_locomotives() const { return locos; }
+       void add_vehicle(VehicleType &);
+       const VehicleType &get_vehicle(unsigned) const;
+       const std::map<unsigned, VehicleType *> &get_vehicles() const { return vehicles; }
 
        Layout &get_layout() { return layout; }
 };