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 e5cc3dd70c088c9ad698229aaac3d3da26e8d9a1..bf92998b9b9e65fd7cd1ecf0d1d1c1564914f347 100644 (file)
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -24,7 +24,8 @@
 
 #include "connect.hpp"
 
-#include "pv/devicemanager.hpp"
+#include <pv/devicemanager.hpp>
+#include <pv/devices/hardwaredevice.hpp>
 
 using std::list;
 using std::map;
@@ -38,7 +39,8 @@ using Glib::VariantBase;
 using sigrok::ConfigKey;
 using sigrok::Driver;
 using sigrok::Error;
-using sigrok::HardwareDevice;
+
+using pv::devices::HardwareDevice;
 
 namespace pv {
 namespace dialogs {
@@ -106,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)
@@ -167,16 +169,16 @@ void Connect::scan_pressed()
                        serial.toUtf8().constData());
        }
 
-       list< shared_ptr<HardwareDevice> > devices =
+       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));
-               text += QString(" with %1 channels").arg(device->channels().size());
+                       device->display_name(device_manager_));
+               text += QString(" with %1 channels").arg(
+                       device->device()->channels().size());
 
                QListWidgetItem *const item = new QListWidgetItem(text,
                        &device_list_);