Replaced boost::shared_ptr with std::shared_ptr

[pulseview.git] / pv / popups / probes.h

diff --git a/pv/popups/probes.h b/pv/popups/probes.h
index dc7324d1ddd278cf631fefd72935d1c3a00c462b..4265c1597274eef0f27b35d4fe8a28fbf72abbdf 100644 (file)
--- a/pv/popups/probes.h
+++ b/pv/popups/probes.h
@@ -21,14 +21,19 @@
 #ifndef PULSEVIEW_PV_POPUPS_PROBES_H
 #define PULSEVIEW_PV_POPUPS_PROBES_H
 
+#include <map>
+#include <memory>
 #include <vector>
 
 #include <QFormLayout>
-#include <QToolBar>
-#include <QToolButton>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QSignalMapper>
 
 #include <pv/widgets/popup.h>
 
+struct sr_channel_group;
+
 class QCheckBox;
 class QGridLayout;
 
@@ -58,11 +63,11 @@ public:
 private:
        void set_all_probes(bool set);
 
-       void populate_group(const sr_probe_group *group,
-               const std::vector< boost::shared_ptr<pv::view::Signal> > sigs);
+       void populate_group(const sr_channel_group *group,
+               const std::vector< std::shared_ptr<pv::view::Signal> > sigs);
 
-       QGridLayout* create_probe_group_grid(
-               const std::vector< boost::shared_ptr<pv::view::Signal> > sigs);
+       QGridLayout* create_channel_group_grid(
+               const std::vector< std::shared_ptr<pv::view::Signal> > sigs);
 
 private:
        void showEvent(QShowEvent *e);
@@ -80,14 +85,14 @@ private:
 
        bool _updating_probes;
 
-       std::vector< boost::shared_ptr<pv::prop::binding::DeviceOptions> >
+       std::vector< std::shared_ptr<pv::prop::binding::DeviceOptions> >
                 _group_bindings;
-       std::map< QCheckBox*, boost::shared_ptr<pv::view::Signal> >
+       std::map< QCheckBox*, std::shared_ptr<pv::view::Signal> >
                _check_box_signal_map;
 
-       QToolBar _probes_bar;
-       QToolButton _enable_all_probes;
-       QToolButton _disable_all_probes;
+       QHBoxLayout _buttons_bar;
+       QPushButton _enable_all_probes;
+       QPushButton _disable_all_probes;
 
        QSignalMapper _check_box_mapper;
 };