Update #include directives to work with Qt5 as well as Qt4

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

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index db4e856e26dfff48a59a80bae7f41909aa124e30..2c2431c427a71ccb0fa3ff166b38503737d8edb9 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,12 +61,11 @@ 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);
 
@@ -78,6 +76,7 @@ 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();
 
@@ -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;