X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=4d33cc9f3b6d1d2e1ebbc798147f53e307d80744;hb=7bb0fbf4d3809dbbd0fe5b35fc7e475b1065ae20;hp=5baedcbcacaa1a2e06c52050419f5c77158b906d;hpb=3d79f521396c8e908fd237f5328153165099f5c3;p=pulseview.git

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index 5baedcb..4d33cc9 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -106,10 +106,10 @@ void Connect::populate_drivers()
 		 * @todo Add support for non-monotonic devices i.e. DMMs
 		 * and sensors.
 		 */
-		bool supported_device = driver->config_check(
-			ConfigKey::LOGIC_ANALYZER, ConfigKey::DEVICE_OPTIONS) |
-					driver->config_check(
-			ConfigKey::OSCILLOSCOPE, ConfigKey::DEVICE_OPTIONS);
+		const auto keys = driver->config_keys();
+
+		bool supported_device = keys.count(ConfigKey::LOGIC_ANALYZER) |
+			keys.count(ConfigKey::OSCILLOSCOPE);
 
 		if (supported_device)
 			drivers_.addItem(QString("%1 (%2)").arg(
@@ -172,8 +172,7 @@ void Connect::scan_pressed()
 	const list< shared_ptr<HardwareDevice> > devices =
 		device_manager_.driver_scan(driver, drvopts);
 
-	for (shared_ptr<HardwareDevice> device : devices)
-	{
+	for (shared_ptr<HardwareDevice> device : devices) {
 		assert(device);
 
 		QString text = QString::fromStdString(
@@ -198,7 +197,7 @@ void Connect::device_selected(int index)
 
 	unset_connection();
 
-	if (driver->config_check(ConfigKey::SERIALCOMM, ConfigKey::SCAN_OPTIONS))
+	if (driver->scan_options().count(ConfigKey::SERIALCOMM))
 		set_serial_connection(driver);
 }