From 6b57dce7a5dcf04408bf38562063157d024c0a0d Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 1 Feb 2024 17:34:36 +0100 Subject: [PATCH] Squish: 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: Ife415b57ac7b32e4eeb5e39a9cfb4c820b3d3fde Reviewed-by: hjk --- src/plugins/squish/objectsmapeditor.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/plugins/squish/objectsmapeditor.cpp b/src/plugins/squish/objectsmapeditor.cpp index 32220ad7cdc..994d57f5325 100644 --- a/src/plugins/squish/objectsmapeditor.cpp +++ b/src/plugins/squish/objectsmapeditor.cpp @@ -10,26 +10,24 @@ #include -#include - namespace Squish::Internal { class ObjectsMapEditor : public Core::IEditor { public: - ObjectsMapEditor(QSharedPointer document) + ObjectsMapEditor(std::shared_ptr document) : m_document(document) { - setWidget(new ObjectsMapEditorWidget(m_document.data())); + setWidget(new ObjectsMapEditorWidget(m_document.get())); setDuplicateSupported(true); } ~ObjectsMapEditor() override { delete m_widget; } private: - Core::IDocument *document() const override { return m_document.data(); } + Core::IDocument *document() const override { return m_document.get(); } QWidget *toolBar() override { return nullptr; } Core::IEditor *duplicate() override { return new ObjectsMapEditor(m_document); } - QSharedPointer m_document; + std::shared_ptr m_document; }; @@ -41,7 +39,7 @@ ObjectsMapEditorFactory::ObjectsMapEditorFactory() setDisplayName(Tr::tr("Squish Object Map Editor")); addMimeType(Constants::SQUISH_OBJECTSMAP_MIMETYPE); setEditorCreator([] { - return new ObjectsMapEditor(QSharedPointer(new ObjectsMapDocument)); + return new ObjectsMapEditor(std::shared_ptr(new ObjectsMapDocument)); }); }