Change namespace for the trace view and implement ViewBase

[pulseview.git] / pv / view / header.cpp

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 1977d05340fb0b63db4d87340148edc3baf478c4..4ad28cf1ca7529932c88e86d1f9041439cf88c9d 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -49,7 +49,8 @@ using std::stable_sort;
 using std::vector;
 
 namespace pv {
 using std::vector;
 
 namespace pv {

-namespace view {
+namespace views {
+namespace TraceView {

 
 const int Header::Padding = 12;
 const int Header::BaselineOffset = 5;
 
 const int Header::Padding = 12;
 const int Header::BaselineOffset = 5;


@@ -153,15 +154,15 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
        menu->exec(event->globalPos());
 }
 
        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();
                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();
 }
 
                on_ungroup();
 }
 


@@ -218,5 +219,6 @@ void Header::on_ungroup()
        } while (restart);
 }
 
        } while (restart);
 }
 

-} // namespace view
+} // namespace TraceView
+} // namespace views

 } // namespace pv
 } // namespace pv