X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fdesigner%2Fdesigner.cpp;h=88bdf8b75253f958e4493489f978cb3c5eda67b7;hb=fbab529c533b8a758fb9ce505eb8970cd037510c;hp=6706db6f4856755ab4a1e3a72e0140412a488c48;hpb=b28062f2dc88e082ee5a28b2e1f7c4c8bd989023;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 6706db6..88bdf8b 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -189,21 +189,21 @@ void Designer::quit()
 	exit(0);
 }
 
-void Designer::new_track()
+void Designer::new_object()
 {
 	use_select_tool();
 
 	mode = CATALOGUE;
-	lbl_status->set_text("Select new track or press Esc to cancel");
+	lbl_status->set_text("Select new object or press Esc to cancel");
 }
 
-void Designer::erase_tracks()
+void Designer::erase_objects()
 {
 	use_select_tool();
 
-	set<Track *> tracks = selection.get_objects<Track>();
+	set<Object *> objects = selection.get_objects();
 	selection.clear();
-	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(set<Object *>::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{
 		overlay->clear(layout_3d->get_3d(**i));
 		delete *i;
@@ -360,7 +360,7 @@ void Designer::key_press(unsigned key)
 	if(key==Msp::Input::KEY_N && shift)
 		use_tool_with_selected_objects<ExtendTool>();
 	else if(key==Msp::Input::KEY_N)
-		new_track();
+		new_object();
 	else if(key==Msp::Input::KEY_G)
 		use_tool_with_selected_objects<MoveTool>();
 	else if(key==Msp::Input::KEY_R)
@@ -393,7 +393,7 @@ void Designer::key_press(unsigned key)
 			use_select_tool();
 	}
 	else if(key==Msp::Input::KEY_X)
-		erase_tracks();
+		erase_objects();
 	else if(key==Msp::Input::KEY_F && shift)
 	{
 		const set<Track *> &tracks = selection.get_objects<Track>();