projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing files to test/CMakeLists.txt.
[pulseview.git]
/
pv
/
popups
/
probes.h
diff --git
a/pv/popups/probes.h
b/pv/popups/probes.h
index 3760f4200835791afe93a8322c99325a6079ee26..4265c1597274eef0f27b35d4fe8a28fbf72abbdf 100644
(file)
--- a/
pv/popups/probes.h
+++ b/
pv/popups/probes.h
@@
-22,10
+22,9
@@
#define PULSEVIEW_PV_POPUPS_PROBES_H
#include <map>
#define PULSEVIEW_PV_POPUPS_PROBES_H
#include <map>
+#include <memory>
#include <vector>
#include <vector>
-#include <boost/shared_ptr.hpp>
-
#include <QFormLayout>
#include <QHBoxLayout>
#include <QPushButton>
#include <QFormLayout>
#include <QHBoxLayout>
#include <QPushButton>
@@
-33,7
+32,7
@@
#include <pv/widgets/popup.h>
#include <pv/widgets/popup.h>
-struct sr_
probe
_group;
+struct sr_
channel
_group;
class QCheckBox;
class QGridLayout;
class QCheckBox;
class QGridLayout;
@@
-64,11
+63,11
@@
public:
private:
void set_all_probes(bool set);
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:
void showEvent(QShowEvent *e);
@@
-86,9
+85,9
@@
private:
bool _updating_probes;
bool _updating_probes;
- std::vector<
boost
::shared_ptr<pv::prop::binding::DeviceOptions> >
+ std::vector<
std
::shared_ptr<pv::prop::binding::DeviceOptions> >
_group_bindings;
_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;
_check_box_signal_map;
QHBoxLayout _buttons_bar;