X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=0ebfea1e6d532b94c959569aaf5f1e9d03e601d4;hp=3d3b8eb233c74a9cc2498de16e3a7b7522019cfe;hb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;hpb=f46e495ef1db0a4e522462ac18260f2151fa2b89 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 3d3b8eb2..0ebfea1e 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -26,8 +26,6 @@ #include #include -#include - #include #include #include @@ -192,7 +190,7 @@ void View::zoom_one_to_one() return; double samplerate = 0.0; - BOOST_FOREACH(const shared_ptr d, visible_data) { + for (const shared_ptr d : visible_data) { assert(d); samplerate = max(samplerate, d->samplerate()); } @@ -248,7 +246,7 @@ list > View::selected_items() const // List the selected signals const vector< shared_ptr > traces(get_traces()); - BOOST_FOREACH (shared_ptr t, traces) { + for (shared_ptr t : traces) { assert(t); if (t->selected()) items.push_back(t); @@ -270,7 +268,7 @@ set< shared_ptr > View::get_visible_data() const // Make a set of all the visible data objects set< shared_ptr > visible_data; - BOOST_FOREACH(const shared_ptr sig, sigs) + for (const shared_ptr sig : sigs) if (sig->enabled()) visible_data.insert(sig->data()); @@ -284,7 +282,7 @@ pair View::get_time_extents() const return make_pair(0.0, 0.0); double left_time = DBL_MAX, right_time = DBL_MIN; - BOOST_FOREACH(const shared_ptr d, visible_data) + for (const shared_ptr d : visible_data) { const double start_time = d->get_start_time(); double samplerate = d->samplerate(); @@ -340,11 +338,11 @@ void View::normalize_layout() const vector< shared_ptr > traces(get_traces()); int v_min = INT_MAX; - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr t : traces) v_min = min(t->get_v_offset(), v_min); const int delta = -min(v_min, 0); - BOOST_FOREACH(shared_ptr t, traces) + for (shared_ptr t : traces) t->set_v_offset(t->get_v_offset() + delta); verticalScrollBar()->setSliderPosition(_v_offset + delta); @@ -499,7 +497,7 @@ void View::signals_changed() { int offset = SignalMargin + SignalHeight; const vector< shared_ptr > traces(get_traces()); - BOOST_FOREACH(shared_ptr t, traces) { + for (shared_ptr t : traces) { t->set_view(this); t->set_v_offset(offset); offset += SignalHeight + 2 * SignalMargin;