diff options
author | David Schulz <david.schulz@qt.io> | 2021-05-28 12:37:35 +0200 |
---|---|---|
committer | David Schulz <david.schulz@qt.io> | 2021-06-09 06:57:42 +0000 |
commit | 0cfe27a53d6f3ccf231e4c05069c0bbe72286757 (patch) | |
tree | 84a8b4e9f1c782738f3fb4bd4c3b2df732bd2bd8 /src/plugins/cppcheck | |
parent | 27f8e2dbce774410c5443a7f425eb53c2a869f54 (diff) |
Debugger: filepathify DiagnosticLocation
Change-Id: Ibbbf137231b313ec10e3d57c0230217b0c1e0a6c
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cppcheck')
-rw-r--r-- | src/plugins/cppcheck/cppcheckdiagnosticsmodel.cpp | 4 | ||||
-rw-r--r-- | src/plugins/cppcheck/cppcheckdiagnosticview.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cppcheck/cppcheckdiagnosticsmodel.cpp b/src/plugins/cppcheck/cppcheckdiagnosticsmodel.cpp index a4c4000cb7..49bc745838 100644 --- a/src/plugins/cppcheck/cppcheckdiagnosticsmodel.cpp +++ b/src/plugins/cppcheck/cppcheckdiagnosticsmodel.cpp @@ -79,7 +79,7 @@ QVariant DiagnosticItem::data(int column, int role) const if (column == DiagnosticsModel::DiagnosticColumn) { switch (role) { case DetailedErrorView::LocationRole: { - const auto location = DiagnosticLocation(m_diagnostic.fileName.toString(), + const auto location = DiagnosticLocation(m_diagnostic.fileName, m_diagnostic.lineNumber, 0); return QVariant::fromValue(location); @@ -92,7 +92,7 @@ QVariant DiagnosticItem::data(int column, int role) const return getIcon(m_diagnostic.severity); case Debugger::DetailedErrorView::FullTextRole: return QString("%1:%2: %3") - .arg(m_diagnostic.fileName.toString()) + .arg(m_diagnostic.fileName.toUserOutput()) .arg(m_diagnostic.lineNumber) .arg(m_diagnostic.message); default: diff --git a/src/plugins/cppcheck/cppcheckdiagnosticview.cpp b/src/plugins/cppcheck/cppcheckdiagnosticview.cpp index 1f881e5330..2fda665305 100644 --- a/src/plugins/cppcheck/cppcheckdiagnosticview.cpp +++ b/src/plugins/cppcheck/cppcheckdiagnosticview.cpp @@ -103,7 +103,7 @@ void DiagnosticView::openEditorForCurrentIndex() const QVariant v = model()->data(currentIndex(), Debugger::DetailedErrorView::LocationRole); const auto loc = v.value<Debugger::DiagnosticLocation>(); if (loc.isValid()) - Core::EditorManager::openEditorAt(loc.filePath, loc.line, loc.column - 1); + Core::EditorManager::openEditorAt(Utils::Link(loc.filePath, loc.line, loc.column - 1)); } void DiagnosticView::mouseDoubleClickEvent(QMouseEvent *event) |