X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fsignal.cpp;h=d9a7a0841a78b99dc806868e55ebf3198a1cc870;hp=a286d95d3c6d07e9b299aefce8ef48701668a987;hb=0acf629d46c91b48cdb5fd6041f40b0479250296;hpb=526c8c00a61aa5f6ac7e3ee56991db957b45828d

diff --git a/pv/views/trace/signal.cpp b/pv/views/trace/signal.cpp
index a286d95d..d9a7a084 100644
--- a/pv/views/trace/signal.cpp
+++ b/pv/views/trace/signal.cpp
@@ -62,8 +62,7 @@ Signal::Signal(pv::Session &session,
 	shared_ptr<data::SignalBase> channel) :
 	Trace(channel),
 	session_(session),
-	name_widget_(nullptr),
-	current_segment_(0)
+	name_widget_(nullptr)
 {
 	assert(base_);
 
@@ -73,7 +72,7 @@ Signal::Signal(pv::Session &session,
 
 void Signal::set_name(QString name)
 {
-	Trace::set_name(name);
+	base_->set_name(name);
 
 	if (name != name_widget_->currentText())
 		name_widget_->setEditText(name);
@@ -89,16 +88,6 @@ shared_ptr<data::SignalBase> Signal::base() const
 	return base_;
 }
 
-void Signal::set_current_segment(const int segment)
-{
-	current_segment_ = segment;
-}
-
-int Signal::get_current_segment() const
-{
-	return current_segment_;
-}
-
 void Signal::save_settings(QSettings &settings) const
 {
 	(void)settings;
@@ -138,7 +127,7 @@ void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 	form->addRow(tr("Name"), name_widget_);
 
-	add_colour_option(parent, form);
+	add_color_option(parent, form);
 }
 
 QMenu* Signal::create_context_menu(QWidget *parent)