diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2024-02-01 18:29:11 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2024-02-02 08:03:15 +0000 |
| commit | a1039de35e7658d51b3e23c8a5226a0e679ed028 (patch) | |
| tree | 81973534e3f5fef387d9700ce2b2d00246cdb038 | |
| parent | 3433ee2d4d51ae17cf523b765e713e20790ca16b (diff) | |
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: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/plugins/debugger/gdb/gdbengine.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/devicesupport/idevice.h | 4 | ||||
| -rw-r--r-- | 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 4e56bc6e0f..e8af138c86 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 1edd702444..8ebbb36f75 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.h +++ b/src/plugins/projectexplorer/devicesupport/idevice.h @@ -19,11 +19,9 @@ #include <QCoreApplication> #include <QList> #include <QObject> -#include <QSharedPointer> #include <QUrl> #include <functional> -#include <memory> QT_BEGIN_NAMESPACE class QPixmap; @@ -58,7 +56,7 @@ class PROJECTEXPLORER_EXPORT DeviceProcessSignalOperation : public QObject { Q_OBJECT public: - using Ptr = QSharedPointer<DeviceProcessSignalOperation>; + using Ptr = std::shared_ptr<DeviceProcessSignalOperation>; 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 b707b9b256..71711b0d51 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); } |