Rename 'probe' to 'channel' (libsigrokdecode change).

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

diff --git a/pv/popups/probes.h b/pv/popups/probes.h
index dc7324d1ddd278cf631fefd72935d1c3a00c462b..dbf90cd0b34237a603d013fcdc1b6772ba7b84ab 100644 (file)
--- a/pv/popups/probes.h
+++ b/pv/popups/probes.h
@@ -21,14 +21,20 @@
 #ifndef PULSEVIEW_PV_POPUPS_PROBES_H
 #define PULSEVIEW_PV_POPUPS_PROBES_H
 
+#include <map>
 #include <vector>
 
+#include <boost/shared_ptr.hpp>
+
 #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,10 +64,10 @@ public:
 private:
        void set_all_probes(bool set);
 
-       void populate_group(const sr_probe_group *group,
+       void populate_group(const sr_channel_group *group,
                const std::vector< boost::shared_ptr<pv::view::Signal> > sigs);
 
-       QGridLayout* create_probe_group_grid(
+       QGridLayout* create_channel_group_grid(
                const std::vector< boost::shared_ptr<pv::view::Signal> > sigs);
 
 private:
@@ -85,9 +91,9 @@ private:
        std::map< QCheckBox*, boost::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;
 };