diff --git a/src/libs/utils/treemodel.h b/src/libs/utils/treemodel.h index b28eebf79dd..41300b7dbc4 100644 --- a/src/libs/utils/treemodel.h +++ b/src/libs/utils/treemodel.h @@ -315,7 +315,7 @@ public: } template - BestItem *findNonRooItem(const Predicate &pred) const { + BestItem *findNonRootItem(const Predicate &pred) const { const auto pred0 = [pred](TreeItem *treeItem) -> bool { return pred(static_cast(treeItem)); }; return static_cast(m_root->findAnyChild(pred0)); } diff --git a/src/plugins/autotest/gtest/gtestoutputreader.cpp b/src/plugins/autotest/gtest/gtestoutputreader.cpp index 19712035110..764cf543a1b 100644 --- a/src/plugins/autotest/gtest/gtestoutputreader.cpp +++ b/src/plugins/autotest/gtest/gtestoutputreader.cpp @@ -206,7 +206,7 @@ GTestResult *GTestOutputReader::createDefaultResult() const const TestTreeItem *GTestOutputReader::findTestTreeItemForCurrentLine() const { - const auto item = TestTreeModel::instance()->findNonRooItem([&](const Utils::TreeItem *item) { + const auto item = TestTreeModel::instance()->findNonRootItem([&](const Utils::TreeItem *item) { const TestTreeItem &treeItem = static_cast(*item); return matches(treeItem); }); diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 5947ac4cca2..84d66f2a899 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -517,7 +517,7 @@ void WatchModel::reinitialize(bool includeInspectData) WatchItem *WatchModel::findItem(const QString &iname) const { - return findNonRooItem([iname](WatchItem *item) { return item->iname == iname; }); + return findNonRootItem([iname](WatchItem *item) { return item->iname == iname; }); } static QString parentName(const QString &iname) diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index 867d4acc06f..5bf7255a190 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -395,7 +395,7 @@ QMimeData *FlatModel::mimeData(const QModelIndexList &indexes) const WrapperNode *FlatModel::wrapperForNode(const Node *node) const { - return findNonRooItem([this, node](WrapperNode *item) { + return findNonRootItem([this, node](WrapperNode *item) { return item->m_node == node; }); }