projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use Qt-defined keywords, they can cause problems with other headers.
[pulseview.git]
/
pv
/
popups
/
deviceoptions.h
diff --git
a/pv/popups/deviceoptions.h
b/pv/popups/deviceoptions.h
index 945959b24eb7372c52c41c0b904b3cf18d3b9497..deedf587854c5af7570643c1892af4d93a65bf80 100644
(file)
--- a/
pv/popups/deviceoptions.h
+++ b/
pv/popups/deviceoptions.h
@@
-35,13
+35,13
@@
class DeviceOptions : public pv::widgets::Popup
Q_OBJECT
public:
Q_OBJECT
public:
- DeviceOptions(
boost
::shared_ptr<device::DevInst> dev_inst,
+ DeviceOptions(
std
::shared_ptr<device::DevInst> dev_inst,
QWidget *parent);
pv::prop::binding::DeviceOptions& binding();
private:
QWidget *parent);
pv::prop::binding::DeviceOptions& binding();
private:
-
boost
::shared_ptr<device::DevInst> _dev_inst;
+
std
::shared_ptr<device::DevInst> _dev_inst;
QVBoxLayout _layout;
QVBoxLayout _layout;