X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.hpp;h=25cd0ae66a3baf37a353acdc382ddfef8e2f92d7;hb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;hp=0ebe333f5f4836484ebf547f364e735445e50338;hpb=2b81ae4682ade4109ffa442794de36ceb32045eb;p=pulseview.git

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index 0ebe333f..25cd0ae6 100644
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_POPUPS_CHANNELS_H
-#define PULSEVIEW_PV_POPUPS_CHANNELS_H
+#ifndef PULSEVIEW_PV_POPUPS_CHANNELS_HPP
+#define PULSEVIEW_PV_POPUPS_CHANNELS_HPP
 
 #include <map>
 #include <memory>
@@ -43,10 +43,12 @@ namespace pv {
 
 class Session;
 
-namespace prop {
 namespace binding {
-class DeviceOptions;
+class Device;
 }
+
+namespace data {
+class SignalBase;
 }
 
 namespace view {
@@ -60,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,9 +89,9 @@ private:
 
 	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> >
+	std::map< QCheckBox*, std::shared_ptr<pv::data::SignalBase> >
 		check_box_signal_map_;
 
 	QHBoxLayout buttons_bar_;
@@ -102,4 +104,4 @@ private:
 } // popups
 } // pv
 
-#endif // PULSEVIEW_PV_POPUPS_CHANNELS_H
+#endif // PULSEVIEW_PV_POPUPS_CHANNELS_HPP