X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=d554b4c181fefc9b12f56ee214e5acc839777766;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hp=c9e8d82c9ba832e1e90b6b209860b2f07767d858;hpb=85843b14c48affe67820ec8c9e357cd26e0ed943;p=pulseview.git

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index c9e8d82..d554b4c 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 <boost/foreach.hpp>
+#include <cassert>
 
 #include <libsigrok/libsigrok.h>
 
@@ -34,8 +34,8 @@ extern "C" {
 #include <libsigrok/libsigrok.h>
 }
 
-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<device::Device> Connect::get_selected_device() const
 		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;
@@ -175,7 +174,7 @@ void Connect::scan_pressed()
 
 	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();
@@ -184,9 +183,9 @@ void Connect::scan_pressed()
 		const string title = dev_inst->format_device_title();
 		QString text = QString::fromUtf8(title.c_str());
 
-		if (sdi->probes) {
-			text += QString(" with %1 probes").arg(
-				g_slist_length(sdi->probes));
+		if (sdi->channels) {
+			text += QString(" with %1 channels").arg(
+				g_slist_length(sdi->channels));
 		}
 
 		QListWidgetItem *const item = new QListWidgetItem(text,