From 8a2d9e8e7c2371d85b4b03201263517a474256a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Fri, 21 Feb 2020 11:27:25 -0300 Subject: [PATCH] devicemanager: Use shared pointer over raw pointer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/devicemanager/devicemanager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/devicemanager/devicemanager.cpp b/src/devicemanager/devicemanager.cpp index d8ab169c8..2252f9e76 100644 --- a/src/devicemanager/devicemanager.cpp +++ b/src/devicemanager/devicemanager.cpp @@ -29,8 +29,8 @@ DeviceManager::DeviceManager() void DeviceManager::append(const LinkConfiguration& linkConf, const QString& deviceName, const QString& detectorName) { for (int i {0}; i < _sensors[Connection].size(); i++) { - const auto vectorLinkConf = _sensors[Connection][i].value>().get(); - if (*vectorLinkConf == linkConf) { + const auto vectorLinkConf = _sensors[Connection][i].value>(); + if (!vectorLinkConf.isNull() && *vectorLinkConf == linkConf) { qCDebug(DEVICEMANAGER) << "Connection configuration already exist for:" << _sensors[Name][i] << linkConf << linkConf.argsAsConst(); _sensors[Available][i] = true; @@ -171,8 +171,8 @@ void DeviceManager::updateAvailableConnections( for (const auto& link : availableLinkConfigurations) { const bool sameSerialDevice = std::any_of( _sensors[Connection].cbegin(), _sensors[Connection].cend(), [&link](const QVariant& variantLink) { - const auto sensorLink = variantLink.value>().get(); - qCDebug(DEVICEMANAGER) << "Device" << sensorLink + const auto sensorLink = variantLink.value>(); + qCDebug(DEVICEMANAGER) << "Device" << *sensorLink << "already already provided by a different connection:" << link; return link.serialPort() == sensorLink->serialPort() && link != *sensorLink; });