From a1039de35e7658d51b3e23c8a5226a0e679ed028 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 1 Feb 2024 18:29:11 +0100 Subject: [PATCH] DeviceProcessSignalOperation: Replace QSharedPointer with std::shared_ptr According to https://wiki.qt.io/Things_To_Look_Out_For_In_Reviews QSharedPointer impl is poor and it's going to be removed from Qt 7. Change-Id: I606a490be4d6ba2611288cced82ba8c72d146eec Reviewed-by: Reviewed-by: hjk --- src/plugins/debugger/gdb/gdbengine.cpp | 2 +- src/plugins/projectexplorer/devicesupport/idevice.h | 4 +--- src/plugins/projectexplorer/devicesupport/processlist.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 4e56bc6e0f5..e8af138c863 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -678,7 +678,7 @@ void GdbEngine::interruptInferior() QTC_ASSERT(dev, notifyInferiorStopFailed(); return); DeviceProcessSignalOperation::Ptr signalOperation = dev->signalOperation(); QTC_ASSERT(signalOperation, notifyInferiorStopFailed(); return); - connect(signalOperation.data(), &DeviceProcessSignalOperation::finished, + connect(signalOperation.get(), &DeviceProcessSignalOperation::finished, this, [this, signalOperation](const QString &error) { if (error.isEmpty()) { showMessage("Interrupted " + QString::number(inferiorPid())); diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h index 1edd702444d..8ebbb36f753 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.h +++ b/src/plugins/projectexplorer/devicesupport/idevice.h @@ -19,11 +19,9 @@ #include #include #include -#include #include #include -#include QT_BEGIN_NAMESPACE class QPixmap; @@ -58,7 +56,7 @@ class PROJECTEXPLORER_EXPORT DeviceProcessSignalOperation : public QObject { Q_OBJECT public: - using Ptr = QSharedPointer; + using Ptr = std::shared_ptr; virtual void killProcess(qint64 pid) = 0; virtual void killProcess(const QString &filePath) = 0; diff --git a/src/plugins/projectexplorer/devicesupport/processlist.cpp b/src/plugins/projectexplorer/devicesupport/processlist.cpp index b707b9b2569..71711b0d517 100644 --- a/src/plugins/projectexplorer/devicesupport/processlist.cpp +++ b/src/plugins/projectexplorer/devicesupport/processlist.cpp @@ -95,7 +95,7 @@ void ProcessList::killProcess(int row) const ProcessInfo processInfo = at(row); d->signalOperation = d->device->signalOperation(); - connect(d->signalOperation.data(), &DeviceProcessSignalOperation::finished, + connect(d->signalOperation.get(), &DeviceProcessSignalOperation::finished, this, &ProcessList::reportDelayedKillStatus); d->signalOperation->killProcess(processInfo.processId); }