X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.h;h=0f4c2ee5549b92cd2c3d9f40c168b1fa9b690207;hb=e9213170687cf4afd14e20acdc690ff9381d94ae;hp=db4e856e26dfff48a59a80bae7f41909aa124e30;hpb=945745012eb57cefa1ef457daf48cfffa99f9ec2;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index db4e856e..0f4c2ee5 100644
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -25,8 +25,7 @@
 
 #include <list>
 #include <map>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <QComboBox>
 #include <QDoubleSpinBox>
@@ -62,26 +61,26 @@ public:
 	SamplingBar(SigSession &session, QWidget *parent);
 
 	void set_device_list(
-		const std::list< boost::shared_ptr<pv::device::DevInst> >
-			&devices);
+		const std::list< std::shared_ptr<pv::device::DevInst> >
+			&devices,
+		std::shared_ptr<pv::device::DevInst> selected);
 
-	boost::shared_ptr<pv::device::DevInst> get_selected_device() const;
-	void set_selected_device(
-		boost::shared_ptr<pv::device::DevInst> dev_inst);
+	std::shared_ptr<pv::device::DevInst> get_selected_device() const;
 
 	void set_capture_state(pv::SigSession::capture_state state);
 
-signals:
+Q_SIGNALS:
 	void run_stop();
 
 private:
 	void update_sample_rate_selector();
 	void update_sample_rate_selector_value();
 	void update_sample_count_selector();
+	void update_device_config_widgets();
 	void commit_sample_rate();
 	void commit_sample_count();
 
-private slots:
+private Q_SLOTS:
 	void on_device_selected();
 	void on_sample_count_changed();
 	void on_sample_rate_changed();
@@ -89,11 +88,14 @@ private slots:
 
 	void on_config_changed();
 
+protected:
+	bool eventFilter(QObject *watched, QEvent *event);
+
 private:
 	SigSession &_session;
 
 	QComboBox _device_selector;
-	std::map<const sr_dev_inst*, boost::weak_ptr<device::DevInst> >
+	std::map<const sr_dev_inst*, std::weak_ptr<device::DevInst> >
 		_device_selector_map;
 	bool _updating_device_selector;