Renamed pv::binding::DeviceOptions and DecoderOptions to Device and Decoder

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

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index e472fdffae05dece304a2c8330a2dac7d49fd164..a0b0693f608d59ed3577d0d673bb9ae8d0507110 100644 (file)
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -41,12 +41,10 @@ namespace sigrok {
 
 namespace pv {
 
-class SigSession;
+class Session;
 
-namespace prop {
 namespace binding {
-class DeviceOptions;
-}
+class Device;
 }
 
 namespace view {
@@ -60,7 +58,7 @@ class Channels : public pv::widgets::Popup
        Q_OBJECT
 
 public:
-       Channels(SigSession &session_, QWidget *parent);
+       Channels(Session &session_, QWidget *parent);
 
 private:
        void set_all_channels(bool set);
@@ -81,13 +79,13 @@ private Q_SLOTS:
        void disable_all_channels();
 
 private:
-       pv::SigSession &session_;
+       pv::Session &session_;
 
        QFormLayout layout_;
 
        bool updating_channels_;
 
-       std::vector< std::shared_ptr<pv::prop::binding::DeviceOptions> >
+       std::vector< std::shared_ptr<pv::binding::Device> >
                 group_bindings_;
        std::map< QCheckBox*, std::shared_ptr<pv::view::Signal> >
                check_box_signal_map_;