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

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent c9eedbe0f3
commit e1c88116b3
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/autotest/testtreemodel.cpp
View File

@@ -266,9 +266,9 @@ void TestTreeModel::filterAndInsert(TestTreeItem *item, TestTreeItem *root, bool
insertItemInParent(filtered, root, groupingEnabled);
}
void TestTreeModel::rebuild(const QList<Core::Id> &frameworkIds)
void TestTreeModel::rebuild(const QList<Utils::Id> &frameworkIds)
{
for (const Core::Id &id : frameworkIds) {
for (const Utils::Id &id : frameworkIds) {
ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
TestTreeItem *frameworkRoot = framework->rootNode();
const bool groupingEnabled = framework->grouping();
@@ -549,25 +549,25 @@ void TestTreeModel::removeAllTestItems()
// we're inside tests - so use some internal knowledge to make testing easier
static TestTreeItem *qtRootNode()
{
auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtTest");
auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtTest");
return TestFrameworkManager::frameworkForId(id)->rootNode();
}
static TestTreeItem *quickRootNode()
{
auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtQuickTest");
auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtQuickTest");
return TestFrameworkManager::frameworkForId(id)->rootNode();
}
static TestTreeItem *gtestRootNode()
{
auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("GTest");
auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("GTest");
return TestFrameworkManager::frameworkForId(id)->rootNode();
}
static TestTreeItem *boostTestRootNode()
{
auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("Boost");
auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("Boost");
return TestFrameworkManager::frameworkForId(id)->rootNode();
}