X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fsignal.cpp;h=0c0cde05e18aa4d9d9f5cab9b748743b7fbffc7c;hp=3d6ee151b6af093fd4443cfba335cebe94dbf3e5;hb=79b53a1ae4a451ef60c18dff9957d311ab90c396;hpb=2d458a761b9fb184cd1c903485293f86fd552637 diff --git a/pv/views/trace/signal.cpp b/pv/views/trace/signal.cpp index 3d6ee151..0c0cde05 100644 --- a/pv/views/trace/signal.cpp +++ b/pv/views/trace/signal.cpp @@ -36,7 +36,6 @@ #include "view.hpp" using std::shared_ptr; -using std::make_shared; namespace pv { namespace views { @@ -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); @@ -128,12 +127,12 @@ 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) +QMenu* Signal::create_header_context_menu(QWidget *parent) { - QMenu *const menu = Trace::create_context_menu(parent); + QMenu *const menu = Trace::create_header_context_menu(parent); menu->addSeparator();