From d74ce63ac92edde8be2ce952d51a4db9d83ebef7 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 12 Feb 2019 09:29:15 +0100 Subject: [PATCH] ClangTools: Remove "note:" from the Explaining Steps text ...to make it consistent with the DiagnosticItem. Change-Id: I66ce41441058879ee293f9ae177e7b50d4856234 Reviewed-by: Ivan Donchevskii --- src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp | 11 +---------- src/plugins/clangtools/clangtoolslogfilereader.cpp | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp index 0614bce37db..85a9ade878b 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp +++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp @@ -501,15 +501,6 @@ ExplainingStepItem::ExplainingStepItem(const ExplainingStep &step, int index) , m_index(index) {} -// We expect something like "note: ..." -static QVariant iconForExplainingStepMessage(const QString &message) -{ - const int index = message.indexOf(':'); - if (index == -1) - return QVariant(); - return iconData(message.mid(0, index)); -} - static QString rangeString(const QVector &ranges) { return QString("%1-%2").arg(lineColumnString(ranges[0]), lineColumnString(ranges[1])); @@ -559,7 +550,7 @@ QVariant ExplainingStepItem::data(int column, int role) const case Qt::DecorationRole: if (m_step.isFixIt) return Utils::Icons::CODEMODEL_FIXIT.icon(); - return iconForExplainingStepMessage(m_step.message); + return Utils::Icons::INFO.icon(); default: return QVariant(); } diff --git a/src/plugins/clangtools/clangtoolslogfilereader.cpp b/src/plugins/clangtools/clangtoolslogfilereader.cpp index d2213d3304e..e8a6fbcc96a 100644 --- a/src/plugins/clangtools/clangtoolslogfilereader.cpp +++ b/src/plugins/clangtools/clangtoolslogfilereader.cpp @@ -94,7 +94,7 @@ static ExplainingStep buildChildDiagnostic(const CXDiagnostic cxDiagnostic) const CXSourceLocation cxLocation = clang_getDiagnosticLocation(cxDiagnostic); diagnosticStep.location = diagLocationFromSourceLocation(cxLocation); - diagnosticStep.message = type + ": " + fromCXString(clang_getDiagnosticSpelling(cxDiagnostic)); + diagnosticStep.message = fromCXString(clang_getDiagnosticSpelling(cxDiagnostic)); return diagnosticStep; }