X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=3aeb08c10c792f5a990e282da2f0110c66fb85dd;hb=61da962442ae528bba9c66fa0c09427b53a4cbe0;hp=d0f8e81e694cb7402e7d4ccba0e409224a5bbaad;hpb=258600f95f62ba4fbe745da4aebdd1a496af0050;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index d0f8e81..3aeb08c 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -70,7 +70,7 @@ private:
 	Selection selection;
 	Manipulator manipulator;
 	Measure measure;
-	CameraController camera_ctl;
+	CameraController *camera_ctl;
 	TrackWrap track_wrap;
 
 	Msp::Time::TimeStamp last_tick;
@@ -86,8 +86,8 @@ public:
 	void quit();
 
 	const Marklin::Catalogue &get_catalogue() const { return catalogue; }
-	Marklin::Layout *get_layout() { return layout; }
-	Marklin::Layout3D *get_layout_3d() { return layout_3d; }
+	Marklin::Layout &get_layout() { return *layout; }
+	Marklin::Layout3D &get_layout_3d() { return *layout_3d; }
 	const Msp::GL::Camera &get_camera() const { return camera; }
 	const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
 	Msp::GLtk::Root &get_root() const { return *root; }
@@ -120,7 +120,6 @@ private:
 	void turnout_id_accept(const std::string &);
 	void sensor_id_accept(const std::string &);
 	void route_name_accept(const std::string &);
-	void view_all();
 	std::string tooltip(int, int);
 	void show_route(const Marklin::Route *);
 };