Use iterators to traverse signals

[pulseview.git] / pv / view / view.cpp

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 61f017660cab050cc5ae84f0b9d626daef69bcca..035b7803bb83b96d78101602474c8684115e22d1 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -252,26 +252,6 @@ void View::set_scale_offset(double scale, double offset)
        scale_offset_changed();
 }
 
-list<weak_ptr<SelectableItem> > View::selected_items() const
-{
-       list<weak_ptr<SelectableItem> > items;
-
-       // List the selected signals
-       const vector< shared_ptr<RowItem> > row_items(child_items());
-       for (shared_ptr<RowItem> r : row_items) {
-               if (r && r->selected())
-                       items.push_back(r);
-       }
-
-       // List the selected cursors
-       if (_cursors.first()->selected())
-               items.push_back(_cursors.first());
-       if (_cursors.second()->selected())
-               items.push_back(_cursors.second());
-
-       return items;
-}
-
 set< shared_ptr<SignalData> > View::get_visible_data() const
 {
        shared_lock<shared_mutex> lock(session().signals_mutex());
@@ -346,14 +326,12 @@ const QPoint& View::hover_point() const
 
 void View::normalize_layout()
 {
-       const vector< shared_ptr<RowItem> > row_items(child_items());
-
        int v_min = INT_MAX;
-       for (const shared_ptr<RowItem> r : row_items)
+       for (const shared_ptr<RowItem> r : *this)
                v_min = min(r->v_offset(), v_min);
 
        const int delta = -min(v_min, 0);
-       for (shared_ptr<RowItem> r : row_items)
+       for (shared_ptr<RowItem> r : *this)
                r->set_v_offset(r->v_offset() + delta);
 
        verticalScrollBar()->setSliderPosition(_v_offset + delta);
@@ -537,7 +515,7 @@ void View::signals_changed()
 
        // Create the initial layout
        int offset = SignalMargin + SignalHeight;
-       for (shared_ptr<RowItem> r : child_items()) {
+       for (shared_ptr<RowItem> r : *this) {
                r->set_v_offset(offset);
                offset += SignalHeight + 2 * SignalMargin;
        }
@@ -574,8 +552,7 @@ void View::on_geometry_updated()
 
 void View::on_hover_point_changed()
 {
-       const vector< shared_ptr<RowItem> > row_items(child_items());
-       for (shared_ptr<RowItem> r : row_items)
+       for (shared_ptr<RowItem> r : *this)
                r->hover_point_changed();
 }