#include <assert.h>
-#include <boost/foreach.hpp>
-
#include <QAction>
#include <QDebug>
#include <QHelpEvent>
#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 {
_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),
_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);
_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();
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>();
!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;