Fix QScopedPointer deprecation warnings

Port away from QScopedPointer and use std::unique_ptr instead.
The warnings surfaced after QScopedPointer::take() deprecation
in qtbase (commit 612a01be6513894ab1ec5a36b699a2142ba7f35c).

Change-Id: I83307bf37878432f84be6c561bfaf5da70db6c3b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>

3 files changed, 5 insertions, 7 deletions

diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp
index 9b34fac..677e7e2 100644
--- a/src/tools/canbusutil/canbusutil.cpp
+++ b/src/tools/canbusutil/canbusutil.cpp
@@ -82,7 +82,7 @@ bool CanBusUtil::start(const QString &pluginName, const QString &deviceName, con
     if (m_listening) {
         if (m_readTask->isShowFlags())
              m_canDevice->setConfigurationParameter(QCanBusDevice::CanFdKey, true);
-        connect(m_canDevice.data(), &QCanBusDevice::framesReceived,
+        connect(m_canDevice.get(), &QCanBusDevice::framesReceived,
                 m_readTask, &ReadTask::handleFrames);
     } else {
         if (!sendData())
@@ -212,7 +212,7 @@ bool CanBusUtil::connectCanDevice()
     for (auto i = m_configurationParameter.constBegin(); i != constEnd; ++i)
         m_canDevice->setConfigurationParameter(i.key(), i.value());
 
-    connect(m_canDevice.data(), &QCanBusDevice::errorOccurred, m_readTask, &ReadTask::handleError);
+    connect(m_canDevice.get(), &QCanBusDevice::errorOccurred, m_readTask, &ReadTask::handleError);
     if (!m_canDevice->connectDevice()) {
         m_output << tr("Cannot create CAN bus device: '%1'").arg(m_deviceName) << Qt::endl;
         return false;
diff --git a/src/tools/canbusutil/canbusutil.h b/src/tools/canbusutil/canbusutil.h
index 4d1b7f4..0c2ba8f 100644
--- a/src/tools/canbusutil/canbusutil.h
+++ b/src/tools/canbusutil/canbusutil.h
@@ -40,7 +40,6 @@
 #include "readtask.h"
 
 #include <QObject>
-#include <QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 
@@ -77,7 +76,7 @@ private:
     QString m_pluginName;
     QString m_deviceName;
     QString m_data;
-    QScopedPointer<QCanBusDevice> m_canDevice;
+    std::unique_ptr<QCanBusDevice> m_canDevice;
     ReadTask *m_readTask = nullptr;
     using ConfigurationParameter = QHash<QCanBusDevice::ConfigurationKey, QVariant>;
     ConfigurationParameter m_configurationParameter;
diff --git a/src/tools/canbusutil/main.cpp b/src/tools/canbusutil/main.cpp
index cbb7d7f..b3a44c5 100644
--- a/src/tools/canbusutil/main.cpp
+++ b/src/tools/canbusutil/main.cpp
@@ -40,7 +40,6 @@
 #include <QCommandLineParser>
 #include <QCoreApplication>
 #include <QTextStream>
-#include <QScopedPointer>
 
 #include <signal.h>
 
@@ -50,10 +49,10 @@ int main(int argc, char *argv[])
     QCoreApplication::setApplicationName(QStringLiteral("canbusutil"));
     QCoreApplication::setApplicationVersion(QStringLiteral(QT_VERSION_STR));
 
-    QScopedPointer<SigTermHandler> s(SigTermHandler::instance());
+    std::unique_ptr<SigTermHandler> s(SigTermHandler::instance());
     if (signal(SIGINT, SigTermHandler::handle) == SIG_ERR)
         return -1;
-    QObject::connect(s.data(), &SigTermHandler::sigTermSignal, &app, &QCoreApplication::quit);
+    QObject::connect(s.get(), &SigTermHandler::sigTermSignal, &app, &QCoreApplication::quit);
 
     QTextStream output(stdout);
     CanBusUtil util(output, app);