]> git.tdb.fi Git - r2c2.git/blobdiff - source/libmarklin/catalogue.cpp
Code reformatting: add spaces around assignment operators
[r2c2.git] / source / libmarklin / catalogue.cpp
index 8faaa102596a2db071d23bc70135bdf227f29fcd..689ad3b09c79e47e4db70e3ea5af8a2fa40a3f96 100644 (file)
@@ -40,15 +40,6 @@ LocoType &Catalogue::get_locomotive(unsigned art_nr) const
        return *i->second;
 }
 
-void Catalogue::load(const string &fn)
-{
-       IO::File in(fn.c_str());
-
-       DataFile::Parser parser(in, fn);
-       Loader loader(*this);
-       loader.load(parser);
-}
-
 
 Catalogue::Loader::Loader(Catalogue &c):
        DataFile::BasicLoader<Catalogue>(c)
@@ -62,9 +53,9 @@ void Catalogue::Loader::locomotive(unsigned art_nr)
        if(obj.locos.count(art_nr))
                throw Exception("Duplicate locomotive number");
 
-       RefPtr<LocoType> loco=new LocoType(art_nr);
+       RefPtr<LocoType> loco = new LocoType(art_nr);
        load_sub(*loco);
-       obj.locos[art_nr]=loco.release();
+       obj.locos[art_nr] = loco.release();
 }
 
 void Catalogue::Loader::track(unsigned art_nr)
@@ -72,9 +63,9 @@ void Catalogue::Loader::track(unsigned art_nr)
        if(obj.tracks.count(art_nr))
                throw Exception("Duplicate track number");
 
-       RefPtr<TrackType> trk=new TrackType(art_nr);
+       RefPtr<TrackType> trk = new TrackType(art_nr);
        load_sub(*trk);
-       obj.tracks[art_nr]=trk.release();
+       obj.tracks[art_nr] = trk.release();
 }
 
 } // namespace Marklin