diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2024-02-01 20:28:35 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2024-02-02 11:14:15 +0000 |
commit | 72bcc0f2602d02c3601c03b936bda9e4c43bf49d (patch) | |
tree | 2b457cb03c0ab66a391958842e84990cecf95817 /src/plugins/projectexplorer | |
parent | a2b3d4d3020ab47865f0c532f66ff74fd8bea3e6 (diff) |
ProjectExplorer: 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: I3d76cf04f8b501417687f8111c88f4a1af451608
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r-- | src/plugins/projectexplorer/task.cpp | 6 | ||||
-rw-r--r-- | src/plugins/projectexplorer/task.h | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/taskhub.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp index a16a728344..bbec54f14f 100644 --- a/src/plugins/projectexplorer/task.cpp +++ b/src/plugins/projectexplorer/task.cpp @@ -68,8 +68,8 @@ Task Task::compilerMissingTask() void Task::setMark(TextEditor::TextMark *mark) { QTC_ASSERT(mark, return); - QTC_ASSERT(m_mark.isNull(), return); - m_mark = QSharedPointer<TextEditor::TextMark>(mark); + QTC_ASSERT(!m_mark, return); + m_mark = std::shared_ptr<TextEditor::TextMark>(mark); } bool Task::isNull() const @@ -90,7 +90,7 @@ void Task::clear() category = Utils::Id(); m_icon = QIcon(); formats.clear(); - m_mark.clear(); + m_mark.reset(); } void Task::setFile(const Utils::FilePath &file_) diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h index 830cea7939..563214d9d3 100644 --- a/src/plugins/projectexplorer/task.h +++ b/src/plugins/projectexplorer/task.h @@ -85,7 +85,7 @@ public: private: void setMark(TextEditor::TextMark *mark); - QSharedPointer<TextEditor::TextMark> m_mark; + std::shared_ptr<TextEditor::TextMark> m_mark; mutable QIcon m_icon; static unsigned int s_nextId; diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp index 09b7d49e7b..3056190d09 100644 --- a/src/plugins/projectexplorer/taskhub.cpp +++ b/src/plugins/projectexplorer/taskhub.cpp @@ -126,7 +126,7 @@ void TaskHub::addTask(Task task) QTC_ASSERT(s_registeredCategories.contains(task.category), return); QTC_ASSERT(!task.description().isEmpty(), return); QTC_ASSERT(!task.isNull(), return); - QTC_ASSERT(task.m_mark.isNull(), return); + QTC_ASSERT(!task.m_mark, return); if (task.file.isEmpty() || task.line <= 0) task.line = -1; |