X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=d2cb2a313e24b8932c48a6e9ddb957f97109854c;hb=e28c998ea29145b290d8fcb5b5061c33f7ec80ef;hp=bf92998b9b9e65fd7cd1ecf0d1d1c1564914f347;hpb=2ad82c2e40b6865481733913a2c32735602f63c4;p=pulseview.git

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index bf92998b..d2cb2a31 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -106,14 +106,14 @@ 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(
-				driver->long_name().c_str()).arg(name.c_str()),
+				driver->long_name().c_str(), name.c_str()),
 				qVariantFromValue(driver));
 	}
 }
@@ -123,7 +123,7 @@ void Connect::populate_serials(shared_ptr<Driver> driver)
 	serial_devices_.clear();
 	for (auto serial : device_manager_.context()->serials(driver))
 		serial_devices_.addItem(QString("%1 (%2)").arg(
-			serial.first.c_str()).arg(serial.second.c_str()),
+			serial.first.c_str(), serial.second.c_str()),
 			QString::fromStdString(serial.first));
 }
 
@@ -197,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);
 }