Rename 'probe' to 'channel' everywhere.

[pulseview.git] / pv / toolbars / samplingbar.h

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index e2e24b788145bb3ca227b8931e6b13af934a7761..b2e7def25f7c4d1a2f112b4c3838f24bae7e7328 100644 (file)
--- 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;