projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename 'probe' to 'channel' everywhere.
[pulseview.git]
/
pv
/
dialogs
/
connect.cpp
diff --git
a/pv/dialogs/connect.cpp
b/pv/dialogs/connect.cpp
index 611c9cc50d7f3fb10a81963f1a4138de06b9064b..d554b4c181fefc9b12f56ee214e5acc839777766 100644
(file)
--- a/
pv/dialogs/connect.cpp
+++ b/
pv/dialogs/connect.cpp
@@
-18,7
+18,7
@@
* 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 <
boost/foreach.hpp
>
+#include <
cassert
>
#include <libsigrok/libsigrok.h>
#include <libsigrok/libsigrok.h>
@@
-34,8
+34,8
@@
extern "C" {
#include <libsigrok/libsigrok.h>
}
#include <libsigrok/libsigrok.h>
}
-using boost::shared_ptr;
using std::list;
using std::list;
+using std::shared_ptr;
using std::string;
extern sr_context *sr_ctx;
using std::string;
extern sr_context *sr_ctx;
@@
-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;
@@
-175,7
+174,7
@@
void Connect::scan_pressed()
g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
-
BOOST_FOREACH(shared_ptr<device::Device> dev_inst,
devices)
+
for (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();
@@
-185,7
+184,7
@@
void Connect::scan_pressed()
QString text = QString::fromUtf8(title.c_str());
if (sdi->channels) {
QString text = QString::fromUtf8(title.c_str());
if (sdi->channels) {
- text += QString(" with %1
probe
s").arg(
+ text += QString(" with %1
channel
s").arg(
g_slist_length(sdi->channels));
}
g_slist_length(sdi->channels));
}