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>
This commit is contained in:
Jarek Kobus
2024-02-01 21:55:11 +01:00
parent 6f115faa05
commit 536046ebb2
4 changed files with 7 additions and 10 deletions

View File

@@ -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};

View File

@@ -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

View File

@@ -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,

View File

@@ -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;