Introduce pv::data::SignalBase

[pulseview.git] / pv / popups / channels.hpp

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index 6ba86469f04ff64b44e22f8aa427736f7101d6e8..25cd0ae66a3baf37a353acdc382ddfef8e2f92d7 100644 (file)
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -47,6 +47,10 @@ namespace binding {
 class Device;
 }
 
+namespace data {
+class SignalBase;
+}
+
 namespace view {
 class Signal;
 }
@@ -58,19 +62,19 @@ class Channels : public pv::widgets::Popup
        Q_OBJECT
 
 public:
-       Channels(Session &session_, QWidget *parent);
+       Channels(Session &session, QWidget *parent);
 
 private:
        void set_all_channels(bool set);
 
        void populate_group(std::shared_ptr<sigrok::ChannelGroup> group,
-               const std::vector< std::shared_ptr<pv::view::Signal> > sigs);
+               const std::vector< std::shared_ptr<pv::data::SignalBase> > sigs);
 
        QGridLayout* create_channel_group_grid(
-               const std::vector< std::shared_ptr<pv::view::Signal> > sigs);
+               const std::vector< std::shared_ptr<pv::data::SignalBase> > sigs);
 
 private:
-       void showEvent(QShowEvent *e);
+       void showEvent(QShowEvent *event);
 
 private Q_SLOTS:
        void on_channel_checked(QWidget *widget);
@@ -87,7 +91,7 @@ private:
 
        std::vector< std::shared_ptr<pv::binding::Device> >
                 group_bindings_;
-       std::map< QCheckBox*, std::shared_ptr<pv::view::Signal> >
+       std::map< QCheckBox*, std::shared_ptr<pv::data::SignalBase> >
                check_box_signal_map_;
 
        QHBoxLayout buttons_bar_;