From 3313694dbe8775b5fd6e1a7eaafe0be9179fcb85 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 31 Oct 2013 00:24:08 +0200
Subject: [PATCH] Some variable cleanup

---
 source/libr2c2/blockallocator.cpp | 1 +
 source/libr2c2/layout.cpp         | 4 +---
 source/libr2c2/layout.h           | 3 ---
 3 files changed, 2 insertions(+), 6 deletions(-)

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<B>::del()
 
 
 Layout::Loader::Loader(Layout &l):
-	DataFile::ObjectLoader<Layout>(l),
-	new_tracks(false)
+	DataFile::ObjectLoader<Layout>(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<TrackType>(art_nr));
 	load_sub(*trk);
-	new_tracks = true;
 	const set<Track *> &tracks = obj.objects.get<Track>();
 	for(set<Track *>::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<Layout>
 	{
-	private:
-		bool new_tracks;
-
 	public:
 		Loader(Layout &);
 	private:
-- 
2.45.2