View: Moved in list_row_item_owners

diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index a33a8597538be87bc1a748833c67bfd7eb8cdea0..93b966b4aad99517cb5e13b4e3f206968263e719 100644 (file)
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -95,14 +95,6 @@ TraceTreeItemOwner::const_iterator TraceTreeItemOwner::end() const
        return const_iterator(this);
 }
 
-set< TraceTreeItemOwner* > TraceTreeItemOwner::list_row_item_owners()
-{
-       set< TraceTreeItemOwner* > owners;
-       for (const auto &r : *this)
-               owners.insert(r->owner());
-       return owners;
-}
-
 pair<int, int> TraceTreeItemOwner::v_extents() const
 {
        pair<int, int> extents(INT_MAX, INT_MIN);

diff --git a/pv/view/tracetreeitemowner.hpp b/pv/view/tracetreeitemowner.hpp
index c17769953e7dcd7eeb2005dc9ca2bc0e29e65255..b26b1e7e46d3e81846f96fb5b2682e19c48f857a 100644 (file)
--- a/pv/view/tracetreeitemowner.hpp
+++ b/pv/view/tracetreeitemowner.hpp
@@ -118,12 +118,6 @@ public:
         */
        const_iterator end() const;
 
-       /**
-        * Makes a list of row item owners of all the row items that are
-        * decendants of this item.
-        */
-       std::set< TraceTreeItemOwner* > list_row_item_owners();
-
        /**
         * Creates a list of decendant signals filtered by type.
         */

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 3f0fe9d1dc9991febf113d45f02f5dc6189c0ace..4b17a56f2fded2b7d8031e76e100d4b8e601db18 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -507,7 +507,9 @@ void View::update_viewport()
 void View::restack_all_trace_tree_items()
 {
        // Make a list of owners that is sorted from deepest first
-       const auto owners = list_row_item_owners();
+       set< TraceTreeItemOwner* > owners;
+       for (const auto &r : *this)
+               owners.insert(r->owner());
        vector< TraceTreeItemOwner* > sorted_owners(owners.begin(), owners.end());
        sort(sorted_owners.begin(), sorted_owners.end(),
                [](const TraceTreeItemOwner* a, const TraceTreeItemOwner *b) {