X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fprobes.h;h=434d03986378cb048944bbe8c05d412d06b3ab38;hb=e9213170687cf4afd14e20acdc690ff9381d94ae;hp=0dc324a00ae6071c130619b8b789c49b39df8728;hpb=65cbcf462f8bab24ce02c80af64248a0c78c2f6a;p=pulseview.git

diff --git a/pv/popups/probes.h b/pv/popups/probes.h
index 0dc324a..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 <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,9 +85,9 @@ 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;
 
 	QHBoxLayout _buttons_bar;