X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fprobes.h;h=434d03986378cb048944bbe8c05d412d06b3ab38;hb=adb0a9838d35c42add30f64df4f8df427aed6b89;hp=dc7324d1ddd278cf631fefd72935d1c3a00c462b;hpb=488f068c7ecdc101820a3c48be61fb45a7e683dc;p=pulseview.git

diff --git a/pv/popups/probes.h b/pv/popups/probes.h
index dc7324d..434d039 100644
--- 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,16 +63,16 @@ 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);
 
-private slots:
+private Q_SLOTS:
 	void on_probe_checked(QWidget *widget);
 
 	void enable_all_probes();
@@ -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;
 };