From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 24 Aug 2013 13:54:36 +0000 (+0300)
Subject: Clean up old clutter from Designer
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=9b5a6a6f032863fe525623420c8086a62188b771;p=r2c2.git

Clean up old clutter from Designer
---

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index cfe3938..7c100db 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -466,8 +466,8 @@ void Designer::use_tool(Tool *tool)
 	}
 
 	cur_tool = tool;
-	cur_tool->signal_status.connect(sigc::mem_fun(this, &Designer::manipulation_status));
-	manipulation_status(cur_tool->get_status());
+	cur_tool->signal_status.connect(sigc::mem_fun(this, &Designer::tool_status));
+	tool_status(cur_tool->get_status());
 	mode = TOOL;
 }
 
@@ -567,17 +567,11 @@ void Designer::selection_changed()
 	}
 }
 
-void Designer::manipulation_status(const string &status)
+void Designer::tool_status(const string &status)
 {
 	lbl_status->set_text(status);
 }
 
-void Designer::measure_done()
-{
-	mode = SELECT;
-	selection_changed();
-}
-
 void Designer::track_properties_response(int)
 {
 	const set<Track *> &tracks = selection.get_objects<Track>();
diff --git a/source/designer/designer.h b/source/designer/designer.h
index dadbf06..f89355c 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -117,10 +117,7 @@ private:
 	R2C2::Object *pick_object(const R2C2::Vector &);
 	void update_track_icon(R2C2::Track3D &);
 	void selection_changed();
-	void manipulation_status(const std::string &);
-	void manipulation_done(bool);
-	void measure_changed();
-	void measure_done();
+	void tool_status(const std::string &);
 	void track_properties_response(int);
 	void route_name_accept(const std::string &);
 	void svg_export_accept(const std::string &);