Make member variable underscores a suffix instead of a prefix

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

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 3123519b9dcb6e5778d1e78f39302674a1afbb9d..b3b591b28352484c1b2dd379763174d4ac2cd9ae 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>
@@ -30,18 +30,18 @@
 
 #include "trace.h"
 
-struct sr_probe;
+namespace sigrok {
+       class Channel;
+}
 
 namespace pv {
 
+class SigSession;
+
 namespace data {
 class SignalData;
 }
 
-namespace device {
-class DevInst;
-}
-
 namespace view {
 
 class Signal : public Trace
@@ -49,8 +49,8 @@ class Signal : public Trace
        Q_OBJECT
 
 protected:
-       Signal(boost::shared_ptr<pv::device::DevInst> dev_inst,
-               const sr_probe *const probe);
+       Signal(pv::SigSession &session,
+               std::shared_ptr<sigrok::Channel> 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_probe* probe() const;
+       std::shared_ptr<sigrok::Channel> channel() const;
 
        virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -75,15 +75,15 @@ public:
 
        void delete_pressed();
 
-private slots:
+private Q_SLOTS:
        void on_disable();
 
 protected:
-       boost::shared_ptr<pv::device::DevInst> _dev_inst;
-       const sr_probe *const _probe;
+       pv::SigSession &session_;
+       std::shared_ptr<sigrok::Channel> channel_;
 
-       QComboBox *_name_widget;
-       bool _updating_name_widget;
+       QComboBox *name_widget_;
+       bool updating_name_widget_;
 };
 
 } // namespace view