projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: document the purpose of sampling_mutex_.
[pulseview.git]
/
pv
/
popups
/
deviceoptions.cpp
diff --git
a/pv/popups/deviceoptions.cpp
b/pv/popups/deviceoptions.cpp
index 13055fc0e8cdee6c27e9d99b233064876f52e170..fe7955159990c81f6b6646786636dd965f0a6f8b 100644
(file)
--- a/
pv/popups/deviceoptions.cpp
+++ b/
pv/popups/deviceoptions.cpp
@@
-18,35
+18,36
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "deviceoptions.h"
-
-#include <boost/foreach.hpp>
+#include "deviceoptions.hpp"
#include <QFormLayout>
#include <QListWidget>
#include <QFormLayout>
#include <QListWidget>
-#include <pv/prop/property.h>
+#include <pv/prop/property.hpp>
+
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
+using std::shared_ptr;
-using
boost::shared_ptr
;
+using
sigrok::Device
;
namespace pv {
namespace popups {
namespace pv {
namespace popups {
-DeviceOptions::DeviceOptions(shared_ptr<device::DevInst> dev_inst,
- QWidget *parent) :
+DeviceOptions::DeviceOptions(shared_ptr<Device> device, QWidget *parent) :
Popup(parent),
Popup(parent),
-
_dev_inst(dev_inst
),
-
_layout
(this),
-
_binding(dev_inst
)
+
device_(device
),
+
layout_
(this),
+
binding_(device
)
{
{
- setLayout(&
_layout
);
+ setLayout(&
layout_
);
-
_layout.addWidget(_binding
.get_property_form(this, true));
+
layout_.addWidget(binding_
.get_property_form(this, true));
}
}
-pv::
prop::binding::DeviceOptions
& DeviceOptions::binding()
+pv::
binding::Device
& DeviceOptions::binding()
{
{
- return
_binding
;
+ return
binding_
;
}
} // namespace popups
}
} // namespace popups