TraceTreeItemOwner: Removed non-const item_list accessor

diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index af11ad2688b8d6f61c670d5398fd60ed470a4cf0..56433752889987d01becd4b92eb5c27cd86917cb 100644 (file)
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -37,12 +37,7 @@ using std::vector;
 namespace pv {
 namespace view {
 
-vector< shared_ptr<ViewItem> >& TraceTreeItemOwner::child_items()
-{
-       return items_;
-}
-
-const vector< shared_ptr<ViewItem> >& TraceTreeItemOwner::child_items() const
+const ViewItemOwner::item_list& TraceTreeItemOwner::child_items() const
 {
        return items_;
 }

diff --git a/pv/view/tracetreeitemowner.hpp b/pv/view/tracetreeitemowner.hpp
index 025c34edad69f6f421d9fc9264f60e46f81f7e7a..cbb74427049af1db5b87eaeeb5d6ae0a31075a73 100644 (file)
--- a/pv/view/tracetreeitemowner.hpp
+++ b/pv/view/tracetreeitemowner.hpp
@@ -63,11 +63,6 @@ public:
         */
        virtual unsigned int depth() const = 0;
 
-       /**
-        * Returns a list of row items owned by this object.
-        */
-       virtual item_list& child_items();
-
        /**
         * Returns a list of row items owned by this object.
         */

diff --git a/pv/view/viewitemiterator.hpp b/pv/view/viewitemiterator.hpp
index 179de383965218d2b31321b96b67686ab424f316..eed67a939e1c63b683dec71c6d2b42eaeeef3302 100644 (file)
--- a/pv/view/viewitemiterator.hpp
+++ b/pv/view/viewitemiterator.hpp
@@ -37,14 +37,11 @@ namespace view {
 template<class Owner, class Item> class ViewItemIterator
 {
 public:
-       typedef typename std::conditional<std::is_const<Owner>::value,
-               typename Owner::item_list::const_iterator,
-               typename Owner::item_list::iterator>::type child_iterator;
-
+       typedef typename Owner::item_list::const_iterator child_iterator;
        typedef std::shared_ptr<Item> value_type;
        typedef ptrdiff_t difference_type;
        typedef value_type pointer;
-       typedef value_type& reference;
+       typedef const value_type& reference;
        typedef std::forward_iterator_tag iterator_category;
 
 public:

diff --git a/pv/view/viewitemowner.hpp b/pv/view/viewitemowner.hpp
index 60c8507626eaae243b12aba2b05c409609512be1..8d34059ad9fd9e9c37c54242ef16677e08ec22fd 100644 (file)
--- a/pv/view/viewitemowner.hpp
+++ b/pv/view/viewitemowner.hpp
@@ -43,11 +43,6 @@ public:
        typedef ViewItemIterator<const ViewItemOwner, ViewItem> const_iterator;
 
 public:
-       /**
-        * Returns a list of row items owned by this object.
-        */
-       virtual item_list& child_items() = 0;
-
        /**
         * Returns a list of row items owned by this object.
         */