X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fpopups%2Fprobes.cpp;h=f8fa970e0e7a7accff89b2ff4440e8a19ae45df4;hb=c4c986eb87ebf46fe38ebd0104d5fc85f52435c1;hp=ca1a2fb609a5da541dceb0cd017dd8cb6f0960f3;hpb=4871ed92f2d9e6e514223383ba16e6ad78c81161;p=pulseview.git diff --git a/pv/popups/probes.cpp b/pv/popups/probes.cpp index ca1a2fb6..f8fa970e 100644 --- a/pv/popups/probes.cpp +++ b/pv/popups/probes.cpp @@ -20,8 +20,6 @@ #include -#include - #include #include #include @@ -36,9 +34,9 @@ using namespace Qt; -using boost::shared_ptr; using std::map; using std::set; +using std::shared_ptr; using std::vector; using pv::view::Signal; @@ -65,7 +63,7 @@ Probes::Probes(SigSession &session, QWidget *parent) : // Collect a set of signals map > signal_map; const vector< shared_ptr > sigs = _session.get_signals(); - BOOST_FOREACH(const shared_ptr &sig, sigs) + for (const shared_ptr &sig : sigs) signal_map[sig->probe()] = sig; // Populate channel groups @@ -83,8 +81,7 @@ Probes::Probes(SigSession &session, QWidget *parent) : const sr_channel *const probe = (const sr_channel*)p->data; assert(probe); - const map >:: - iterator iter = signal_map.find(probe); + const auto iter = signal_map.find(probe); assert(iter != signal_map.end()); group_sigs.push_back((*iter).second); @@ -186,7 +183,7 @@ QGridLayout* Probes::create_channel_group_grid( int row = 0, col = 0; QGridLayout *const grid = new QGridLayout(); - BOOST_FOREACH(const shared_ptr& sig, sigs) + for (const shared_ptr& sig : sigs) { assert(sig);