X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcatalogue.h;h=46cdb5fb21c150d2d10c974b4969569b65d176af;hb=508ee4bfcc0f8fb1373fb7af251c59c873ef896f;hp=e8a474432251adfafec5e514fb794a93575e6942;hpb=81ee4fbd16b472892b67b35ea85956423a2247ed;p=r2c2.git

diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index e8a4744..46cdb5f 100644
--- a/source/libr2c2/catalogue.h
+++ b/source/libr2c2/catalogue.h
@@ -1,11 +1,10 @@
 #ifndef LIBR2C2_CATALOGUE_H_
 #define LIBR2C2_CATALOGUE_H_
 
-#include <map>
 #include <msp/datafile/collection.h>
-#include "articlenumber.h"
+#include <msp/datafile/collectionsource.h>
+#include <msp/fs/path.h>
 #include "layout.h"
-#include "trackappearance.h"
 
 namespace R2C2 {
 
@@ -24,21 +23,21 @@ public:
 	private:
 		void layout();
 		void scale(float, float);
-		void signal(const std::string &);
-		void terrain(const std::string &);
-		void track(const std::string &);
-		void track_appearance();
-		void vehicle(const std::string &);
 	};
 
+	sigc::signal<void, Msp::DataFile::CollectionSource &> signal_source_added;
+
 private:
 	float scale;
-	TrackAppearance appearance;
 	Layout layout;
+	std::list<Msp::DataFile::CollectionSource *> sources;
 
 public:
 	Catalogue();
 
+	void add_source(const Msp::FS::Path &);
+	const std::list<Msp::DataFile::CollectionSource *> &get_sources() const { return sources; }
+
 	float get_scale() const { return scale; }
 	Layout &get_layout() { return layout; }
 };