diff --git a/src/gui/model/parent-track.cpp b/src/gui/model/parent-track.cpp index 4e8a3ca11..4b1a678cf 100644 --- a/src/gui/model/parent-track.cpp +++ b/src/gui/model/parent-track.cpp @@ -49,7 +49,7 @@ ParentTrack::can_host_children() const } bool -ParentTrack::remove_child_track(const boost::shared_ptr track) +ParentTrack::remove_descendant_track(const boost::shared_ptr track) { REQUIRE(track); @@ -63,7 +63,7 @@ ParentTrack::remove_child_track(const boost::shared_ptr track) return true; } - if(child_track->remove_child_track(track)) + if(child_track->remove_descendant_track(track)) return true; } diff --git a/src/gui/model/parent-track.hpp b/src/gui/model/parent-track.hpp index b59bd2ce8..9f3478f9d 100644 --- a/src/gui/model/parent-track.hpp +++ b/src/gui/model/parent-track.hpp @@ -47,8 +47,14 @@ public: get_child_track_list(); bool can_host_children() const; - - bool remove_child_track(const boost::shared_ptr track); + + /** + * Tries to remove a given track from amongst the descendants of this + * track. + * @param The model track to try and remove. + * @return Returns true if the track was successfully removed. + **/ + bool remove_descendant_track(const boost::shared_ptr track); protected: lumiera::observable_list< boost::shared_ptr > tracks; diff --git a/src/gui/model/track.cpp b/src/gui/model/track.cpp index f445e0f0c..2cb517447 100644 --- a/src/gui/model/track.cpp +++ b/src/gui/model/track.cpp @@ -62,7 +62,7 @@ Track::can_host_children() const } bool -Track::remove_child_track(const shared_ptr /*track*/) +Track::remove_descendant_track(const shared_ptr /*track*/) { return false; } diff --git a/src/gui/model/track.hpp b/src/gui/model/track.hpp index a886192d9..9b5ee03f3 100644 --- a/src/gui/model/track.hpp +++ b/src/gui/model/track.hpp @@ -71,11 +71,13 @@ public: virtual bool can_host_children() const; /** - * Tries to remove a given child track from the list. + * Tries to remove a given track from amongst the descendants of this + * track. * @param The model track to try and remove. * @return Returns true if the track was successfully removed. **/ - virtual bool remove_child_track(const boost::shared_ptr track); + virtual bool remove_descendant_track( + const boost::shared_ptr track); /** * A debugging helper function that prints this track, and all it's diff --git a/src/gui/widgets/timeline/timeline-track.cpp b/src/gui/widgets/timeline/timeline-track.cpp index 1e5e25c71..717a106dd 100644 --- a/src/gui/widgets/timeline/timeline-track.cpp +++ b/src/gui/widgets/timeline/timeline-track.cpp @@ -251,7 +251,7 @@ Track::on_remove_track() REQUIRE(model_track); REQUIRE(timelineWidget.sequence); - timelineWidget.sequence->remove_child_track(model_track); + timelineWidget.sequence->remove_descendant_track(model_track); } } // namespace timeline