X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fheader.cpp;h=1e97521afd7d7b41481eb1b259fc5e8df3e770bf;hp=10fc7eb9fc3600920f50280f7d521685abe97e88;hb=af33d4cbacc745f4473f5c0f4fa1f9ebb8d84d0a;hpb=a3d5a7c7682ebb991718b49ae916c5840b3b6b51

diff --git a/pv/views/trace/header.cpp b/pv/views/trace/header.cpp
index 10fc7eb..1e97521 100644
--- a/pv/views/trace/header.cpp
+++ b/pv/views/trace/header.cpp
@@ -99,16 +99,16 @@ void Header::paintEvent(QPaintEvent*)
 {
 	const QRect rect(0, 0, width(), height());
 
-	vector< shared_ptr<RowItem> > items(view_.list_by_type<RowItem>());
+	vector< shared_ptr<ViewItem> > items(view_.list_by_type<ViewItem>());
 
 	stable_sort(items.begin(), items.end(),
-		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+		[](const shared_ptr<ViewItem> &a, const shared_ptr<ViewItem> &b) {
 			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<ViewItem>& 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;