From 656a30b407a7098830ae1f50a2079c9bf3809e87 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 1 Feb 2024 20:09:12 +0100 Subject: 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 --- src/plugins/docker/dockerdevice.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/plugins/docker/dockerdevice.h') diff --git a/src/plugins/docker/dockerdevice.h b/src/plugins/docker/dockerdevice.h index ab88d0b9d00..ee4334b55b6 100644 --- a/src/plugins/docker/dockerdevice.h +++ b/src/plugins/docker/dockerdevice.h @@ -3,8 +3,6 @@ #pragma once -#include "dockersettings.h" - #include #include @@ -42,8 +40,8 @@ public: class DockerDevice : public ProjectExplorer::IDevice { public: - using Ptr = QSharedPointer; - using ConstPtr = QSharedPointer; + using Ptr = std::shared_ptr; + using ConstPtr = std::shared_ptr; explicit DockerDevice(std::unique_ptr settings); ~DockerDevice(); @@ -104,7 +102,7 @@ public: private: QMutex m_deviceListMutex; - std::vector> m_existingDevices; + std::vector> m_existingDevices; }; } // namespace Docker::Internal -- cgit v1.2.3