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

Utils: filepathify Link

Browse Source 
Change-Id: Ie62500bde139158e776f9698ee0ea00c2a113f93
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2021-05-25 10:11:31 +02:00
parent dbd4a10d6f
commit 356bfcc9fd
24 changed files with 76 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/ctest/ctesttreeitem.cpp
View File

@@ -88,7 +88,7 @@ QVariant CTestTreeItem::data(int column, int role) const
return checked();
if (role == LinkRole) {
QVariant itemLink;
itemLink.setValue(Utils::Link(filePath(), line()));
itemLink.setValue(Utils::Link(Utils::FilePath::fromString(filePath()), line()));
return itemLink;
}
return ITestTreeItem::data(column, role);

5
src/plugins/autotest/testnavigationwidget.cpp
View File

@@ -267,8 +267,9 @@ void TestNavigationWidget::onItemActivated(const QModelIndex &index)
{
const Utils::Link link = index.data(LinkRole).value<Utils::Link>();
if (link.hasValidTarget()) {
Core::EditorManager::openEditorAt(link.targetFileName, link.targetLine,
link.targetColumn);
Core::EditorManager::openEditorAt(link.targetFilePath,
link.targetLine,
link.targetColumn);
}
}

7
src/plugins/autotest/testtreeitem.cpp
View File

@@ -137,12 +137,12 @@ bool ITestTreeItem::lessThan(const ITestTreeItem *other, ITestTreeItem::SortMode
const Utils::Link &leftLink = data(0, LinkRole).value<Utils::Link>();
const Utils::Link &rightLink = other->data(0, LinkRole).value<Utils::Link>();
if (leftLink.targetFileName == rightLink.targetFileName) {
if (leftLink.targetFilePath == rightLink.targetFilePath) {
return leftLink.targetLine == rightLink.targetLine
? leftLink.targetColumn > rightLink.targetColumn
: leftLink.targetLine > rightLink.targetLine;
}
return leftLink.targetFileName > rightLink.targetFileName;
return leftLink.targetFilePath > rightLink.targetFilePath;
}
}
return true;
@@ -185,7 +185,8 @@ QVariant TestTreeItem::data(int column, int role) const
if (type() == GroupNode)
return QVariant();
QVariant itemLink;
itemLink.setValue(Utils::Link(filePath(), line(), int(m_column)));
itemLink.setValue(
Utils::Link(Utils::FilePath::fromString(filePath()), line(), int(m_column)));
return itemLink;
}
return ITestTreeItem::data(column, role);