From fc605d7a7642debca94d097c373b10dc04ea596d Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 1 Feb 2024 16:33:44 +0100 Subject: [PATCH] AutoTest: 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. Move TestParseResultPtr to the common place and don't repeat this typedef. Change-Id: Id8523b7898965ea9bfccb8a1bdc6a8ea23f090ed Reviewed-by: Reviewed-by: Christian Stenger --- src/plugins/autotest/itestparser.h | 2 -- src/plugins/autotest/testtreeitem.h | 2 ++ src/plugins/autotest/testtreemodel.cpp | 2 +- src/plugins/autotest/testtreemodel.h | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/autotest/itestparser.h b/src/plugins/autotest/itestparser.h index 6e3305dd6ea..1ecfcd97a03 100644 --- a/src/plugins/autotest/itestparser.h +++ b/src/plugins/autotest/itestparser.h @@ -40,8 +40,6 @@ public: int column = 0; }; -using TestParseResultPtr = QSharedPointer; - class ITestParser { public: diff --git a/src/plugins/autotest/testtreeitem.h b/src/plugins/autotest/testtreeitem.h index 913db7e7aef..6eb7021a14f 100644 --- a/src/plugins/autotest/testtreeitem.h +++ b/src/plugins/autotest/testtreeitem.h @@ -29,6 +29,8 @@ class ITestConfiguration; class TestParseResult; enum class TestRunMode; +using TestParseResultPtr = std::shared_ptr; + class ITestTreeItem : public Utils::TypedTreeItem { public: diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp index 638924db328..6b069f6c51c 100644 --- a/src/plugins/autotest/testtreemodel.cpp +++ b/src/plugins/autotest/testtreemodel.cpp @@ -685,7 +685,7 @@ void TestTreeModel::onParseResultsReady(const QList &results QTC_ASSERT(framework, return); TestTreeItem *rootNode = framework->rootNode(); QTC_ASSERT(rootNode, return); - handleParseResult(result.data(), rootNode); + handleParseResult(result.get(), rootNode); } } diff --git a/src/plugins/autotest/testtreemodel.h b/src/plugins/autotest/testtreemodel.h index 9d5100ca2de..f985eefe98a 100644 --- a/src/plugins/autotest/testtreemodel.h +++ b/src/plugins/autotest/testtreemodel.h @@ -22,7 +22,6 @@ class TestCodeParser; } // namespace Internal class TestParseResult; -using TestParseResultPtr = QSharedPointer; class AUTOTESTSHARED_EXPORT TestTreeModel : public Utils::TreeModel {