X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=f423b21ef9a009caa04202109882666e2b6d0fb4;hp=669a1d95d3a5347c89b0bb51f1925027a377612f;hb=3cc9ad7b867853315473df611612c562d562ed8a;hpb=5b5fa4da3b7112414b9f51e6626ae7f4bf606f02

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 669a1d95..f423b21e 100644
--- 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::Decoder> binding(
+		new binding::Decoder(decoder_stack_, dec));
 	binding->add_properties_to_form(decoder_form, true);
 
 	bindings_.push_back(binding);
@@ -774,7 +773,7 @@ void DecodeTrace::commit_channels()
 void DecodeTrace::on_new_decode_data()
 {
 	if (owner_)
-		owner_->appearance_changed(false, true);
+		owner_->row_item_appearance_changed(false, true);
 }
 
 void DecodeTrace::delete_pressed()
@@ -834,7 +833,7 @@ void DecodeTrace::on_show_hide_decoder(int index)
 	decoder_forms_[index]->set_decoder_visible(show);
 
 	if (owner_)
-		owner_->appearance_changed(false, true);
+		owner_->row_item_appearance_changed(false, true);
 }
 
 } // namespace view