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
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index a7902521216a90655ba708669ab5b36b2886f52b..7c68f302846b5b4f6d41b020abdef6c15f98df69 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-26,8
+26,6
@@
#include <assert.h>
#include <assert.h>
-#include <boost/foreach.hpp>
-
#include <QApplication>
#include <QMenu>
#include <QMouseEvent>
#include <QApplication>
#include <QMenu>
#include <QMouseEvent>
@@
-70,9
+68,12
@@
QSize Header::sizeHint() const
int max_width = 0;
const vector< shared_ptr<Trace> > traces(_view.get_traces());
int max_width = 0;
const vector< shared_ptr<Trace> > traces(_view.get_traces());
-
BOOST_FOREACH(shared_ptr<Trace> t,
traces) {
+
for (shared_ptr<Trace> t :
traces) {
assert(t);
assert(t);
- max_width = max(max_width, (int)t->get_label_rect(0).width());
+
+ if (t->enabled()) {
+ max_width = max(max_width, (int)t->get_label_rect(0).width());
+ }
}
return QSize(max_width + Padding, 0);
}
return QSize(max_width + Padding, 0);
@@
-83,7
+84,7
@@
shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
const int w = width();
const vector< shared_ptr<Trace> > traces(_view.get_traces());
const int w = width();
const vector< shared_ptr<Trace> > traces(_view.get_traces());
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces)
+
for (const shared_ptr<Trace> t :
traces)
{
assert(t);
if (t->pt_in_label_rect(0, w, pt))
{
assert(t);
if (t->pt_in_label_rect(0, w, pt))
@@
-96,7
+97,7
@@
shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
void Header::clear_selection()
{
const vector< shared_ptr<Trace> > traces(_view.get_traces());
void Header::clear_selection()
{
const vector< shared_ptr<Trace> > traces(_view.get_traces());
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces) {
+
for (const shared_ptr<Trace> t :
traces) {
assert(t);
t->select(false);
}
assert(t);
t->select(false);
}
@@
-113,7
+114,7
@@
void Header::paintEvent(QPaintEvent*)
painter.setRenderHint(QPainter::Antialiasing);
const bool dragging = !_drag_traces.empty();
painter.setRenderHint(QPainter::Antialiasing);
const bool dragging = !_drag_traces.empty();
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces)
+
for (const shared_ptr<Trace> t :
traces)
{
assert(t);
{
assert(t);
@@
-135,7
+136,7
@@
void Header::mousePressEvent(QMouseEvent *event)
_mouse_down_point = event->pos();
// Save the offsets of any signals which will be dragged
_mouse_down_point = event->pos();
// Save the offsets of any signals which will be dragged
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces)
+
for (const shared_ptr<Trace> t :
traces)
if (t->selected())
_drag_traces.push_back(
make_pair(t, t->get_v_offset()));
if (t->selected())
_drag_traces.push_back(
make_pair(t, t->get_v_offset()));
@@
-165,7
+166,7
@@
void Header::mousePressEvent(QMouseEvent *event)
if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
// Unselect all other signals because the Ctrl is not
// pressed
if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
// Unselect all other signals because the Ctrl is not
// pressed
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces)
+
for (const shared_ptr<Trace> t :
traces)
if (t != mouse_over_trace)
t->select(false);
}
if (t != mouse_over_trace)
t->select(false);
}
@@
-220,9
+221,7
@@
void Header::mouseMoveEvent(QMouseEvent *event)
const int delta = event->pos().y() - _mouse_down_point.y();
const int delta = event->pos().y() - _mouse_down_point.y();
- for (std::list<std::pair<boost::weak_ptr<Trace>,
- int> >::iterator i = _drag_traces.begin();
- i != _drag_traces.end(); i++) {
+ for (auto i = _drag_traces.begin(); i != _drag_traces.end(); i++) {
const boost::shared_ptr<Trace> trace((*i).first);
if (trace) {
const int y = (*i).second + delta;
const boost::shared_ptr<Trace> trace((*i).first);
if (trace) {
const int y = (*i).second + delta;
@@
-267,7
+266,7
@@
void Header::keyPressEvent(QKeyEvent *e)
case Qt::Key_Delete:
{
const vector< shared_ptr<Trace> > traces(_view.get_traces());
case Qt::Key_Delete:
{
const vector< shared_ptr<Trace> > traces(_view.get_traces());
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces)
+
for (const shared_ptr<Trace> t :
traces)
if (t->selected())
t->delete_pressed();
break;
if (t->selected())
t->delete_pressed();
break;
@@
-278,12
+277,12
@@
void Header::keyPressEvent(QKeyEvent *e)
void Header::on_signals_changed()
{
const vector< shared_ptr<Trace> > traces(_view.get_traces());
void Header::on_signals_changed()
{
const vector< shared_ptr<Trace> > traces(_view.get_traces());
-
BOOST_FOREACH(shared_ptr<Trace> t,
traces) {
+
for (shared_ptr<Trace> t :
traces) {
assert(t);
connect(t.get(), SIGNAL(visibility_changed()),
assert(t);
connect(t.get(), SIGNAL(visibility_changed()),
- this, SLOT(
update
()));
+ this, SLOT(
on_trace_changed
()));
connect(t.get(), SIGNAL(text_changed()),
connect(t.get(), SIGNAL(text_changed()),
- this, SLOT(on_trace_
text_
changed()));
+ this, SLOT(on_trace_changed()));
connect(t.get(), SIGNAL(colour_changed()),
this, SLOT(update()));
}
connect(t.get(), SIGNAL(colour_changed()),
this, SLOT(update()));
}
@@
-294,7
+293,7
@@
void Header::on_signals_moved()
update();
}
update();
}
-void Header::on_trace_
text_
changed()
+void Header::on_trace_changed()
{
update();
geometry_updated();
{
update();
geometry_updated();