Get rid of some obsolete #includes

[r2c2.git] / source / 3d / catalogue.cpp

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index f06356b367bd3ff8c5686465d33c9b751274923e..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"
@@ -13,9 +14,10 @@ namespace R2C2 {
 Catalogue3D::Catalogue3D(Catalogue &c):
        catalogue(c)
 {
-       src.add_directory(".");
-       src.add_directory("data");
-       add_source(src);
+       const list<DataFile::CollectionSource *> &src = catalogue.get_sources();
+       for(list<DataFile::CollectionSource *>::const_iterator i=src.begin(); i!=src.end(); ++i)
+               add_source(**i);
+       catalogue.signal_source_added.connect(sigc::mem_fun(static_cast<DataFile::Collection *>(this), &Catalogue3D::add_source));
 }
 
 Catalogue3D::~Catalogue3D()