Various minor whitespace and consistency fixes.

[pulseview.git] / pv / dialogs / connect.cpp

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index 20836901b006a981cebb107d88054e51ef98a899..bf92998b9b9e65fd7cd1ecf0d1d1c1564914f347 100644 (file)
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -108,7 +108,7 @@ void Connect::populate_drivers()
                 */
                bool supported_device = driver->config_check(
                        ConfigKey::LOGIC_ANALYZER, ConfigKey::DEVICE_OPTIONS) |
-                                       driver->config_check(
+                                       driver->config_check(
                        ConfigKey::OSCILLOSCOPE, ConfigKey::DEVICE_OPTIONS);
 
                if (supported_device)
@@ -172,12 +172,11 @@ 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(
-                       device_manager_.get_display_name(device));
+                       device->display_name(device_manager_));
                text += QString(" with %1 channels").arg(
                        device->device()->channels().size());