Replaced boost::function with std::function

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index e9a1442217d7bc1bd600f6432e0002c7ed0543e3..c5789630be883ed2bb45b3154576eafb4bad0a4b 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <cassert>
+
 #include "view.h"
 #include "viewport.h"
 
@@ -26,11 +28,9 @@
 
 #include <QMouseEvent>
 
-#include <boost/foreach.hpp>
-
-using boost::shared_ptr;
 using std::max;
 using std::min;
+using std::shared_ptr;
 using std::vector;
 
 namespace pv {
@@ -49,13 +49,17 @@ Viewport::Viewport(View &parent) :
 
        connect(&_view, SIGNAL(signals_moved()),
                this, SLOT(on_signals_moved()));
+
+       // Trigger the initial event manually. The default device has signals
+       // which were created before this object came into being
+       on_signals_changed();
 }
 
 int Viewport::get_total_height() const
 {
        int h = 0;
        const vector< shared_ptr<Trace> > traces(_view.get_traces());
-       BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+       for (const shared_ptr<Trace> t : traces) {
                assert(t);
                h = max(t->get_v_offset() + View::SignalHeight, h);
        }
@@ -74,16 +78,16 @@ void Viewport::paintEvent(QPaintEvent*)
                _view.cursors().draw_viewport_background(p, rect());
 
        // Plot the signal
-       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+       for (const shared_ptr<Trace> t : traces)
        {
                assert(t);
                t->paint_back(p, 0, width());
        }
 
-       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+       for (const shared_ptr<Trace> t : traces)
                t->paint_mid(p, 0, width());
 
-       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+       for (const shared_ptr<Trace> t : traces)
                t->paint_fore(p, 0, width());
 
        if (_view.cursors_shown())
@@ -141,7 +145,7 @@ void Viewport::wheelEvent(QWheelEvent *event)
 void Viewport::on_signals_changed()
 {
        const vector< shared_ptr<Trace> > traces(_view.get_traces());
-       BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+       for (shared_ptr<Trace> t : traces) {
                assert(t);
                connect(t.get(), SIGNAL(visibility_changed()),
                        this, SLOT(update()));