Replaced lengthy iterator types with the auto keyword

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 6970ec39adb49945f8dd292567e6ce5b32b03ed7..3d3b8eb233c74a9cc2498de16e3a7b7522019cfe 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -92,7 +92,9 @@ View::View(SigSession &session, QWidget *parent) :
 
        connect(&_session, SIGNAL(signals_changed()),
                this, SLOT(signals_changed()));
-       connect(&_session, SIGNAL(data_updated()),
+       connect(&_session, SIGNAL(data_received()),
+               this, SLOT(data_updated()));
+       connect(&_session, SIGNAL(frame_ended()),
                this, SLOT(data_updated()));
 
        connect(_cursors.first().get(), SIGNAL(time_changed()),
@@ -120,6 +122,10 @@ View::View(SigSession &session, QWidget *parent) :
        _viewport->installEventFilter(this);
        _ruler->installEventFilter(this);
        _header->installEventFilter(this);
+
+       // Trigger the initial event manually. The default device has signals
+       // which were created before this object came into being
+       signals_changed();
 }
 
 SigSession& View::session()
@@ -226,7 +232,7 @@ vector< shared_ptr<Trace> > View::get_traces() const
        vector< shared_ptr<Trace> > traces(sigs.size());
 #endif
 
-       vector< shared_ptr<Trace> >::iterator i = traces.begin();
+       auto i = traces.begin();
        i = copy(sigs.begin(), sigs.end(), i);
 #ifdef ENABLE_DECODE
        i = copy(decode_sigs.begin(), decode_sigs.end(), i);