Get rid of some obsolete #includes

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index a767cf5af8a2b5d864b3393abbec149a5cfaa0c0..fb4c397d36d153320426b7c3ff71c5ac292a0002 100644 (file)
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/maputils.h>
 #include <msp/gl/meshbuilder.h>
+#include "libr2c2/trackappearance.h"
 #include "catalogue.h"
 #include "signaltype.h"
 #include "tracktype.h"

diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp
index 53064b73daa9e9a95d0b8fb1689792812e6fed6c..a1ffc361f4e29aef712678228504109c1f11bf01 100644 (file)
--- a/source/3d/tracktype.cpp
+++ b/source/3d/tracktype.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <cmath>
 #include <msp/gl/technique.h>
+#include "libr2c2/trackappearance.h"
 #include "catalogue.h"
 #include "tracktype.h"
 

diff --git a/source/designer/svgexporter.cpp b/source/designer/svgexporter.cpp
index d099b731b70f4361ef416d1b4e3abe218951221a..05d1c8e4d5627a400769ce50eefe52d1f0309404 100644 (file)
--- a/source/designer/svgexporter.cpp
+++ b/source/designer/svgexporter.cpp
@@ -2,6 +2,7 @@
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include "libr2c2/catalogue.h"
+#include "libr2c2/trackappearance.h"
 #include "libr2c2/track.h"
 #include "libr2c2/tracktype.h"
 #include "svgexporter.h"

diff --git a/source/libr2c2/beamgate.cpp b/source/libr2c2/beamgate.cpp
index 20a218b22e22a7926b52f20bf4b067d0aa5f51a5..15c2b8e05fea22587ccb0fb114441b2b805d1cc2 100644 (file)
--- a/source/libr2c2/beamgate.cpp
+++ b/source/libr2c2/beamgate.cpp
@@ -1,5 +1,4 @@
 #include "beamgate.h"
-#include "catalogue.h"
 #include "layout.h"
 
 using namespace std;

diff --git a/source/libr2c2/block.cpp b/source/libr2c2/block.cpp
index e4292eab40960e338ba0a7df7acd68f447e3e14f..a0d90f3a3ea153586342cc202707fe88ee313f3a 100644 (file)
--- a/source/libr2c2/block.cpp
+++ b/source/libr2c2/block.cpp
@@ -2,7 +2,6 @@
 #include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include "block.h"
-#include "driver.h"
 #include "layout.h"
 #include "route.h"
 #include "trackcircuit.h"

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index a367799b2a60b3b07962e35400406efb2d4b597e..7a780116664a5c27ae1f86d073fb1f64b2523d32 100644 (file)
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -1,5 +1,3 @@
-#include <msp/core/maputils.h>
-#include <msp/core/refptr.h>
 #include <msp/datafile/directorysource.h>
 #include <msp/datafile/packsource.h>
 #include <msp/datafile/parser.h>
@@ -9,6 +7,7 @@
 #include "catalogue.h"
 #include "signaltype.h"
 #include "terraintype.h"
+#include "trackappearance.h"
 #include "tracktype.h"
 #include "vehicletype.h"
 

diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index 5adbde0c8e367c3e64170793ab8caf29c70123aa..46cdb5fb21c150d2d10c974b4969569b65d176af 100644 (file)
--- a/source/libr2c2/catalogue.h
+++ b/source/libr2c2/catalogue.h
@@ -1,13 +1,10 @@
 #ifndef LIBR2C2_CATALOGUE_H_
 #define LIBR2C2_CATALOGUE_H_
 
-#include <map>
 #include <msp/datafile/collection.h>
 #include <msp/datafile/collectionsource.h>
 #include <msp/fs/path.h>
-#include "articlenumber.h"
 #include "layout.h"
-#include "trackappearance.h"
 
 namespace R2C2 {
 

diff --git a/source/libr2c2/signal.h b/source/libr2c2/signal.h
index d774e76b424057d864fc59f16f2550bde2f258ae..67aa77ee73a0bfa758c26edf7d6a144ffde0d590 100644 (file)
--- a/source/libr2c2/signal.h
+++ b/source/libr2c2/signal.h
@@ -6,7 +6,6 @@
 #include "blockiter.h"
 #include "geometry.h"
 #include "signaltype.h"
-#include "track.h"
 #include "trackattachment.h"
 
 namespace R2C2 {

diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h
index 267d5d0f1ace2c7984d93c35d09db2ae63015ca5..c1963c42d8444a0628219c4eadda4c1507ad6171 100644 (file)
--- a/source/libr2c2/tracktype.h
+++ b/source/libr2c2/tracktype.h
@@ -2,7 +2,6 @@
 #define LIBR2C2_TRACKTYPE_H_
 
 #include <msp/datafile/objectloader.h>
-#include "articlenumber.h"
 #include "geometry.h"
 #include "objecttype.h"
 #include "trackpart.h"

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 6ba868461b6da2eb5e995673053eada3f55a6369..e9a539a4e77158bc911eebc44c9a437564db4b29 100644 (file)
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -5,13 +5,11 @@
 #include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
-#include "aicontrol.h"
 #include "beamgate.h"
 #include "block.h"
 #include "catalogue.h"
 #include "driver.h"
 #include "layout.h"
-#include "route.h"
 #include "simplecontroller.h"
 #include "speedquantizer.h"
 #include "timetable.h"
@@ -22,7 +20,6 @@
 #include "trainrouter.h"
 #include "vehicle.h"
 #include "vehicletype.h"
-#include "zone.h"
 
 using namespace std;
 using namespace Msp;

diff --git a/source/libr2c2/vehicle.cpp b/source/libr2c2/vehicle.cpp
index 6615fb25b768cebf6c05003eb1e52fba5d2efcd2..62671fccab1c95fdad2e811fe9c77bc5895884a0 100644 (file)
--- a/source/libr2c2/vehicle.cpp
+++ b/source/libr2c2/vehicle.cpp
@@ -3,6 +3,7 @@
 #include "driver.h"
 #include "layout.h"
 #include "track.h"
+#include "trackappearance.h"
 #include "trackiter.h"
 #include "tracktype.h"
 #include "vehicle.h"