X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=7c68f302846b5b4f6d41b020abdef6c15f98df69;hb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;hp=e7bfcbf01a1df5e5d6febc762a8219c78fc4b3b6;hpb=6f98ca4cc1b777e35194fc6f6b38704e696d0937;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index e7bfcbf..7c68f30 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -26,8 +26,6 @@
 
 #include <assert.h>
 
-#include <boost/foreach.hpp>
-
 #include <QApplication>
 #include <QMenu>
 #include <QMouseEvent>
@@ -70,7 +68,7 @@ QSize Header::sizeHint() const
 	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);
 
 		if (t->enabled()) {
@@ -86,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());
 
-	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))
@@ -99,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());
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+	for (const shared_ptr<Trace> t : traces) {
 		assert(t);
 		t->select(false);
 	}
@@ -116,7 +114,7 @@ void Header::paintEvent(QPaintEvent*)
 	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);
 
@@ -138,7 +136,7 @@ void Header::mousePressEvent(QMouseEvent *event)
 		_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()));
@@ -168,7 +166,7 @@ void Header::mousePressEvent(QMouseEvent *event)
 	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);
 	}
@@ -223,9 +221,7 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 
 		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;
@@ -270,7 +266,7 @@ void Header::keyPressEvent(QKeyEvent *e)
 	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;
@@ -281,7 +277,7 @@ void Header::keyPressEvent(QKeyEvent *e)
 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()),
 			this, SLOT(on_trace_changed()));