feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DeviceProcessSignalOperation: Replace QSharedPointer with std::shared_ptr

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2024-02-01 18:29:11 +01:00
parent 3433ee2d4d
commit a1039de35e
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -678,7 +678,7 @@ void GdbEngine::interruptInferior()
QTC_ASSERT(dev, notifyInferiorStopFailed(); return); QTC_ASSERT(dev, notifyInferiorStopFailed(); return);
DeviceProcessSignalOperation::Ptr signalOperation = dev->signalOperation(); DeviceProcessSignalOperation::Ptr signalOperation = dev->signalOperation();
QTC_ASSERT(signalOperation, notifyInferiorStopFailed(); return); QTC_ASSERT(signalOperation, notifyInferiorStopFailed(); return);
connect(signalOperation.data(), &DeviceProcessSignalOperation::finished, connect(signalOperation.get(), &DeviceProcessSignalOperation::finished,
this, [this, signalOperation](const QString &error) { this, [this, signalOperation](const QString &error) {
if (error.isEmpty()) { if (error.isEmpty()) {
showMessage("Interrupted " + QString::number(inferiorPid())); showMessage("Interrupted " + QString::number(inferiorPid()));

4
src/plugins/projectexplorer/devicesupport/idevice.h
View File

@@ -19,11 +19,9 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QList> #include <QList>
#include <QObject> #include <QObject>
#include <QSharedPointer>
#include <QUrl> #include <QUrl>
#include <functional> #include <functional>
#include <memory>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QPixmap; class QPixmap;
@@ -58,7 +56,7 @@ class PROJECTEXPLORER_EXPORT DeviceProcessSignalOperation : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
using Ptr = QSharedPointer<DeviceProcessSignalOperation>; using Ptr = std::shared_ptr<DeviceProcessSignalOperation>;
virtual void killProcess(qint64 pid) = 0; virtual void killProcess(qint64 pid) = 0;
virtual void killProcess(const QString &filePath) = 0; virtual void killProcess(const QString &filePath) = 0;

2
src/plugins/projectexplorer/devicesupport/processlist.cpp
View File

@@ -95,7 +95,7 @@ void ProcessList::killProcess(int row)
const ProcessInfo processInfo = at(row); const ProcessInfo processInfo = at(row);
d->signalOperation = d->device->signalOperation(); d->signalOperation = d->device->signalOperation();
connect(d->signalOperation.data(), &DeviceProcessSignalOperation::finished, connect(d->signalOperation.get(), &DeviceProcessSignalOperation::finished,
this, &ProcessList::reportDelayedKillStatus); this, &ProcessList::reportDelayedKillStatus);
d->signalOperation->killProcess(processInfo.processId); d->signalOperation->killProcess(processInfo.processId);
} }