Rename Trace::channel_ to Trace::base_, including dependencies

[pulseview.git] / pv / view / logicsignal.hpp

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 8c3525e6c47427bf94587fbfd82203ec1c2964e0..14eeed4baf82bbd272e390c46468d8e30d9b1dd8 100644 (file)
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -66,10 +66,10 @@ private:
 public:
        LogicSignal(pv::Session &session,
                std::shared_ptr<devices::Device> device,
-               std::shared_ptr<sigrok::Channel> channel,
+               std::shared_ptr<data::SignalBase> base,
                std::shared_ptr<pv::data::Logic> data);
 
-       virtual ~LogicSignal();
+       virtual ~LogicSignal() = default;
 
        std::shared_ptr<pv::data::SignalData> data() const;
 
@@ -118,7 +118,7 @@ private:
 
        const std::vector<int32_t> get_trigger_types() const;
        QAction* action_from_trigger_type(
-               const sigrok::TriggerMatchType *match);
+               const sigrok::TriggerMatchType *type);
        const sigrok::TriggerMatchType* trigger_type_from_action(
                QAction *action);
        void populate_popup_form(QWidget *parent, QFormLayout *form);