projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor whitespace fixes.
[pulseview.git]
/
pv
/
popups
/
deviceoptions.cpp
diff --git
a/pv/popups/deviceoptions.cpp
b/pv/popups/deviceoptions.cpp
index ac7c2b78f3c3eb0245e77e3d6dc248e47264e801..a92b0aea8058f966a33ad68726c8a2474e61e758 100644
(file)
--- a/
pv/popups/deviceoptions.cpp
+++ b/
pv/popups/deviceoptions.cpp
@@
-18,30
+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 <libsigrok/libsigrok.hpp>
+
+using std::shared_ptr;
-using namespace boost;
-using namespace std;
+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
),
-
_layout
(this),
-
_binding(sdi
)
+
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()
+{
+ return binding_;
}
} // namespace popups
}
} // namespace popups