6 files changed, 5 insertions, 22 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 5161a6626d..a1bbce29ee 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -3702,12 +3702,6 @@ ARDOUR_UI::TransportControllable::get_value (void) const
 }
 
 void
-ARDOUR_UI::TransportControllable::set_id (const string& str)
-{
-	_id = str;
-}
-
-void
 ARDOUR_UI::setup_profile ()
 {
 	if (gdk_screen_width() < 1200) {
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 08e0d42ab0..5c2a99290d 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -401,8 +401,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	    void set_value (double);
 	    double get_value (void) const;
 
-	    void set_id (const std::string&);
-
 	    ARDOUR_UI& ui;
 	    ToggleType type;
 	};
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 78c6911116..08099c2972 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1244,7 +1244,7 @@ Editor::set_session (Session *t)
 	}
 
 	/* register for undo history */
-	_session->register_with_memento_command_factory(_id, this);
+	_session->register_with_memento_command_factory(id(), this);
 
 	ActionManager::ui_manager->signal_pre_activate().connect (sigc::mem_fun (*this, &Editor::action_pre_activated));
 
@@ -2160,9 +2160,7 @@ Editor::set_state (const XMLNode& node, int /*version*/)
 	int x, y;
 	Gdk::Geometry g;
 
-	if ((prop = node.property ("id")) != 0) {
-		_id = prop->value ();
-	}
+	set_id (node);
 
 	g.base_width = default_width;
 	g.base_height = default_height;
@@ -2374,7 +2372,7 @@ Editor::get_state ()
 	XMLNode* node = new XMLNode ("Editor");
 	char buf[32];
 
-	_id.print (buf, sizeof (buf));
+	id().print (buf, sizeof (buf));
 	node->add_property ("id", buf);
 
 	if (is_realized()) {
diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index a496ddc0b2..2fb2a3357e 100644
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -612,12 +612,6 @@ ShuttleControl::ShuttleControllable::ShuttleControllable (ShuttleControl& s)
 }
 
 void
-ShuttleControl::ShuttleControllable::set_id (const std::string& str)
-{
-	_id = str;
-}
-
-void
 ShuttleControl::ShuttleControllable::set_value (double val)
 {
 	double fract;
diff --git a/gtk2_ardour/shuttle_control.h b/gtk2_ardour/shuttle_control.h
index 03ec005958..ab58969743 100644
--- a/gtk2_ardour/shuttle_control.h
+++ b/gtk2_ardour/shuttle_control.h
@@ -49,8 +49,6 @@ class ShuttleControl : public Gtk::DrawingArea, public ARDOUR::SessionHandlePtr
 		void set_value (double);
 		double get_value (void) const;
 
-		void set_id (const std::string&);
-
 		ShuttleControl& sc;
 	};
 
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index d9b0bfa2cf..9df586bf7f 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -109,7 +109,8 @@ TimeAxisViewItem::TimeAxisViewItem(
 }
 
 TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
-	: Selectable (other)
+	: trackable (other)
+	, Selectable (other)
 	, PBD::ScopedConnectionList()
 	, trackview (other.trackview)
 	, _recregion (other._recregion)