X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=87effd3d6b95e0ffba01ebb2c71fb7b9b6c972b6;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hp=a7902521216a90655ba708669ab5b36b2886f52b;hpb=9f46d9058be2cc2b11ccecb0ba4c4f61d55bec1a;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index a790252..87effd3 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>
@@ -36,10 +34,10 @@
 
 #include <pv/widgets/popup.h>
 
-using boost::shared_ptr;
 using std::max;
 using std::make_pair;
 using std::pair;
+using std::shared_ptr;
 using std::vector;
 
 namespace pv {
@@ -70,9 +68,12 @@ 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);
-		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);
@@ -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());
 
-	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))
@@ -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());
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+	for (const shared_ptr<Trace> t : traces) {
 		assert(t);
 		t->select(false);
 	}
@@ -113,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);
 
@@ -135,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()));
@@ -165,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);
 	}
@@ -220,10 +221,8 @@ 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++) {
-			const boost::shared_ptr<Trace> trace((*i).first);
+		for (auto i = _drag_traces.begin(); i != _drag_traces.end(); i++) {
+			const std::shared_ptr<Trace> trace((*i).first);
 			if (trace) {
 				const int y = (*i).second + delta;
 				const int y_snap =
@@ -267,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;
@@ -278,12 +277,12 @@ 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(update()));
+			this, SLOT(on_trace_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()));
 	}
@@ -294,7 +293,7 @@ void Header::on_signals_moved()
 	update();
 }
 
-void Header::on_trace_text_changed()
+void Header::on_trace_changed()
 {
 	update();
 	geometry_updated();