X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=4ad28cf1ca7529932c88e86d1f9041439cf88c9d;hb=4df7756e87d3acfdd71603c2105c0ef54e58cc85;hp=7c2dd9b0d7b17c1d698bf36bd7a8db8181ea13ec;hpb=83d8efb578f191554509161e8a555fbe9475b1f6;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 7c2dd9b0..4ad28cf1 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -49,7 +49,8 @@ using std::stable_sort;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const int Header::Padding = 12;
 const int Header::BaselineOffset = 5;
@@ -115,8 +116,7 @@ void Header::paintEvent(QPaintEvent*)
 	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_ &&
@@ -154,15 +154,15 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 	menu->exec(event->globalPos());
 }
 
-void Header::keyPressEvent(QKeyEvent *e)
+void Header::keyPressEvent(QKeyEvent *event)
 {
-	assert(e);
+	assert(event);
 
-	MarginWidget::keyPressEvent(e);
+	MarginWidget::keyPressEvent(event);
 
-	if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier)
+	if (event->key() == Qt::Key_G && event->modifiers() == Qt::ControlModifier)
 		on_group();
-	else if (e->key() == Qt::Key_U && e->modifiers() == Qt::ControlModifier)
+	else if (event->key() == Qt::Key_U && event->modifiers() == Qt::ControlModifier)
 		on_ungroup();
 }
 
@@ -219,5 +219,6 @@ void Header::on_ungroup()
 	} while (restart);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv