feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TaskTree: Fix some clazy warnings

Browse Source 
Change-Id: Ibd0931d1298489345f4055b43610f3a0747e05bc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-11-29 19:58:54 +01:00
parent aad99ea408
commit 1dbf3ad120
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/tasktree.cpp
View File

@@ -20,7 +20,7 @@ TreeStorageBase::TreeStorageBase(StorageConstructor ctor, StorageDestructor dtor
TreeStorageBase::StorageData::~StorageData() TreeStorageBase::StorageData::~StorageData()
{ {
QTC_CHECK(m_storageHash.isEmpty()); QTC_CHECK(m_storageHash.isEmpty());
for (void *ptr : m_storageHash) for (void *ptr : std::as_const(m_storageHash))
m_destructor(ptr); 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_constructor, return); // TODO: add isValid()?
QTC_ASSERT(m_storageData->m_destructor, return); QTC_ASSERT(m_storageData->m_destructor, return);
QTC_ASSERT(m_storageData->m_activeStorage == 0, return); // TODO: should be allowed? QTC_ASSERT(m_storageData->m_activeStorage == 0, return); // TODO: should be allowed?
const auto it = m_storageData->m_storageHash.find(id); const auto it = m_storageData->m_storageHash.constFind(id);
QTC_ASSERT(it != m_storageData->m_storageHash.end(), return); QTC_ASSERT(it != m_storageData->m_storageHash.constEnd(), return);
m_storageData->m_destructor(it.value()); m_storageData->m_destructor(it.value());
m_storageData->m_storageHash.erase(it); m_storageData->m_storageHash.erase(it);
} }

4
src/libs/utils/tasktree.h
View File

@@ -266,7 +266,7 @@ public:
wrapEnd(done), wrapEnd(error)}) {} wrapEnd(done), wrapEnd(error)}) {}
private: private:
static TaskSetupHandler wrapSetup(SetupHandler handler) { static TaskSetupHandler wrapSetup(const SetupHandler &handler) {
if (!handler) if (!handler)
return {}; return {};
return [handler](TaskInterface &taskInterface) { return [handler](TaskInterface &taskInterface) {
@@ -274,7 +274,7 @@ private:
handler(*adapter.task()); handler(*adapter.task());
}; };
}; };
static TaskEndHandler wrapEnd(EndHandler handler) { static TaskEndHandler wrapEnd(const EndHandler &handler) {
if (!handler) if (!handler)
return {}; return {};
return [handler](const TaskInterface &taskInterface) { return [handler](const TaskInterface &taskInterface) {