summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2019-02-12 09:29:15 +0100
committerNikolai Kosjar <nikolai.kosjar@qt.io>2019-02-12 09:32:49 +0000
commitd74ce63ac92edde8be2ce952d51a4db9d83ebef7 (patch)
tree6acfee403c582e4b2bc8f5f44f9404e7059276ba /src
parent45fd5a3f9e6e5e87a6478de55d1ab23a4f1f5d62 (diff)
downloadqt-creator-d74ce63ac92edde8be2ce952d51a4db9d83ebef7.tar.gz
ClangTools: Remove "note:" from the Explaining Steps text
...to make it consistent with the DiagnosticItem. Change-Id: I66ce41441058879ee293f9ae177e7b50d4856234 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp11
-rw-r--r--src/plugins/clangtools/clangtoolslogfilereader.cpp2
2 files changed, 2 insertions, 11 deletions
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
index 0614bce37d..85a9ade878 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<Debugger::DiagnosticLocation> &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 d2213d3304..e8a6fbcc96 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;
}