From: Mikko Rasa Date: Wed, 30 Oct 2013 22:24:08 +0000 (+0200) Subject: Some variable cleanup X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=3313694dbe8775b5fd6e1a7eaafe0be9179fcb85;p=r2c2.git Some variable cleanup --- diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp index 674722b..e28558a 100644 --- a/source/libr2c2/blockallocator.cpp +++ b/source/libr2c2/blockallocator.cpp @@ -28,6 +28,7 @@ struct BlockAllocator::BlockMatch BlockAllocator::BlockAllocator(Train &t): train(t), + active(false), cur_blocks_end(blocks.end()), next_sensor(0), pending_block(0), diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp index 598bf82..c2de1c5 100644 --- a/source/libr2c2/layout.cpp +++ b/source/libr2c2/layout.cpp @@ -528,8 +528,7 @@ void Layout::Storage::del() Layout::Loader::Loader(Layout &l): - DataFile::ObjectLoader(l), - new_tracks(false) + DataFile::ObjectLoader(l) { add("base", &Layout::base); add("beamgate", &Loader::beamgate); @@ -563,7 +562,6 @@ void Layout::Loader::track(ArticleNumber art_nr) { Track *trk = new Track(obj, obj.catalogue.get(art_nr)); load_sub(*trk); - new_tracks = true; const set &tracks = obj.objects.get(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) if(*i!=trk) diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h index 26df423..59eae08 100644 --- a/source/libr2c2/layout.h +++ b/source/libr2c2/layout.h @@ -30,9 +30,6 @@ class Layout public: class Loader: public Msp::DataFile::ObjectLoader { - private: - bool new_tracks; - public: Loader(Layout &); private: