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

ClangTools: Remove "note:" from the Explaining Steps text

Browse Source 
...to make it consistent with the DiagnosticItem.

Change-Id: I66ce41441058879ee293f9ae177e7b50d4856234
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-02-12 09:29:15 +01:00
parent 45fd5a3f9e
commit d74ce63ac9
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
View File

@@ -501,15 +501,6 @@ ExplainingStepItem::ExplainingStepItem(const ExplainingStep &step, int index)
, m_index(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<Debugger::DiagnosticLocation> &ranges) static QString rangeString(const QVector<Debugger::DiagnosticLocation> &ranges)
{ {
return QString("%1-%2").arg(lineColumnString(ranges[0]), lineColumnString(ranges[1])); 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: case Qt::DecorationRole:
if (m_step.isFixIt) if (m_step.isFixIt)
return Utils::Icons::CODEMODEL_FIXIT.icon(); return Utils::Icons::CODEMODEL_FIXIT.icon();
return iconForExplainingStepMessage(m_step.message); return Utils::Icons::INFO.icon();
default: default:
return QVariant(); return QVariant();
} }

2
src/plugins/clangtools/clangtoolslogfilereader.cpp
View File

@@ -94,7 +94,7 @@ static ExplainingStep buildChildDiagnostic(const CXDiagnostic cxDiagnostic)
const CXSourceLocation cxLocation = clang_getDiagnosticLocation(cxDiagnostic); const CXSourceLocation cxLocation = clang_getDiagnosticLocation(cxDiagnostic);
diagnosticStep.location = diagLocationFromSourceLocation(cxLocation); diagnosticStep.location = diagLocationFromSourceLocation(cxLocation);
diagnosticStep.message = type + ": " + fromCXString(clang_getDiagnosticSpelling(cxDiagnostic)); diagnosticStep.message = fromCXString(clang_getDiagnosticSpelling(cxDiagnostic));
return diagnosticStep; return diagnosticStep;
} }