Use a generic approach when adding the "close on enter" hook for popups

[pulseview.git] / pv / view / signal.h

diff --git a/pv/view/signal.h b/pv/view/signal.h
index c003de698e3328e9301d1d9148698c3886333d75..cce9f4694e237da6fd7abd8a99b8f2c3f566fc68 100644 (file)
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -50,7 +50,7 @@ class Signal : public Trace
 
 protected:
        Signal(std::shared_ptr<pv::device::DevInst> dev_inst,
-               const sr_channel *const probe);
+               const sr_channel *const channel);
 
 public:
        /**
@@ -67,7 +67,7 @@ public:
 
        void enable(bool enable = true);
 
-       const sr_channel* probe() const;
+       const sr_channel* channel() const;
 
        virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -75,14 +75,12 @@ public:
 
        void delete_pressed();
 
-       bool eventFilter(QObject *obj, QEvent *evt);
-
-private slots:
+private Q_SLOTS:
        void on_disable();
 
 protected:
        std::shared_ptr<pv::device::DevInst> _dev_inst;
-       const sr_channel *const _probe;
+       const sr_channel *const _channel;
 
        QComboBox *_name_widget;
        bool _updating_name_widget;