From 536046ebb284c122d00fd159acf7d3687e2744ee Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 1 Feb 2024 21:55:11 +0100
Subject: [PATCH] McuSupport: 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: I88a24afcca773e23d476466338543828337d65c2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/mcusupport/mcusupport_global.h       | 7 +++----
 src/plugins/mcusupport/mcusupportoptionspage.cpp | 5 ++---
 src/plugins/mcusupport/settingshandler.h         | 3 +--
 src/plugins/mcusupport/test/unittest.h           | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/plugins/mcusupport/mcusupport_global.h b/src/plugins/mcusupport/mcusupport_global.h
index ebff4dacf6d..4e17052200c 100644
--- a/src/plugins/mcusupport/mcusupport_global.h
+++ b/src/plugins/mcusupport/mcusupport_global.h
@@ -5,7 +5,6 @@
 
 #include <QList>
 #include <QSet>
-#include <QSharedPointer>
 #include <QVersionNumber>
 #include <QtGlobal>
 
@@ -21,9 +20,9 @@ class McuTarget;
 class McuAbstractPackage;
 class McuToolchainPackage;
 
-using McuPackagePtr = QSharedPointer<McuAbstractPackage>;
-using McuToolchainPackagePtr = QSharedPointer<McuToolchainPackage>;
-using McuTargetPtr = QSharedPointer<McuTarget>;
+using McuPackagePtr = std::shared_ptr<McuAbstractPackage>;
+using McuToolchainPackagePtr = std::shared_ptr<McuToolchainPackage>;
+using McuTargetPtr = std::shared_ptr<McuTarget>;
 
 static const QVersionNumber minimalVersion{2, 0, 0};
 static const QVersionNumber newVersion{2, 3};
diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp
index 1f63fa7c2ee..1383c737e71 100644
--- a/src/plugins/mcusupport/mcusupportoptionspage.cpp
+++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp
@@ -9,7 +9,6 @@
 #include "mcusupportsdk.h"
 #include "mcusupporttr.h"
 #include "mcutarget.h"
-#include "mcutargetfactory.h"
 #include "settingshandler.h"
 
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
@@ -277,8 +276,8 @@ void McuSupportOptionsWidget::showMcuTargetPackages()
 
     for (const auto &package : packages) {
         QWidget *packageWidget = package->widget();
-        QWeakPointer packagePtr(package);
-        connect(package.get(), &McuPackage::reset, this, [this, packagePtr] (){
+        std::weak_ptr packagePtr(package);
+        connect(package.get(), &McuPackage::reset, this, [this, packagePtr] {
             McuPackagePtr package = packagePtr.lock();
             if (package) {
                 MacroExpanderPtr macroExpander
diff --git a/src/plugins/mcusupport/settingshandler.h b/src/plugins/mcusupport/settingshandler.h
index 477f04da42a..c50dcde1e3c 100644
--- a/src/plugins/mcusupport/settingshandler.h
+++ b/src/plugins/mcusupport/settingshandler.h
@@ -5,7 +5,6 @@
 #include <utils/storekey.h>
 
 #include <QSettings>
-#include <QSharedPointer>
 
 namespace Utils { class FilePath; }
 
@@ -14,7 +13,7 @@ namespace McuSupport::Internal {
 class SettingsHandler
 {
 public:
-    using Ptr = QSharedPointer<SettingsHandler>;
+    using Ptr = std::shared_ptr<SettingsHandler>;
     virtual ~SettingsHandler() = default;
     virtual Utils::FilePath getPath(const Utils::Key &settingsKey,
                                     QSettings::Scope scope,
diff --git a/src/plugins/mcusupport/test/unittest.h b/src/plugins/mcusupport/test/unittest.h
index 77ade01e617..0ecf0e34e3a 100644
--- a/src/plugins/mcusupport/test/unittest.h
+++ b/src/plugins/mcusupport/test/unittest.h
@@ -119,7 +119,7 @@ private:
     McuPackagePtr freeRtosPackagePtr{freeRtosPackage};
     McuPackagePtr sdkPackagePtr{sdkPackage};
 
-    QSharedPointer<SettingsHandlerMock> settingsMockPtr{new SettingsHandlerMock};
+    std::shared_ptr<SettingsHandlerMock> settingsMockPtr{new SettingsHandlerMock};
     McuTargetFactory targetFactory;
     PackageDescription compilerDescription;
     PackageDescription toochainFileDescription;