Replaced boost::function with std::function

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index e51acde2b6a2d93733177dd1865641c3512abd9d..cbcbaa8897e3add1bf5506e2c31a8438da14108a 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -39,24 +39,22 @@
 #include "view/decodetrace.h"
 #include "view/logicsignal.h"
 
-#include <assert.h>
-
+#include <cassert>
+#include <mutex>
 #include <stdexcept>
 
-#include <boost/foreach.hpp>
-
 #include <sys/stat.h>
 
 #include <QDebug>
 
-using boost::dynamic_pointer_cast;
-using boost::function;
-using boost::lock_guard;
-using boost::mutex;
-using boost::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::function;
+using std::lock_guard;
+using std::mutex;
 using std::list;
 using std::map;
 using std::set;
+using std::shared_ptr;
 using std::string;
 using std::vector;
 
@@ -120,8 +118,8 @@ void SigSession::set_device(
 
 void SigSession::set_file(const string &name) throw(QString)
 {
-       // Deslect the old device, because file type detection in File::create
-       // destorys the old session inside libsigrok.
+       // Deselect the old device, because file type detection in File::create
+       // destroys the old session inside libsigrok.
        set_device(shared_ptr<device::DevInst>());
        set_device(shared_ptr<device::DevInst>(device::File::create(name)));
 }
@@ -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<pv::device::Device> dev, devices)
+               for (shared_ptr<pv::device::Device> dev : devices)
                        if (strcmp(dev->dev_inst()->driver->name,
                                "demo") == 0) {
                                default_device = dev;
@@ -190,7 +188,7 @@ void SigSession::start_capture(function<void (const QString)> error_handler)
        }
 
        // Begin the session
-       _sampling_thread = boost::thread(
+       _sampling_thread = std::thread(
                &SigSession::sample_thread_proc, this, _dev_inst,
                        error_handler);
 }
@@ -211,7 +209,7 @@ set< shared_ptr<data::SignalData> > SigSession::get_data() const
 {
        lock_guard<mutex> lock(_signals_mutex);
        set< shared_ptr<data::SignalData> > data;
-       BOOST_FOREACH(const shared_ptr<view::Signal> sig, _signals) {
+       for (const shared_ptr<view::Signal> sig : _signals) {
                assert(sig);
                data.insert(sig->data());
        }
@@ -228,7 +226,7 @@ vector< shared_ptr<view::Signal> > SigSession::get_signals() const
 #ifdef ENABLE_DECODE
 bool SigSession::add_decoder(srd_decoder *const dec)
 {
-       map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
+       map<const srd_channel*, shared_ptr<view::LogicSignal> > probes;
        shared_ptr<data::DecoderStack> decoder_stack;
 
        try
@@ -240,22 +238,22 @@ bool SigSession::add_decoder(srd_decoder *const dec)
                        new data::DecoderStack(*this, dec));
 
                // Make a list of all the probes
-               std::vector<const srd_probe*> all_probes;
-               for(const GSList *i = dec->probes; i; i = i->next)
-                       all_probes.push_back((const srd_probe*)i->data);
-               for(const GSList *i = dec->opt_probes; i; i = i->next)
-                       all_probes.push_back((const srd_probe*)i->data);
+               std::vector<const srd_channel*> all_probes;
+               for(const GSList *i = dec->channels; i; i = i->next)
+                       all_probes.push_back((const srd_channel*)i->data);
+               for(const GSList *i = dec->opt_channels; i; i = i->next)
+                       all_probes.push_back((const srd_channel*)i->data);
 
                // Auto select the initial probes
-               BOOST_FOREACH(const srd_probe *probe, all_probes)
-                       BOOST_FOREACH(shared_ptr<view::Signal> s, _signals)
+               for (const srd_channel *pdch : all_probes)
+                       for (shared_ptr<view::Signal> s : _signals)
                        {
                                shared_ptr<view::LogicSignal> l =
                                        dynamic_pointer_cast<view::LogicSignal>(s);
-                               if (l && QString::fromUtf8(probe->name).
+                               if (l && QString::fromUtf8(pdch->name).
                                        toLower().contains(
                                        l->get_name().toLower()))
-                                       probes[probe] = l;
+                                       probes[pdch] = l;
                        }
 
                assert(decoder_stack);
@@ -290,10 +288,7 @@ vector< shared_ptr<view::DecodeTrace> > SigSession::get_decode_signals() const
 
 void SigSession::remove_decode_signal(view::DecodeTrace *signal)
 {
-       for (vector< shared_ptr<view::DecodeTrace> >::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<view::Signal> SigSession::signal_from_probe(
        const sr_channel *probe) const
 {
        lock_guard<mutex> lock(_signals_mutex);
-       BOOST_FOREACH(shared_ptr<view::Signal> sig, _signals) {
+       for (shared_ptr<view::Signal> 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::SignalData> > data_set = get_data();
-       BOOST_FOREACH(shared_ptr<data::SignalData> data, data_set) {
+       for (shared_ptr<data::SignalData> data : data_set) {
                assert(data);
                data->set_samplerate(sample_rate);
        }