X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fheader.cpp;h=d7da7e03706bdab45389f127c8bc874871a3c74a;hp=58096dc07df4893687724b8f35c7b58a096925ee;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff

diff --git a/pv/views/trace/header.cpp b/pv/views/trace/header.cpp
index 58096dc..d7da7e0 100644
--- a/pv/views/trace/header.cpp
+++ b/pv/views/trace/header.cpp
@@ -103,12 +103,12 @@ void Header::paintEvent(QPaintEvent*)
 
 	stable_sort(items.begin(), items.end(),
 		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
-			return a->point(QRect()).y() < b->point(QRect()).y(); });
+			return a->drag_point(QRect()).y() < b->drag_point(QRect()).y(); });
 
 	QPainter painter(this);
 	painter.setRenderHint(QPainter::Antialiasing);
 
-	for (const shared_ptr<RowItem> r : items) {
+	for (const shared_ptr<RowItem>& r : items) {
 		assert(r);
 
 		const bool highlight = !item_dragging_ &&
@@ -125,7 +125,7 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 	if (!r)
 		return;
 
-	QMenu *menu = r->create_context_menu(this);
+	QMenu *menu = r->create_header_context_menu(this);
 	if (!menu)
 		menu = new QMenu(this);
 
@@ -142,7 +142,7 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 		menu->addAction(group);
 	}
 
-	menu->exec(event->globalPos());
+	menu->popup(event->globalPos());
 }
 
 void Header::keyPressEvent(QKeyEvent *event)
@@ -201,7 +201,7 @@ void Header::on_ungroup()
 		restart = false;
 		const vector< shared_ptr<TraceGroup> > groups(
 			view_.list_by_type<TraceGroup>());
-		for (const shared_ptr<TraceGroup> tg : groups)
+		for (const shared_ptr<TraceGroup>& tg : groups)
 			if (tg->selected()) {
 				tg->ungroup();
 				restart = true;