Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index d9cccdb649e94a0669be4d30084323341cc5077d..3bdf725df4f4bc52fb739586da259191c5b386e0 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -36,7 +36,8 @@
 #include <pv/widgets/popup.hpp>
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const QPen Trace::AxisPen(QColor(0, 0, 0, 30*256/100));
 const int Trace::LabelHitPadding = 2;
@@ -140,8 +141,6 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 
 QRectF Trace::label_rect(const QRectF &rect) const
 {
-       using pv::view::View;
-
        QFontMetrics m(QApplication::font());
        const QSize text_size(
                m.boundingRect(QRect(), 0, base_->name()).width(), m.height());
@@ -278,5 +277,6 @@ void Trace::on_colouredit_changed(const QColor &colour)
        set_colour(colour);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv