Modified header guards to match file names

[pulseview.git] / pv / devicemanager.cpp

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 7cb90bb8b9b8d9a964883b6f53d31c93071bbf3b..c7111e865e9f4bc10f5b8f0e83f03a9d47153b21 100644 (file)
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -27,7 +27,7 @@
 #include <string>
 #include <vector>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/filesystem.hpp>
@@ -209,17 +209,16 @@ void DeviceManager::build_display_name(shared_ptr<Device> device)
        full_names_[device] = join(parts, " ");
 
        // Next, build the display name. It only contains fields as required.
-       bool multiple_dev = false;
 
        // If we can find another device with the same model/vendor then
        // we have at least two such devices and need to distinguish them.
-       if (hardware_device)
-               multiple_dev = any_of(devices_.begin(), devices_.end(),
-                       [&](shared_ptr<HardwareDevice> dev) {
+       const bool multiple_dev = hardware_device && any_of(
+               devices_.begin(), devices_.end(),
+               [&](shared_ptr<HardwareDevice> dev) {
                        return (dev->vendor() == hardware_device->vendor() &&
-                       dev->model() == hardware_device->model()) &&
-                       dev != hardware_device;
-                       } );
+                               dev->model() == hardware_device->model()) &&
+                               dev != hardware_device;
+               } );
 
        parts = {device->vendor(), device->model()};