X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fprobes.cpp;h=fc069b8fd42761ef6ce5d6edda43d93e55d02dd8;hp=ca1a2fb609a5da541dceb0cd017dd8cb6f0960f3;hb=52a80eb3f81e1e4d8596164fe70d7ab8705d41eb;hpb=4871ed92f2d9e6e514223383ba16e6ad78c81161

diff --git a/pv/popups/probes.cpp b/pv/popups/probes.cpp
index ca1a2fb6..fc069b8f 100644
--- 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,7 @@ 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
@@ -83,9 +81,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 +185,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);