X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.h;h=667db937755cf691c760649aea6fe84d0d4e2ccb;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hp=3cd9eef95b939525a4041ecff82c3bbf2d7d265c;hpb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43;p=pulseview.git

diff --git a/pv/popups/channels.h b/pv/popups/channels.h
index 3cd9eef..667db93 100644
--- a/pv/popups/channels.h
+++ b/pv/popups/channels.h
@@ -32,11 +32,13 @@
 
 #include <pv/widgets/popup.h>
 
-struct sr_channel_group;
-
 class QCheckBox;
 class QGridLayout;
 
+namespace sigrok {
+	class ChannelGroup;
+}
+
 namespace pv {
 
 class SigSession;
@@ -58,12 +60,12 @@ class Channels : public pv::widgets::Popup
 	Q_OBJECT
 
 public:
-	Channels(SigSession &_session, QWidget *parent);
+	Channels(SigSession &session_, QWidget *parent);
 
 private:
 	void set_all_channels(bool set);
 
-	void populate_group(const sr_channel_group *group,
+	void populate_group(std::shared_ptr<sigrok::ChannelGroup> group,
 		const std::vector< std::shared_ptr<pv::view::Signal> > sigs);
 
 	QGridLayout* create_channel_group_grid(
@@ -79,22 +81,22 @@ private Q_SLOTS:
 	void disable_all_channels();
 
 private:
-	pv::SigSession &_session;
+	pv::SigSession &session_;
 
-	QFormLayout _layout;
+	QFormLayout layout_;
 
-	bool _updating_channels;
+	bool updating_channels_;
 
 	std::vector< std::shared_ptr<pv::prop::binding::DeviceOptions> >
-		 _group_bindings;
+		 group_bindings_;
 	std::map< QCheckBox*, std::shared_ptr<pv::view::Signal> >
-		_check_box_signal_map;
+		check_box_signal_map_;
 
-	QHBoxLayout _buttons_bar;
-	QPushButton _enable_all_channels;
-	QPushButton _disable_all_channels;
+	QHBoxLayout buttons_bar_;
+	QPushButton enable_all_channels_;
+	QPushButton disable_all_channels_;
 
-	QSignalMapper _check_box_mapper;
+	QSignalMapper check_box_mapper_;
 };
 
 } // popups