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

Utils: Verify types of TypedTreeItem in debug mode

Browse Source 
Task-number: QTCREATORBUG-31074
Change-Id: I384b9aa8bc785834f24ca8836f1efc98a66c4fb2
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2024-08-05 18:28:56 +02:00
parent 305e335550
commit da35026af8
1 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/libs/utils/treemodel.h
View File

@@ -7,6 +7,8 @@
#include "indexedcontainerproxyconstiterator.h" #include "indexedcontainerproxyconstiterator.h"
#include <utils/qtcassert.h>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <functional> #include <functional>
@@ -91,12 +93,12 @@ template <class ChildType, class ParentType = TreeItem>
class TypedTreeItem : public TreeItem class TypedTreeItem : public TreeItem
{ {
public: public:
ChildType *childAt(int index) const { return static_cast<ChildType *>(TreeItem::childAt(index)); } ChildType *childAt(int index) const { return childItemCast(TreeItem::childAt(index)); }
void sortChildren(const std::function<bool(const ChildType *, const ChildType *)> &lessThan) void sortChildren(const std::function<bool(const ChildType *, const ChildType *)> &lessThan)
{ {
return TreeItem::sortChildren([lessThan](const TreeItem *a, const TreeItem *b) { return TreeItem::sortChildren([lessThan, this](const TreeItem *a, const TreeItem *b) {
return lessThan(static_cast<const ChildType *>(a), static_cast<const ChildType *>(b)); return lessThan(childItemCast(a), childItemCast(b));
}); });
} }
@@ -111,42 +113,59 @@ public:
template <typename Predicate> template <typename Predicate>
void forAllChildren(const Predicate &pred) const { void forAllChildren(const Predicate &pred) const {
const auto pred0 = [pred](TreeItem *treeItem) { pred(static_cast<ChildType *>(treeItem)); }; const auto pred0 = [pred, this](TreeItem *treeItem) { pred(childItemCast(treeItem)); };
TreeItem::forAllChildren(pred0); TreeItem::forAllChildren(pred0);
} }
template <typename Predicate> template <typename Predicate>
void forFirstLevelChildren(Predicate pred) const { void forFirstLevelChildren(Predicate pred) const {
const auto pred0 = [pred](TreeItem *treeItem) { pred(static_cast<ChildType *>(treeItem)); }; const auto pred0 = [pred, this](TreeItem *treeItem) { pred(childItemCast(treeItem)); };
TreeItem::forChildrenAtLevel(1, pred0); TreeItem::forChildrenAtLevel(1, pred0);
} }
template <typename Predicate> template <typename Predicate>
ChildType *findFirstLevelChild(Predicate pred) const { ChildType *findFirstLevelChild(Predicate pred) const {
const auto pred0 = [pred](TreeItem *treeItem) { return pred(static_cast<ChildType *>(treeItem)); }; const auto pred0 = [pred, this](TreeItem *treeItem) { return pred(childItemCast(treeItem)); };
return static_cast<ChildType *>(TreeItem::findChildAtLevel(1, pred0)); return static_cast<ChildType *>(TreeItem::findChildAtLevel(1, pred0));
} }
ParentType *parent() const { ParentType *parent() const { return parentItemCast(TreeItem::parent()); }
return static_cast<ParentType *>(TreeItem::parent());
}
void insertOrderedChild(ChildType *item, const std::function<bool(const ChildType *, const ChildType *)> &cmp) void insertOrderedChild(ChildType *item, const std::function<bool(const ChildType *, const ChildType *)> &cmp)
{ {
const auto cmp0 = [cmp](const TreeItem *lhs, const TreeItem *rhs) { const auto cmp0 = [cmp, this](const TreeItem *lhs, const TreeItem *rhs) {
return cmp(static_cast<const ChildType *>(lhs), static_cast<const ChildType *>(rhs)); return cmp(childItemCast(lhs), childItemCast(rhs));
}; };
TreeItem::insertOrderedChild(item, cmp0); TreeItem::insertOrderedChild(item, cmp0);
} }
ChildType *findAnyChild(const std::function<bool(TreeItem *)> &pred) const ChildType *findAnyChild(const std::function<bool(TreeItem *)> &pred) const
{ {
return static_cast<ChildType *>(TreeItem::findAnyChild(pred)); return childItemCast(TreeItem::findAnyChild(pred));
} }
ChildType *reverseFindAnyChild(const std::function<bool(TreeItem *)> &pred) const ChildType *reverseFindAnyChild(const std::function<bool(TreeItem *)> &pred) const
{ {
return static_cast<ChildType *>(TreeItem::reverseFindAnyChild(pred)); return childItemCast(TreeItem::reverseFindAnyChild(pred));
}
private:
ChildType *childItemCast(TreeItem *item) const { return itemCast<ChildType>(item); }
const ChildType *childItemCast(const TreeItem *item) const
{
return itemCast<ChildType>(const_cast<TreeItem *>(item));
}
ParentType *parentItemCast(TreeItem *item) const { return itemCast<ParentType>(item); }
template<typename T> T* itemCast(TreeItem *item) const
{
#ifdef NDEBUG
return static_cast<T *>(item);
#else
const auto cItem = dynamic_cast<T *>(item);
QTC_CHECK(cItem);
return cItem;
#endif
} }
}; };