From 933f5a0df5cb7e3e71f61bf0be343d9fbe372d92 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 8 Feb 2019 14:21:30 +0100 Subject: [PATCH] ClangTools: Refer to items consistently 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 --- src/plugins/clangtools/clangtidyclazytool.cpp | 14 +++++++------- .../clangtools/clangtoolsdiagnosticmodel.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/clangtools/clangtidyclazytool.cpp b/src/plugins/clangtools/clangtidyclazytool.cpp index aa9853825cf..e4377fa681b 100644 --- a/src/plugins/clangtools/clangtidyclazytool.cpp +++ b/src/plugins/clangtools/clangtidyclazytool.cpp @@ -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({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); diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp index 6e16cc6eec5..88b80965181 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp +++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp @@ -84,7 +84,7 @@ ClangToolsDiagnosticModel::ClangToolsDiagnosticModel(QObject *parent) : Utils::TreeModel<>(parent) , m_filesWatcher(std::make_unique()) { - setHeader({tr("Issue"), tr("Fixit Status")}); + setHeader({tr("Diagnostic"), tr("Fixit Status")}); connectFileWatcher(); }