Fix comment and increase readability in probes.cpp

[pulseview.git] / pv / popups / probes.cpp

diff --git a/pv/popups/probes.cpp b/pv/popups/probes.cpp
index ca1a2fb609a5da541dceb0cd017dd8cb6f0960f3..a20dfccafb4f345c51d76147f69a2f4852245bde 100644 (file)
--- a/pv/popups/probes.cpp
+++ b/pv/popups/probes.cpp
@@ -20,8 +20,6 @@
 
 #include <map>
 
-#include <boost/foreach.hpp>
-
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QGridLayout>
@@ -36,9 +34,9 @@
 
 using namespace Qt;
 
-using boost::shared_ptr;
 using std::map;
 using std::set;
+using std::shared_ptr;
 using std::vector;
 
 using pv::view::Signal;
@@ -65,7 +63,8 @@ Probes::Probes(SigSession &session, QWidget *parent) :
        // Collect a set of signals
        map<const sr_channel*, shared_ptr<Signal> > signal_map;
        const vector< shared_ptr<Signal> > sigs = _session.get_signals();
-       BOOST_FOREACH(const shared_ptr<Signal> &sig, sigs)
+
+       for (const shared_ptr<Signal> &sig : sigs)
                signal_map[sig->probe()] = sig;
 
        // Populate channel groups
@@ -75,7 +74,7 @@ Probes::Probes(SigSession &session, QWidget *parent) :
                        (const sr_channel_group*)g->data;
                assert(group);
 
-               // Make a set of signals, and removed this signals from the
+               // Make a set of signals and remove these signals from the
                // signal map.
                vector< shared_ptr<Signal> > group_sigs;
                for (const GSList *p = group->channels; p; p = p->next)
@@ -83,9 +82,10 @@ Probes::Probes(SigSession &session, QWidget *parent) :
                        const sr_channel *const probe = (const sr_channel*)p->data;
                        assert(probe);
 
-                       const map<const sr_channel*, shared_ptr<Signal> >::
-                               iterator iter = signal_map.find(probe);
-                       assert(iter != signal_map.end());
+                       const auto iter = signal_map.find(probe);
+
+                       if (iter == signal_map.end())
+                               break;
 
                        group_sigs.push_back((*iter).second);
                        signal_map.erase(iter);
@@ -186,7 +186,7 @@ QGridLayout* Probes::create_channel_group_grid(
        int row = 0, col = 0;
        QGridLayout *const grid = new QGridLayout();
 
-       BOOST_FOREACH(const shared_ptr<pv::view::Signal>& sig, sigs)
+       for (const shared_ptr<pv::view::Signal>& sig : sigs)
        {
                assert(sig);