X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.h;h=b2e7def25f7c4d1a2f112b4c3838f24bae7e7328;hb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43;hp=e2e24b788145bb3ca227b8931e6b13af934a7761;hpb=40065ab65c4f347ac5c3731fcea628ab26b49c1e;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index e2e24b7..b2e7def 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,15 +61,15 @@ public:
 	SamplingBar(SigSession &session, QWidget *parent);
 
 	void set_device_list(
-		const std::list< boost::shared_ptr<pv::device::DevInst> >
+		const std::list< std::shared_ptr<pv::device::DevInst> >
 			&devices,
-		boost::shared_ptr<pv::device::DevInst> selected);
+		std::shared_ptr<pv::device::DevInst> selected);
 
-	boost::shared_ptr<pv::device::DevInst> get_selected_device() const;
+	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:
@@ -81,7 +80,7 @@ private:
 	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();
@@ -96,14 +95,14 @@ 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;
 
 	pv::widgets::PopupToolButton _configure_button;
 	QAction *_configure_button_action;
 
-	pv::widgets::PopupToolButton _probes_button;
+	pv::widgets::PopupToolButton _channels_button;
 
 	pv::widgets::SweepTimingWidget _sample_count;
 	pv::widgets::SweepTimingWidget _sample_rate;