LogicSignal: Renamed action_match and match_action

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

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index a4f64e6bddc83b09da242b85b94d9ee23d629775..30dea6f4fb39c9d271c7448d44d52d2713d491ca 100644 (file)
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -57,7 +57,7 @@ private:
        static const QColor SignalColours[10];
 
 public:
-       LogicSignal(pv::SigSession &session,
+       LogicSignal(pv::Session &session,
                std::shared_ptr<sigrok::Device> device,
                std::shared_ptr<sigrok::Channel> channel,
                std::shared_ptr<pv::data::Logic> data);
@@ -98,8 +98,10 @@ private:
 
        void init_trigger_actions(QWidget *parent);
 
-       QAction* match_action(const sigrok::TriggerMatchType *match);
-       const sigrok::TriggerMatchType *action_match(QAction *action);
+       QAction* action_from_trigger_type(
+               const sigrok::TriggerMatchType *match);
+       const sigrok::TriggerMatchType* trigger_type_from_action(
+               QAction *action);
        void populate_popup_form(QWidget *parent, QFormLayout *form);
        void modify_trigger();