projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SigSession: Converted _signals_mutex into a boost::shared_mutex
[pulseview.git]
/
pv
/
popups
/
deviceoptions.cpp
diff --git
a/pv/popups/deviceoptions.cpp
b/pv/popups/deviceoptions.cpp
index c864865f4c854cea3ae96f8cec14286720c1cd35..3d069f799e1f40f9a6066148804c9e73f687109c 100644
(file)
--- a/
pv/popups/deviceoptions.cpp
+++ b/
pv/popups/deviceoptions.cpp
@@
-20,33
+20,34
@@
#include "deviceoptions.h"
#include "deviceoptions.h"
-#include <boost/foreach.hpp>
-
#include <QFormLayout>
#include <QListWidget>
#include <pv/prop/property.h>
#include <QFormLayout>
#include <QListWidget>
#include <pv/prop/property.h>
-using namespace boost;
-using namespace std;
+#include <libsigrok/libsigrok.hpp>
+
+using std::shared_ptr;
+
+using sigrok::Device;
namespace pv {
namespace popups {
namespace pv {
namespace popups {
-DeviceOptions::DeviceOptions(s
r_dev_inst *sdi
, QWidget *parent) :
+DeviceOptions::DeviceOptions(s
hared_ptr<Device> device
, QWidget *parent) :
Popup(parent),
Popup(parent),
- _
sdi(sdi
),
+ _
device(device
),
_layout(this),
_layout(this),
- _binding(
sdi
)
+ _binding(
device
)
{
setLayout(&_layout);
{
setLayout(&_layout);
- _layout.addWidget(_binding.get_property_form(this));
+ _layout.addWidget(_binding.get_property_form(this
, true
));
}
}
-
void DeviceOptions::closeEvent(QCloseEvent*
)
+
pv::prop::binding::DeviceOptions& DeviceOptions::binding(
)
{
{
-
_binding.commit()
;
+
return _binding
;
}
} // namespace popups
}
} // namespace popups