projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed pv::binding::DeviceOptions and DecoderOptions to Device and Decoder
[pulseview.git]
/
pv
/
popups
/
deviceoptions.hpp
diff --git
a/pv/popups/deviceoptions.hpp
b/pv/popups/deviceoptions.hpp
index 94ce7afd6f54fc7be5c3dfb0c16c6923242127b2..f840e83f3133e8ab7ad8e29bd4c0106daa75f874 100644
(file)
--- a/
pv/popups/deviceoptions.hpp
+++ b/
pv/popups/deviceoptions.hpp
@@
-24,7
+24,7
@@
#include <QGroupBox>
#include <QVBoxLayout>
#include <QGroupBox>
#include <QVBoxLayout>
-#include <pv/binding/device
options
.hpp>
+#include <pv/binding/device.hpp>
#include <pv/widgets/popup.hpp>
namespace sigrok {
#include <pv/widgets/popup.hpp>
namespace sigrok {
@@
-42,14
+42,14
@@
public:
DeviceOptions(std::shared_ptr<sigrok::Device> device,
QWidget *parent);
DeviceOptions(std::shared_ptr<sigrok::Device> device,
QWidget *parent);
- pv::binding::Device
Options
& binding();
+ pv::binding::Device& binding();
private:
std::shared_ptr<sigrok::Device> device_;
QVBoxLayout layout_;
private:
std::shared_ptr<sigrok::Device> device_;
QVBoxLayout layout_;
- pv::binding::Device
Options
binding_;
+ pv::binding::Device binding_;
};
} // namespace popups
};
} // namespace popups