diff --git a/src/libs/utils/treemodel.cpp b/src/libs/utils/treemodel.cpp index 6f6d88248d2..a4dd145f401 100644 --- a/src/libs/utils/treemodel.cpp +++ b/src/libs/utils/treemodel.cpp @@ -778,25 +778,6 @@ QModelIndex TreeItem::index() const return m_model->indexForItem(this); } -void TreeItem::walkTree(TreeItemVisitor *visitor) -{ - if (visitor->preVisit(this)) { - ++visitor->m_level; - visitor->visit(this); - foreach (TreeItem *item, m_children) - item->walkTree(visitor); - --visitor->m_level; - } - visitor->postVisit(this); -} - -void TreeItem::walkTree(std::function f) -{ - f(this); - foreach (TreeItem *item, m_children) - item->walkTree(f); -} - void TreeItem::clear() { while (m_children.size()) { diff --git a/src/libs/utils/treemodel.h b/src/libs/utils/treemodel.h index 03043197731..bdc1311a65a 100644 --- a/src/libs/utils/treemodel.h +++ b/src/libs/utils/treemodel.h @@ -33,26 +33,8 @@ namespace Utils { -class TreeItem; class TreeModel; -class QTCREATOR_UTILS_EXPORT TreeItemVisitor -{ -public: - TreeItemVisitor() : m_level(0) {} - virtual ~TreeItemVisitor() {} - - virtual bool preVisit(TreeItem *) { return true; } - virtual void visit(TreeItem *) {} - virtual void postVisit(TreeItem *) {} - - int level() const { return m_level; } - -private: - friend class TreeItem; - int m_level; -}; - class QTCREATOR_UTILS_EXPORT TreeItem { public: @@ -92,8 +74,6 @@ public: TreeModel *model() const { return m_model; } - void walkTree(TreeItemVisitor *visitor); - void walkTree(std::function f); template void forSelectedChildren(const Predicate &pred) const { foreach (TreeItem *item, m_children) { @@ -141,33 +121,6 @@ public: return 0; } - // FIXME: Remove. Should only be present in LevelModels - template - T findChildAtLevel(int n, Predicate func) const { - if (n == 1) { - foreach (TreeItem *item, m_children) - if (func(static_cast(item))) - return static_cast(item); - } else { - foreach (TreeItem *item, m_children) - if (T found = item->findChildAtLevel(n - 1, func)) - return found; - } - return 0; - } - - // Levels are 1-based: Child at Level 1 is an immediate child. - // FIXME: Remove. Should only be present in LevelModels - template - void forEachChildAtLevel(int n, Function func) { - foreach (TreeItem *item, m_children) { - if (n == 1) - func(static_cast(item)); - else - item->forEachChildAtLevel(n - 1, func); - } - } - template T findAnyChild(Predicate pred) const { foreach (TreeItem *item, m_children) { @@ -256,18 +209,6 @@ public: TreeItem *takeItem(TreeItem *item); // item is not destroyed. - // FIXME: Remove. Should only be uses in LeveledTreeModel - template - T findItemAtLevel(int n, Predicate func) const { - return m_root->findChildAtLevel(n, func); - } - // FIXME: Remove. Should only be uses in LeveledTreeModel - template - void forEachItemAtLevel(int n, Function func) const { - m_root->forEachChildAtLevel(n, func); - } - - signals: void requestExpansion(QModelIndex);