X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=d554b4c181fefc9b12f56ee214e5acc839777766;hb=9ab0d1f7b53d4e10f6ee7abd0b02816eafac5f99;hp=611c9cc50d7f3fb10a81963f1a4138de06b9064b;hpb=4871ed92f2d9e6e514223383ba16e6ad78c81161;p=pulseview.git diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp index 611c9cc5..d554b4c1 100644 --- 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 */ -#include +#include #include @@ -34,8 +34,8 @@ extern "C" { #include } -using boost::shared_ptr; using std::list; +using std::shared_ptr; using std::string; extern sr_context *sr_ctx; @@ -92,8 +92,7 @@ shared_ptr Connect::get_selected_device() const Qt::UserRole).value(); assert(sdi); - std::map >:: - const_iterator iter = _device_map.find(sdi); + const auto iter = _device_map.find(sdi); assert(iter != _device_map.end()); return (*iter).second; @@ -175,7 +174,7 @@ void Connect::scan_pressed() g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts); - BOOST_FOREACH(shared_ptr dev_inst, devices) + for (shared_ptr dev_inst : devices) { 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) { - text += QString(" with %1 probes").arg( + text += QString(" with %1 channels").arg( g_slist_length(sdi->channels)); }