X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.h;h=2397e2aa5c20b6821b4e2159f20bd9598a5346fd;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hp=7c0ec9af2d75a2d29577e7d5126f1b2c78c717ee;hpb=e8d009288de28cb194bc7964f96677c2baf900c9;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index 7c0ec9a..2397e2a 100644
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 
-#include <map>
+#include <list>
 #include <memory>
 
 #include <QComboBox>
@@ -62,8 +62,7 @@ public:
 	SamplingBar(SigSession &session, QWidget *parent);
 
 	void set_device_list(
-		const std::map< std::shared_ptr<sigrok::Device>, std::string >
-			&device_names,
+		const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
 		std::shared_ptr<sigrok::Device> selected);
 
 	std::shared_ptr<sigrok::Device> get_selected_device() const;
@@ -93,27 +92,27 @@ protected:
 	bool eventFilter(QObject *watched, QEvent *event);
 
 private:
-	SigSession &_session;
+	SigSession &session_;
 
-	QComboBox _device_selector;
-	bool _updating_device_selector;
+	QComboBox device_selector_;
+	bool updating_device_selector_;
 
-	pv::widgets::PopupToolButton _configure_button;
-	QAction *_configure_button_action;
+	pv::widgets::PopupToolButton configure_button_;
+	QAction *configure_button_action_;
 
-	pv::widgets::PopupToolButton _channels_button;
+	pv::widgets::PopupToolButton channels_button_;
 
-	pv::widgets::SweepTimingWidget _sample_count;
-	pv::widgets::SweepTimingWidget _sample_rate;
-	bool _updating_sample_rate;
-	bool _updating_sample_count;
+	pv::widgets::SweepTimingWidget sample_count_;
+	pv::widgets::SweepTimingWidget sample_rate_;
+	bool updating_sample_rate_;
+	bool updating_sample_count_;
 
-	bool _sample_count_supported;
+	bool sample_count_supported_;
 
-	QIcon _icon_red;
-	QIcon _icon_green;
-	QIcon _icon_grey;
-	QToolButton _run_stop_button;
+	QIcon icon_red_;
+	QIcon icon_green_;
+	QIcon icon_grey_;
+	QToolButton run_stop_button_;
 };
 
 } // namespace toolbars