X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=550fc8482d1c7891a586adc8734dac3d684ac352;hp=085e0430582e08b5ff488b7b1d2a708ef35bca35;hb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43;hpb=62974f456595f3f6b9804a8f0fb993b4766d61e7

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 085e043..550fc84 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -22,8 +22,6 @@
 
 #include <assert.h>
 
-#include <boost/foreach.hpp>
-
 #include <QAction>
 #include <QDebug>
 #include <QHelpEvent>
@@ -34,13 +32,13 @@
 #include <pv/devicemanager.h>
 #include <pv/device/devinst.h>
 #include <pv/popups/deviceoptions.h>
-#include <pv/popups/probes.h>
+#include <pv/popups/channels.h>
 #include <pv/util.h>
 
-using boost::shared_ptr;
 using std::map;
 using std::max;
 using std::min;
+using std::shared_ptr;
 using std::string;
 
 namespace pv {
@@ -57,7 +55,7 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	_updating_device_selector(false),
 	_configure_button(this),
 	_configure_button_action(NULL),
-	_probes_button(this),
+	_channels_button(this),
 	_sample_count(" samples", this),
 	_sample_rate("Hz", this),
 	_updating_sample_rate(false),
@@ -84,14 +82,14 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	_configure_button.setIcon(QIcon::fromTheme("configure",
 		QIcon(":/icons/configure.png")));
 
-	_probes_button.setIcon(QIcon::fromTheme("probes",
-		QIcon(":/icons/probes.svg")));
+	_channels_button.setIcon(QIcon::fromTheme("channels",
+		QIcon(":/icons/channels.svg")));
 
 	_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
 	addWidget(&_device_selector);
 	_configure_button_action = addWidget(&_configure_button);
-	addWidget(&_probes_button);
+	addWidget(&_channels_button);
 	addWidget(&_sample_count);
 	addWidget(&_sample_rate);
 
@@ -114,7 +112,7 @@ void SamplingBar::set_device_list(
 	_device_selector.clear();
 	_device_selector_map.clear();
 
-	BOOST_FOREACH (shared_ptr<pv::device::DevInst> dev_inst, devices) {
+	for (shared_ptr<pv::device::DevInst> dev_inst : devices) {
 		assert(dev_inst);
 		const string title = dev_inst->format_device_title();
 		const sr_dev_inst *sdi = dev_inst->dev_inst();
@@ -148,8 +146,7 @@ shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
 			index).value<void*>();
 	assert(sdi);
 
-	map<const sr_dev_inst*, boost::weak_ptr<device::DevInst> >::
-		const_iterator iter = _device_selector_map.find(sdi);
+	const auto iter = _device_selector_map.find(sdi);
 	if (iter == _device_selector_map.end())
 		return shared_ptr<pv::device::DevInst>();
 
@@ -325,9 +322,9 @@ void SamplingBar::update_device_config_widgets()
 		!opts->binding().properties().empty());
 	_configure_button.set_popup(opts);
 
-	// Update the probes popup
-	Probes *const probes = new Probes(_session, this);
-	_probes_button.set_popup(probes);
+	// Update the channels popup
+	Channels *const channels = new Channels(_session, this);
+	_channels_button.set_popup(channels);
 
 	// Update supported options.
 	_sample_count_supported = false;