Fix memory leaks and other bad stuff

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

diff --git a/source/libmarklin/locotype.h b/source/libmarklin/locotype.h
index 190422ee7ec0b39a67f82169866c98c7646f78be..5fd34d8c32f20d56d043075e7fa5dfd9d72ed985 100644 (file)
--- a/source/libmarklin/locotype.h
+++ b/source/libmarklin/locotype.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
 */
 
@@ -15,14 +15,10 @@ namespace Marklin {
 class LocoType
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::BasicLoader<LocoType>
        {
-       private:
-               LocoType &ltype;
-
        public:
                Loader(LocoType &);
-               LocoType &get_object() const { return ltype; }
        private:
                void function(unsigned, const std::string &);
        };
@@ -36,6 +32,7 @@ public:
        LocoType(unsigned);
        unsigned get_article_number() const { return art_nr; }
        const std::string &get_name() const { return name; }
+       unsigned get_max_function() const;
        const std::map<unsigned, std::string> &get_functions() const { return funcs; }
 };