Renamed remove_child_track -> remove_descendant_track

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> track)
+ParentTrack::remove_descendant_track(const boost::shared_ptr<Track> track)
 {
   REQUIRE(track);
   
@@ -63,7 +63,7 @@ ParentTrack::remove_child_track(const boost::shared_ptr<Track> track)
           return true;
         }
         
-      if(child_track->remove_child_track(track))
+      if(child_track->remove_descendant_track(track))
         return true;
     }
     

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> 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> track);
 
 protected:
   lumiera::observable_list< boost::shared_ptr<Track> > tracks;

src/gui/model/track.cpp

@@ -62,7 +62,7 @@ Track::can_host_children() const
 }
 
 bool
-Track::remove_child_track(const shared_ptr<Track> /*track*/)
+Track::remove_descendant_track(const shared_ptr<Track> /*track*/)
 {
   return false;
 }

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> track);
+  virtual bool remove_descendant_track(
+    const boost::shared_ptr<Track> track);
   
   /**
    * A debugging helper function that prints this track, and all it's

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