aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/baremetal
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2024-02-01 20:09:12 +0100
committerJarek Kobus <jaroslaw.kobus@qt.io>2024-02-02 16:45:57 +0000
commit656a30b407a7098830ae1f50a2079c9bf3809e87 (patch)
tree81860a54b6a9b9a09c857c8946c12ffb382c6cff /src/plugins/baremetal
parent9fe7922d3befd2273b1f8fceadee801754d1c139 (diff)
IDevice: 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. Replace QWeakPointer with std::weak_ptr. Replace QEnableSharedFromThis with std::enable_shared_from_this. Use std::static_pointer_cast and std::dynamic_pointer_cast for casts used with QSharedPointer before. Change-Id: If255a100c790860934f36d52906b93f33c31cfe8 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/baremetal')
-rw-r--r--src/plugins/baremetal/baremetaldebugsupport.cpp4
-rw-r--r--src/plugins/baremetal/baremetaldevice.cpp2
-rw-r--r--src/plugins/baremetal/baremetaldevice.h4
-rw-r--r--src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/baremetal/baremetaldebugsupport.cpp b/src/plugins/baremetal/baremetaldebugsupport.cpp
index 6593797b90..e3d32b3d5c 100644
--- a/src/plugins/baremetal/baremetaldebugsupport.cpp
+++ b/src/plugins/baremetal/baremetaldebugsupport.cpp
@@ -39,7 +39,7 @@ public:
explicit BareMetalDebugSupport(RunControl *runControl)
: Debugger::DebuggerRunTool(runControl)
{
- const auto dev = qSharedPointerCast<const BareMetalDevice>(device());
+ const auto dev = std::static_pointer_cast<const BareMetalDevice>(device());
if (!dev) {
reportFailure(Tr::tr("Cannot debug: Kit has no device."));
return;
@@ -59,7 +59,7 @@ public:
private:
void start() final
{
- const auto dev = qSharedPointerCast<const BareMetalDevice>(device());
+ const auto dev = std::static_pointer_cast<const BareMetalDevice>(device());
QTC_ASSERT(dev, reportFailure(); return);
IDebugServerProvider *p = DebugServerProviderManager::findProvider(
dev->debugServerProviderId());
diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp
index eebdb94982..8a34afd3d0 100644
--- a/src/plugins/baremetal/baremetaldevice.cpp
+++ b/src/plugins/baremetal/baremetaldevice.cpp
@@ -90,7 +90,7 @@ Store BareMetalDevice::toMap() const
IDeviceWidget *BareMetalDevice::createWidget()
{
- return new BareMetalDeviceConfigurationWidget(sharedFromThis());
+ return new BareMetalDeviceConfigurationWidget(shared_from_this());
}
// Factory
diff --git a/src/plugins/baremetal/baremetaldevice.h b/src/plugins/baremetal/baremetaldevice.h
index fdf6cb193c..f535d8ebe2 100644
--- a/src/plugins/baremetal/baremetaldevice.h
+++ b/src/plugins/baremetal/baremetaldevice.h
@@ -11,8 +11,8 @@ namespace BareMetal::Internal {
class BareMetalDevice final : public ProjectExplorer::IDevice
{
public:
- using Ptr = QSharedPointer<BareMetalDevice>;
- using ConstPtr = QSharedPointer<const BareMetalDevice>;
+ using Ptr = std::shared_ptr<BareMetalDevice>;
+ using ConstPtr = std::shared_ptr<const BareMetalDevice>;
static Ptr create() { return Ptr(new BareMetalDevice); }
~BareMetalDevice() final;
diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
index 02f56da694..5a8c516e17 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
@@ -19,7 +19,7 @@ BareMetalDeviceConfigurationWidget::BareMetalDeviceConfigurationWidget(
const ProjectExplorer::IDevice::Ptr &deviceConfig)
: IDeviceWidget(deviceConfig)
{
- const auto dev = qSharedPointerCast<const BareMetalDevice>(device());
+ const auto dev = std::static_pointer_cast<const BareMetalDevice>(device());
QTC_ASSERT(dev, return);
const auto formLayout = new QFormLayout(this);
@@ -36,7 +36,7 @@ BareMetalDeviceConfigurationWidget::BareMetalDeviceConfigurationWidget(
void BareMetalDeviceConfigurationWidget::debugServerProviderChanged()
{
- const auto dev = qSharedPointerCast<BareMetalDevice>(device());
+ const auto dev = std::static_pointer_cast<BareMetalDevice>(device());
QTC_ASSERT(dev, return);
dev->setDebugServerProviderId(m_debugServerProviderChooser->currentProviderId());
}