Correctly handle slope when snapping tracks

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

diff --git a/source/libmarklin/catalogue.h b/source/libmarklin/catalogue.h
index 7ce3e73c0d30a3d98cd252a8f0d47a726d200b88..4ce6fb1b712de8daa3d32f988d5ec5d43f0b6623 100644 (file)
--- a/source/libmarklin/catalogue.h
+++ b/source/libmarklin/catalogue.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -19,13 +19,11 @@ class TrackType;
 class Catalogue
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::BasicLoader<Catalogue>
        {
        public:
                Loader(Catalogue &);
        private:
-               Catalogue &cat;
-
                void locomotive(unsigned);
                void track(unsigned);
        };
@@ -41,7 +39,6 @@ public:
        const std::map<unsigned, TrackType *> &get_tracks() const { return tracks; }
        LocoType &get_locomotive(unsigned) const;
        const std::map<unsigned, LocoType *> &get_locomotives() const { return locos; }
-       void  load(const std::string &);
 };
 
 } // namespace Marklin