projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Use a QTabWidget to display the QDockWidgets
[pulseview.git]
/
pv
/
popups
/
deviceoptions.cpp
diff --git
a/pv/popups/deviceoptions.cpp
b/pv/popups/deviceoptions.cpp
index bdc0ab23ed48366353fc14c0b01daaa899d1fbdd..fe7955159990c81f6b6646786636dd965f0a6f8b 100644
(file)
--- a/
pv/popups/deviceoptions.cpp
+++ b/
pv/popups/deviceoptions.cpp
@@
-18,14
+18,14
@@
* 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 "deviceoptions.h
pp
"
#include <QFormLayout>
#include <QListWidget>
#include <QFormLayout>
#include <QListWidget>
-#include <pv/prop/property.h>
+#include <pv/prop/property.h
pp
>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using std::shared_ptr;
using std::shared_ptr;
@@
-45,7
+45,7
@@
DeviceOptions::DeviceOptions(shared_ptr<Device> device, QWidget *parent) :
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_;
}