From 9e966706dd5673fdfdb620a0ee8bb7fcec34197e Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 1 Feb 2024 16:47:37 +0100 Subject: [PATCH] QmakeProjectManager: 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: Ia94370bef54b4c73984ab2d5caa3565c6dea54e3 Reviewed-by: hjk --- .../customwidgetwizard/customwidgetpluginwizardpage.cpp | 4 ++-- .../customwidgetwizard/customwidgetpluginwizardpage.h | 3 +-- .../customwidgetwizard/customwidgetwizarddialog.cpp | 4 ++-- .../customwidgetwizard/customwidgetwizarddialog.h | 5 +---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp index d0885dfc839..8461376e7ce 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp @@ -102,9 +102,9 @@ void CustomWidgetPluginWizardPage::setCollectionEnabled(bool enColl) m_collectionSourceEdit->setEnabled(enColl); } -QSharedPointer CustomWidgetPluginWizardPage::basicPluginOptions() const +std::shared_ptr CustomWidgetPluginWizardPage::basicPluginOptions() const { - QSharedPointer po(new PluginOptions); + std::shared_ptr po(new PluginOptions); po->pluginName = pluginName(); po->resourceFile = m_resourceFileEdit->text(); po->collectionClassName = collectionClassName(); diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h index 8a060f9b802..cb25a1b5208 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h @@ -6,7 +6,6 @@ #include "filenamingparameters.h" #include -#include QT_BEGIN_NAMESPACE class QLineEdit; @@ -34,7 +33,7 @@ public: void setFileNamingParameters(const FileNamingParameters &fnp) {m_fileNamingParameters = fnp; } // Fills the plugin fields, excluding widget list. - QSharedPointer basicPluginOptions() const; + std::shared_ptr basicPluginOptions() const; private: void slotCheckCompleteness(); diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp index 62bc9628f42..d8d742267c1 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp @@ -57,9 +57,9 @@ void CustomWidgetWizardDialog::slotCurrentIdChanged(int id) m_pluginPage->init(m_widgetsPage); } -QSharedPointer CustomWidgetWizardDialog::pluginOptions() const +std::shared_ptr CustomWidgetWizardDialog::pluginOptions() const { - QSharedPointer rc = m_pluginPage->basicPluginOptions(); + std::shared_ptr rc = m_pluginPage->basicPluginOptions(); rc->widgetOptions = m_widgetsPage->widgetOptions(); return rc; } diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h index 11144682104..6fcf38cba78 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h @@ -5,8 +5,6 @@ #include "../wizards/qtwizard.h" -#include - namespace QmakeProjectManager { namespace Internal { @@ -24,8 +22,7 @@ public: QWidget *parent, const Core::WizardDialogParameters ¶meters); - QSharedPointer pluginOptions() const; - + std::shared_ptr pluginOptions() const; FileNamingParameters fileNamingParameters() const; void setFileNamingParameters(const FileNamingParameters &fnp);