X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fprobes.cpp;h=a20dfccafb4f345c51d76147f69a2f4852245bde;hb=e9213170687cf4afd14e20acdc690ff9381d94ae;hp=2e1e59249b746b3cc86adc50a1e9e6b2af4708f0;hpb=2445160a5d1eb98196d2a1d57246d4c37dd13811;p=pulseview.git

diff --git a/pv/popups/probes.cpp b/pv/popups/probes.cpp
index 2e1e592..a20dfcc 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;
@@ -63,9 +61,10 @@ Probes::Probes(SigSession &session, QWidget *parent) :
 	assert(sdi);
 
 	// Collect a set of signals
-	map<const sr_probe*, shared_ptr<Signal> > signal_map;
+	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,17 +74,18 @@ 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->probes; p; p = p->next)
+		for (const GSList *p = group->channels; p; p = p->next)
 		{
-			const sr_probe *const probe = (const sr_probe*)p->data;
+			const sr_channel *const probe = (const sr_channel*)p->data;
 			assert(probe);
 
-			const map<const sr_probe*, 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);
@@ -96,12 +96,12 @@ Probes::Probes(SigSession &session, QWidget *parent) :
 
 	// Make a vector of the remaining probes
 	vector< shared_ptr<Signal> > global_sigs;
-	for (const GSList *p = sdi->probes; p; p = p->next)
+	for (const GSList *p = sdi->channels; p; p = p->next)
 	{
-		const sr_probe *const probe = (const sr_probe*)p->data;
+		const sr_channel *const probe = (const sr_channel*)p->data;
 		assert(probe);
 
-		const map<const sr_probe*, shared_ptr<Signal> >::
+		const map<const sr_channel*, shared_ptr<Signal> >::
 			const_iterator iter = signal_map.find(probe);
 		if (iter != signal_map.end())
 			global_sigs.push_back((*iter).second);
@@ -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);