Moved pv::prop:bindings classes into pv::bindings namespace

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

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 745cf29b297f8835128740afd2cd6c9643d0bc07..91ffebe46fe37e2704a0700dc6f4428a4cff459b 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -129,7 +129,6 @@ DecodeTrace::DecodeTrace(pv::Session &session,
                decoder_stack->stack().front()->decoder()->name)),
        session_(session),
        decoder_stack_(decoder_stack),
-       text_height_(0),
        row_height_(0),
        delete_mapper_(this),
        show_hide_mapper_(this)
@@ -174,9 +173,9 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 {
        using namespace pv::data::decode;
 
-       text_height_ = ViewItemPaintParams::text_height();
-       row_height_ = (text_height_ * 6) / 4;
-       const int annotation_height = (text_height_ * 5) / 4;
+       const int text_height = ViewItemPaintParams::text_height();
+       row_height_ = (text_height * 6) / 4;
+       const int annotation_height = (text_height * 5) / 4;
 
        assert(decoder_stack_);
        const QString err = decoder_stack_->error_message();
@@ -688,8 +687,8 @@ void DecodeTrace::create_decoder_form(int index,
        }
 
        // Add the options
-       shared_ptr<prop::binding::DecoderOptions> binding(
-               new prop::binding::DecoderOptions(decoder_stack_, dec));
+       shared_ptr<binding::DecoderOptions> binding(
+               new binding::DecoderOptions(decoder_stack_, dec));
        binding->add_properties_to_form(decoder_form, true);
 
        bindings_.push_back(binding);