X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrafficmanager.cpp;h=29823ffa0109130136a119a814f65eba78b99553;hb=3e9c210ddc036cd015228504cc0803c909e27f84;hp=096d675e8432aafbba37902cefa5200ecdcc7187;hpb=aead7f2da831199fbb8f6950b067656b2965c2fa;p=r2c2.git diff --git a/source/libmarklin/trafficmanager.cpp b/source/libmarklin/trafficmanager.cpp index 096d675..29823ff 100644 --- a/source/libmarklin/trafficmanager.cpp +++ b/source/libmarklin/trafficmanager.cpp @@ -1,3 +1,10 @@ +/* $Id$ + +This file is part of the MSP Märklin suite +Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa +Distributed under the GPL +*/ + #include #include "control.h" #include "layout.h" @@ -31,9 +38,9 @@ TrafficManager::TrafficManager(Control &c, Layout &l): } } - for(BlockSeq::iterator i=blocks.begin(); i!=blocks.end(); ++i) + for(list::iterator i=blocks.begin(); i!=blocks.end(); ++i) { - for(BlockSeq::iterator j=i; j!=blocks.end(); ++j) + for(list::iterator j=i; j!=blocks.end(); ++j) if(j!=i) (*i)->check_link(**j); (*i)->print_debug(); @@ -42,15 +49,15 @@ TrafficManager::TrafficManager(Control &c, Layout &l): TrafficManager::~TrafficManager() { - for(BlockSeq::iterator i=blocks.begin(); i!=blocks.end(); ++i) + for(list::iterator i=blocks.begin(); i!=blocks.end(); ++i) delete *i; - for(TrainSeq::iterator i=trains.begin(); i!=trains.end(); ++i) + for(list::iterator i=trains.begin(); i!=trains.end(); ++i) delete *i; } Block &TrafficManager::get_block_by_track(const Track &t) const { - for(BlockSeq::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) + for(list::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) { const set &tracks=(*i)->get_tracks(); if(tracks.count(const_cast(&t)))