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

Utils: Use Utils::Link instead of TaskView::Location

Browse Source 
Same layout, effectively the same purpose

Change-Id: I742d85ed06c07009ebb9696734f00894275859a3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-05-28 12:04:56 +02:00
parent b768ba2412
commit b9c7ca0096
4 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/utils/outputformatter.cpp
View File

@@ -28,6 +28,7 @@
#include "algorithm.h"
#include "ansiescapecodehandler.h"
#include "fileinprojectfinder.h"
#include "link.h"
#include "qtcassert.h"
#include "qtcprocess.h"
#include "theme/theme.h"
@@ -72,15 +73,14 @@ bool OutputLineParser::isLinkTarget(const QString &target)
return target.startsWith(*linkPrefix());
}
void OutputLineParser::parseLinkTarget(const QString &target, FilePath &filePath, int &line,
int &column)
Link OutputLineParser::parseLinkTarget(const QString &target)
{
const QStringList parts = target.mid(linkPrefix()->length()).split(*linkSep());
if (parts.isEmpty())
return;
filePath = FilePath::fromString(parts.first());
line = parts.length() > 1 ? parts.at(1).toInt() : 0;
column = parts.length() > 2 ? parts.at(2).toInt() : 0;
return {};
return Link(FilePath::fromString(parts.first()),
parts.length() > 1 ? parts.at(1).toInt() : 0,
parts.length() > 2 ? parts.at(2).toInt() : 0);
}
// The redirection mechanism is needed for broken build tools (e.g. xcodebuild) that get invoked
@@ -528,12 +528,10 @@ bool OutputFormatter::handleFileLink(const QString &href)
{
if (!OutputLineParser::isLinkTarget(href))
return false;
FilePath filePath;
int line;
int column;
OutputLineParser::parseLinkTarget(href, filePath, line, column);
QTC_ASSERT(!filePath.isEmpty(), return false);
emit openInEditorRequested(filePath, line, column);
Link link = OutputLineParser::parseLinkTarget(href);
QTC_ASSERT(!link.targetFilePath.isEmpty(), return false);
emit openInEditorRequested(link);
return true;
}