Fix #849 by making sure no references to the DecodeTrace instance remain

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 31ec121d074aa724bd4a67b83c2c4272d233099c..a8d25fc9df6a2ee4dfa5c3cfcfe9b9035e5c9b3a 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -33,7 +33,8 @@ using std::shared_ptr;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const float Ruler::RulerHeight = 2.5f; // x Text Height
 const int Ruler::MinorTickSubdivision = 4;
@@ -225,9 +226,9 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
        return tp;
 }
 
-void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
+void Ruler::mouseDoubleClickEvent(QMouseEvent *event)
 {
-       view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
+       view_.add_flag(view_.offset() + ((double)event->x() + 0.5) * view_.scale());
 }
 
 void Ruler::draw_hover_mark(QPainter &p, int text_height)
@@ -271,5 +272,6 @@ void Ruler::resizeEvent(QResizeEvent*)
        invalidate_tick_position_cache();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv