projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced lengthy iterator types with the auto keyword
[pulseview.git]
/
pv
/
dialogs
/
connect.cpp
diff --git
a/pv/dialogs/connect.cpp
b/pv/dialogs/connect.cpp
index c9e8d82c9ba832e1e90b6b209860b2f07767d858..1dd8c5077301dbebde604aa64fa9463328df5573 100644
(file)
--- a/
pv/dialogs/connect.cpp
+++ b/
pv/dialogs/connect.cpp
@@
-92,8
+92,7
@@
shared_ptr<device::Device> Connect::get_selected_device() const
Qt::UserRole).value<void*>();
assert(sdi);
Qt::UserRole).value<void*>();
assert(sdi);
- std::map<const sr_dev_inst*, boost::shared_ptr<pv::device::Device> >::
- const_iterator iter = _device_map.find(sdi);
+ const auto iter = _device_map.find(sdi);
assert(iter != _device_map.end());
return (*iter).second;
assert(iter != _device_map.end());
return (*iter).second;
@@
-184,9
+183,9
@@
void Connect::scan_pressed()
const string title = dev_inst->format_device_title();
QString text = QString::fromUtf8(title.c_str());
const string title = dev_inst->format_device_title();
QString text = QString::fromUtf8(title.c_str());
- if (sdi->
probe
s) {
- text += QString(" with %1
probe
s").arg(
- g_slist_length(sdi->
probe
s));
+ if (sdi->
channel
s) {
+ text += QString(" with %1
channel
s").arg(
+ g_slist_length(sdi->
channel
s));
}
QListWidgetItem *const item = new QListWidgetItem(text,
}
QListWidgetItem *const item = new QListWidgetItem(text,