/* $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
*/
Catalogue::Loader::Loader(Catalogue &c):
- cat(c)
+ DataFile::BasicLoader<Catalogue>(c)
{
add("locomotive", &Loader::locomotive);
add("track", &Loader::track);
}
-void Catalogue::Loader::locomotive(unsigned art_no)
+void Catalogue::Loader::locomotive(unsigned art_nr)
{
- map<unsigned, LocoType *>::iterator i=cat.locos.find(art_no);
- if(i!=cat.locos.end())
+ if(obj.locos.count(art_nr))
throw Exception("Duplicate locomotive number");
- RefPtr<LocoType> loco=new LocoType(art_no);
+ RefPtr<LocoType> loco=new LocoType(art_nr);
load_sub(*loco);
- unsigned art_nr=loco->get_article_number();
- cat.locos[art_nr]=loco.release();
+ obj.locos[art_nr]=loco.release();
}
-void Catalogue::Loader::track(unsigned art_no)
+void Catalogue::Loader::track(unsigned art_nr)
{
- map<unsigned, TrackType *>::iterator i=cat.tracks.find(art_no);
- if(i!=cat.tracks.end())
+ if(obj.tracks.count(art_nr))
throw Exception("Duplicate track number");
- RefPtr<TrackType> trk=new TrackType(art_no);
+ RefPtr<TrackType> trk=new TrackType(art_nr);
load_sub(*trk);
- unsigned art_nr=trk->get_article_number();
- cat.tracks[art_nr]=trk.release();
+ obj.tracks[art_nr]=trk.release();
}
} // namespace Marklin