* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <boost/foreach.hpp>
+#include <cassert>
#include <libsigrok/libsigrok.h>
#include <libsigrok/libsigrok.h>
}
-using boost::shared_ptr;
using std::list;
+using std::shared_ptr;
using std::string;
extern sr_context *sr_ctx;
Qt::UserRole).value<void*>();
assert(sdi);
- std::map<const sr_dev_inst*, boost::shared_ptr<pv::device::Device> >::
- const_iterator iter = _device_map.find(sdi);
+ const auto iter = _device_map.find(sdi);
assert(iter != _device_map.end());
return (*iter).second;
hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_opts,
&num_opts, sizeof(int32_t));
for (unsigned int j = 0; j < num_opts; j++)
- if (hwopts[j] == SR_CONF_SAMPLERATE) {
+ if ((hwopts[j] & SR_CONF_MASK) == SR_CONF_SAMPLERATE) {
supported_device = true;
break;
}
g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
- BOOST_FOREACH(shared_ptr<device::Device> dev_inst, devices)
+ for (shared_ptr<device::Device> dev_inst : devices)
{
assert(dev_inst);
const sr_dev_inst *const sdi = dev_inst->dev_inst();
QString text = QString::fromUtf8(title.c_str());
if (sdi->channels) {
- text += QString(" with %1 probes").arg(
+ text += QString(" with %1 channels").arg(
g_slist_length(sdi->channels));
}