aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2022-11-29 19:58:54 +0100
committerJarek Kobus <jaroslaw.kobus@qt.io>2022-11-30 09:11:42 +0000
commit1dbf3ad120eadd8c6a72406de9923290dae9339c (patch)
tree6d45f00b0956081e2010f81734c94374e5fefd0e
parentaad99ea408e3314b138e3c1436f645753f037c6f (diff)
TaskTree: Fix some clazy warnings
Change-Id: Ibd0931d1298489345f4055b43610f3a0747e05bc Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--src/libs/utils/tasktree.cpp6
-rw-r--r--src/libs/utils/tasktree.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/utils/tasktree.cpp b/src/libs/utils/tasktree.cpp
index 55afcfdf40..2cc635e0cf 100644
--- a/src/libs/utils/tasktree.cpp
+++ b/src/libs/utils/tasktree.cpp
@@ -20,7 +20,7 @@ TreeStorageBase::TreeStorageBase(StorageConstructor ctor, StorageDestructor dtor
TreeStorageBase::StorageData::~StorageData()
{
QTC_CHECK(m_storageHash.isEmpty());
- for (void *ptr : m_storageHash)
+ for (void *ptr : std::as_const(m_storageHash))
m_destructor(ptr);
}
@@ -47,8 +47,8 @@ void TreeStorageBase::deleteStorage(int id)
QTC_ASSERT(m_storageData->m_constructor, return); // TODO: add isValid()?
QTC_ASSERT(m_storageData->m_destructor, return);
QTC_ASSERT(m_storageData->m_activeStorage == 0, return); // TODO: should be allowed?
- const auto it = m_storageData->m_storageHash.find(id);
- QTC_ASSERT(it != m_storageData->m_storageHash.end(), return);
+ const auto it = m_storageData->m_storageHash.constFind(id);
+ QTC_ASSERT(it != m_storageData->m_storageHash.constEnd(), return);
m_storageData->m_destructor(it.value());
m_storageData->m_storageHash.erase(it);
}
diff --git a/src/libs/utils/tasktree.h b/src/libs/utils/tasktree.h
index 5a7ba5fc5e..b89a68828d 100644
--- a/src/libs/utils/tasktree.h
+++ b/src/libs/utils/tasktree.h
@@ -266,7 +266,7 @@ public:
wrapEnd(done), wrapEnd(error)}) {}
private:
- static TaskSetupHandler wrapSetup(SetupHandler handler) {
+ static TaskSetupHandler wrapSetup(const SetupHandler &handler) {
if (!handler)
return {};
return [handler](TaskInterface &taskInterface) {
@@ -274,7 +274,7 @@ private:
handler(*adapter.task());
};
};
- static TaskEndHandler wrapEnd(EndHandler handler) {
+ static TaskEndHandler wrapEnd(const EndHandler &handler) {
if (!handler)
return {};
return [handler](const TaskInterface &taskInterface) {