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 32d181772fce2ce2c48e571d50573608e7d6018f..cce9f4694e237da6fd7abd8a99b8f2c3f566fc68 100644 (file)
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -21,7 +21,7 @@
 #ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
 #define PULSEVIEW_PV_VIEW_SIGNAL_H
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <QComboBox>
 #include <QWidgetAction>
@@ -49,8 +49,8 @@ class Signal : public Trace
        Q_OBJECT
 
 protected:
-       Signal(boost::shared_ptr<pv::device::DevInst> dev_inst,
-               const sr_channel *const probe);
+       Signal(std::shared_ptr<pv::device::DevInst> dev_inst,
+               const sr_channel *const channel);
 
 public:
        /**
@@ -58,7 +58,7 @@ public:
         */
        void set_name(QString name);
 
-       virtual boost::shared_ptr<pv::data::SignalData> data() const = 0;
+       virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
 
        /**
         * Returns true if the trace is visible and enabled.
@@ -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,12 +75,12 @@ public:
 
        void delete_pressed();
 
-private slots:
+private Q_SLOTS:
        void on_disable();
 
 protected:
-       boost::shared_ptr<pv::device::DevInst> _dev_inst;
-       const sr_channel *const _probe;
+       std::shared_ptr<pv::device::DevInst> _dev_inst;
+       const sr_channel *const _channel;
 
        QComboBox *_name_widget;
        bool _updating_name_widget;