X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.hpp;h=a0b0693f608d59ed3577d0d673bb9ae8d0507110;hb=3cc9ad7b867853315473df611612c562d562ed8a;hp=e472fdffae05dece304a2c8330a2dac7d49fd164;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index e472fdf..a0b0693 100644
--- 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_;