From 41f394a57b1544441c4831b3361990a7e1f82aec Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@joel-desktop.(none)>
Date: Sat, 24 Jan 2009 12:18:12 +0000
Subject: [PATCH] Excised ObservableList::to_list

---
 src/gui/model/parent-track.cpp | 4 ++--
 src/gui/model/parent-track.hpp | 2 +-
 src/gui/model/track.cpp        | 2 +-
 src/gui/model/track.hpp        | 2 +-
 src/lib/observable-list.hpp    | 6 ++----
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/gui/model/parent-track.cpp b/src/gui/model/parent-track.cpp
index 6aec58e8a..4e8a3ca11 100644
--- a/src/gui/model/parent-track.cpp
+++ b/src/gui/model/parent-track.cpp
@@ -30,10 +30,10 @@ ParentTrack::ParentTrack()
 {
 }
 
-std::list< boost::shared_ptr<Track> >
+const std::list< boost::shared_ptr<Track> >&
 ParentTrack::get_child_tracks() const
 {
-  return tracks.to_list();
+  return tracks.get_list();
 }
 
 lumiera::observable_list< boost::shared_ptr<Track> >&
diff --git a/src/gui/model/parent-track.hpp b/src/gui/model/parent-track.hpp
index ecc084e4b..b59bd2ce8 100644
--- a/src/gui/model/parent-track.hpp
+++ b/src/gui/model/parent-track.hpp
@@ -40,7 +40,7 @@ protected:
   ParentTrack();
 
 public:  
-  std::list< boost::shared_ptr<Track> >
+  const std::list< boost::shared_ptr<Track> >&
     get_child_tracks() const;
 
   lumiera::observable_list< boost::shared_ptr<Track> >&
diff --git a/src/gui/model/track.cpp b/src/gui/model/track.cpp
index aa099848f..f445e0f0c 100644
--- a/src/gui/model/track.cpp
+++ b/src/gui/model/track.cpp
@@ -37,7 +37,7 @@ Track::Track()
 
 }
 
-list< shared_ptr<Track> >
+const std::list< boost::shared_ptr<Track> >&
 Track::get_child_tracks() const
 {
   return Track::NoChildren;
diff --git a/src/gui/model/track.hpp b/src/gui/model/track.hpp
index 9e116e743..a886192d9 100644
--- a/src/gui/model/track.hpp
+++ b/src/gui/model/track.hpp
@@ -51,7 +51,7 @@ public:
   /**
    * Gets the list of child tracks.
    **/
-  virtual std::list< boost::shared_ptr<Track> >
+  virtual const std::list< boost::shared_ptr<Track> >&
     get_child_tracks() const;
   
   /**
diff --git a/src/lib/observable-list.hpp b/src/lib/observable-list.hpp
index c672d2a1b..dd06d0979 100644
--- a/src/lib/observable-list.hpp
+++ b/src/lib/observable-list.hpp
@@ -267,11 +267,9 @@ public:
   /* ===== Conversions ===== */
   
   /**
-   * Returns a copy of this observable_list converted to an STL list
-   * object.
-   * @return Returns a copy of the STL list.
+   * Returns a read only reference to the list.
    **/
-  std::list<T, Allocator> to_list() const
+  const std::list<T, Allocator>& get_list() const
     {
       return list;
     }