projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced BOOST_FOREACH with C++11 range-based for loops
[pulseview.git]
/
pv
/
popups
/
probes.cpp
diff --git
a/pv/popups/probes.cpp
b/pv/popups/probes.cpp
index 2e1e59249b746b3cc86adc50a1e9e6b2af4708f0..ada4d9a09ed64b58af4d0807d655975f5b9116fd 100644
(file)
--- a/
pv/popups/probes.cpp
+++ b/
pv/popups/probes.cpp
@@
-20,8
+20,6
@@
#include <map>
#include <map>
-#include <boost/foreach.hpp>
-
#include <QCheckBox>
#include <QFormLayout>
#include <QGridLayout>
#include <QCheckBox>
#include <QFormLayout>
#include <QGridLayout>
@@
-63,9
+61,9
@@
Probes::Probes(SigSession &session, QWidget *parent) :
assert(sdi);
// Collect a set of signals
assert(sdi);
// Collect a set of signals
- map<const sr_
probe
*, shared_ptr<Signal> > signal_map;
+ map<const sr_
channel
*, shared_ptr<Signal> > signal_map;
const vector< shared_ptr<Signal> > sigs = _session.get_signals();
const vector< shared_ptr<Signal> > sigs = _session.get_signals();
-
BOOST_FOREACH(const shared_ptr<Signal> &sig,
sigs)
+
for (const shared_ptr<Signal> &sig :
sigs)
signal_map[sig->probe()] = sig;
// Populate channel groups
signal_map[sig->probe()] = sig;
// Populate channel groups
@@
-78,13
+76,12
@@
Probes::Probes(SigSession &session, QWidget *parent) :
// Make a set of signals, and removed this signals from the
// signal map.
vector< shared_ptr<Signal> > group_sigs;
// Make a set of signals, and removed this signals from the
// signal map.
vector< shared_ptr<Signal> > group_sigs;
- for (const GSList *p = group->
probe
s; p; p = p->next)
+ for (const GSList *p = group->
channel
s; p; p = p->next)
{
{
- const sr_
probe *const probe = (const sr_probe
*)p->data;
+ const sr_
channel *const probe = (const sr_channel
*)p->data;
assert(probe);
assert(probe);
- const map<const sr_probe*, shared_ptr<Signal> >::
- iterator iter = signal_map.find(probe);
+ const auto iter = signal_map.find(probe);
assert(iter != signal_map.end());
group_sigs.push_back((*iter).second);
assert(iter != signal_map.end());
group_sigs.push_back((*iter).second);
@@
-96,12
+93,12
@@
Probes::Probes(SigSession &session, QWidget *parent) :
// Make a vector of the remaining probes
vector< shared_ptr<Signal> > global_sigs;
// Make a vector of the remaining probes
vector< shared_ptr<Signal> > global_sigs;
- for (const GSList *p = sdi->
probe
s; p; p = p->next)
+ for (const GSList *p = sdi->
channel
s; p; p = p->next)
{
{
- const sr_
probe *const probe = (const sr_probe
*)p->data;
+ const sr_
channel *const probe = (const sr_channel
*)p->data;
assert(probe);
assert(probe);
- const map<const sr_
probe
*, shared_ptr<Signal> >::
+ const map<const sr_
channel
*, shared_ptr<Signal> >::
const_iterator iter = signal_map.find(probe);
if (iter != signal_map.end())
global_sigs.push_back((*iter).second);
const_iterator iter = signal_map.find(probe);
if (iter != signal_map.end())
global_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();
int row = 0, col = 0;
QGridLayout *const grid = new QGridLayout();
-
BOOST_FOREACH(const shared_ptr<pv::view::Signal>& sig,
sigs)
+
for (const shared_ptr<pv::view::Signal>& sig :
sigs)
{
assert(sig);
{
assert(sig);