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

ClangTools: Refer to items consistently

Browse Source 
Sometimes we used "issue" (treeview header, or filter line edit) and
sometimes "diagnostic" (go to next/pervious diagnostic actions).

Stick to "diagnostic" as it's more generic and avoid conflicts/confusion
with the "Issues pane".

Task-number: QTCREATORBUG-19047
Change-Id: I26b814b117a8fd475c080f0ef79c9fabc1446406
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-02-08 14:21:30 +01:00
parent cc81284db6
commit 933f5a0df5
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/clangtools/clangtidyclazytool.cpp
View File

@@ -219,7 +219,7 @@ ClangTidyClazyTool::ClangTidyClazyTool()
m_diagnosticView->sortByColumn(Debugger::DetailedErrorView::DiagnosticColumn,
Qt::AscendingOrder);
m_diagnosticView->setObjectName(QLatin1String("ClangTidyClazyIssuesView"));
m_diagnosticView->setWindowTitle(tr("Clang-Tidy and Clazy Issues"));
m_diagnosticView->setWindowTitle(tr("Clang-Tidy and Clazy Diagnostics"));
foreach (auto * const model,
QList<QAbstractItemModel *>({m_diagnosticModel, m_diagnosticFilterModel})) {
@@ -281,7 +281,7 @@ ClangTidyClazyTool::ClangTidyClazyTool()
// Filter line edit
m_filterLineEdit = new Utils::FancyLineEdit();
m_filterLineEdit->setFiltering(true);
m_filterLineEdit->setPlaceholderText(tr("Filter Issues"));
m_filterLineEdit->setPlaceholderText(tr("Filter Diagnostics"));
m_filterLineEdit->setHistoryCompleter("CppTools.ClangTidyClazyIssueFilter", true);
connect(m_filterLineEdit, &Utils::FancyLineEdit::filterChanged, [this](const QString &filter) {
m_diagnosticFilterModel->setFilterRegExp(
@@ -309,7 +309,7 @@ ClangTidyClazyTool::ClangTidyClazyTool()
ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER);
const QString toolTip = tr("Clang-Tidy and Clazy use a customized Clang executable from the "
"Clang project to search for errors and warnings.");
"Clang project to search for diagnostics.");
m_perspective.addWindow(m_diagnosticView, Perspective::SplitVertical, nullptr);
@@ -450,14 +450,14 @@ void ClangTidyClazyTool::handleStateUpdate()
QString message;
if (m_running) {
if (issuesFound)
message = tr("Running - %n issues found", nullptr, issuesFound);
message = tr("Running - %n diagnostics", nullptr, issuesFound);
else
message = tr("Running - No issues found", nullptr, issuesFound);
message = tr("Running - No diagnostics", nullptr, issuesFound);
} else {
if (issuesFound)
message = tr("Finished - %n issues found", nullptr, issuesFound);
message = tr("Finished - %n diagnostics", nullptr, issuesFound);
else
message = tr("Finished - No issues found", nullptr, issuesFound);
message = tr("Finished - No diagnostics", nullptr, issuesFound);
}
Debugger::showPermanentStatusMessage(message);

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

@@ -84,7 +84,7 @@ ClangToolsDiagnosticModel::ClangToolsDiagnosticModel(QObject *parent)
: Utils::TreeModel<>(parent)
, m_filesWatcher(std::make_unique<QFileSystemWatcher>())
{
setHeader({tr("Issue"), tr("Fixit Status")});
setHeader({tr("Diagnostic"), tr("Fixit Status")});
connectFileWatcher();
}