X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.h;h=7028b29e9fb31cdc182b5396ba2e7fa7f9ba75b8;hp=cce9f4694e237da6fd7abd8a99b8f2c3f566fc68;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hpb=87b79835014a386fb51b52bc993dbb693bd27197 diff --git a/pv/view/signal.h b/pv/view/signal.h index cce9f469..7028b29e 100644 --- a/pv/view/signal.h +++ b/pv/view/signal.h @@ -30,7 +30,9 @@ #include "trace.h" -struct sr_channel; +namespace sigrok { + class Channel; +} namespace pv { @@ -38,10 +40,6 @@ namespace data { class SignalData; } -namespace device { -class DevInst; -} - namespace view { class Signal : public Trace @@ -49,8 +47,7 @@ class Signal : public Trace Q_OBJECT protected: - Signal(std::shared_ptr dev_inst, - const sr_channel *const channel); + Signal(std::shared_ptr channel); public: /** @@ -67,7 +64,7 @@ public: void enable(bool enable = true); - const sr_channel* channel() const; + std::shared_ptr channel() const; virtual void populate_popup_form(QWidget *parent, QFormLayout *form); @@ -79,8 +76,7 @@ private Q_SLOTS: void on_disable(); protected: - std::shared_ptr _dev_inst; - const sr_channel *const _channel; + std::shared_ptr _channel; QComboBox *_name_widget; bool _updating_name_widget;