X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=282b7ec5c691959f432fe2627a60b1eddde69754;hb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;hp=5ba2e5da06e1a366990824c7b8989526381f0631;hpb=5ab6596d54521dcada4ae03fc593b6733d3735e8;p=pulseview.git diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index 5ba2e5d..282b7ec 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -43,8 +43,6 @@ #include -#include - #include #include @@ -137,7 +135,7 @@ void SigSession::set_default_device() default_device = devices.front(); // Try and find the demo device and select that by default - BOOST_FOREACH (shared_ptr dev, devices) + for (shared_ptr dev : devices) if (strcmp(dev->dev_inst()->driver->name, "demo") == 0) { default_device = dev; @@ -211,7 +209,7 @@ set< shared_ptr > SigSession::get_data() const { lock_guard lock(_signals_mutex); set< shared_ptr > data; - BOOST_FOREACH(const shared_ptr sig, _signals) { + for (const shared_ptr sig : _signals) { assert(sig); data.insert(sig->data()); } @@ -247,8 +245,8 @@ bool SigSession::add_decoder(srd_decoder *const dec) all_probes.push_back((const srd_channel*)i->data); // Auto select the initial probes - BOOST_FOREACH(const srd_channel *pdch, all_probes) - BOOST_FOREACH(shared_ptr s, _signals) + for (const srd_channel *pdch : all_probes) + for (shared_ptr s : _signals) { shared_ptr l = dynamic_pointer_cast(s); @@ -290,10 +288,7 @@ vector< shared_ptr > SigSession::get_decode_signals() const void SigSession::remove_decode_signal(view::DecodeTrace *signal) { - for (vector< shared_ptr >::iterator i = - _decode_traces.begin(); - i != _decode_traces.end(); - i++) + for (auto i = _decode_traces.begin(); i != _decode_traces.end(); i++) if ((*i).get() == signal) { _decode_traces.erase(i); @@ -402,7 +397,7 @@ shared_ptr SigSession::signal_from_probe( const sr_channel *probe) const { lock_guard lock(_signals_mutex); - BOOST_FOREACH(shared_ptr sig, _signals) { + for (shared_ptr sig : _signals) { assert(sig); if (sig->probe() == probe) return sig; @@ -431,7 +426,7 @@ void SigSession::read_sample_rate(const sr_dev_inst *const sdi) // Set the sample rate of all data const set< shared_ptr > data_set = get_data(); - BOOST_FOREACH(shared_ptr data, data_set) { + for (shared_ptr data : data_set) { assert(data); data->set_samplerate(sample_rate); }