projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set PopupToolButton::_popup to NULL at construction
[pulseview.git]
/
pv
/
dialogs
/
connect.cpp
diff --git
a/pv/dialogs/connect.cpp
b/pv/dialogs/connect.cpp
index 11cf0e7b5de3e211643d62d6697ec9b6b80f1c10..c9e8d82c9ba832e1e90b6b209860b2f07767d858 100644
(file)
--- a/
pv/dialogs/connect.cpp
+++ b/
pv/dialogs/connect.cpp
@@
-25,7
+25,7
@@
#include "connect.h"
#include "pv/devicemanager.h"
#include "connect.h"
#include "pv/devicemanager.h"
-#include "pv/devi
nst
.h"
+#include "pv/devi
ce/device
.h"
extern "C" {
/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
extern "C" {
/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
@@
-82,17
+82,17
@@
Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
_layout.addWidget(&_button_box);
}
_layout.addWidget(&_button_box);
}
-shared_ptr<
DevInst
> Connect::get_selected_device() const
+shared_ptr<
device::Device
> Connect::get_selected_device() const
{
const QListWidgetItem *const item = _device_list.currentItem();
if (!item)
{
const QListWidgetItem *const item = _device_list.currentItem();
if (!item)
- return shared_ptr<
DevInst
>();
+ return shared_ptr<
device::Device
>();
const sr_dev_inst *const sdi = (sr_dev_inst*)item->data(
Qt::UserRole).value<void*>();
assert(sdi);
const sr_dev_inst *const sdi = (sr_dev_inst*)item->data(
Qt::UserRole).value<void*>();
assert(sdi);
- std::map<const sr_dev_inst*, boost::shared_ptr<pv::
DevInst
> >::
+ std::map<const sr_dev_inst*, boost::shared_ptr<pv::
device::Device
> >::
const_iterator iter = _device_map.find(sdi);
assert(iter != _device_map.end());
const_iterator iter = _device_map.find(sdi);
assert(iter != _device_map.end());
@@
-170,12
+170,12
@@
void Connect::scan_pressed()
drvopts = g_slist_append(drvopts, src);
}
drvopts = g_slist_append(drvopts, src);
}
- const list< shared_ptr<
DevInst> > devices = _device_manager.driver_scan(
- driver, drvopts);
+ const list< shared_ptr<
device::Device> > devices =
+
_device_manager.driver_scan(
driver, drvopts);
g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
- BOOST_FOREACH(shared_ptr<
DevInst
> dev_inst, devices)
+ BOOST_FOREACH(shared_ptr<
device::Device
> dev_inst, devices)
{
assert(dev_inst);
const sr_dev_inst *const sdi = dev_inst->dev_inst();
{
assert(dev_inst);
const sr_dev_inst *const sdi = dev_inst->dev_inst();