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

ClangTools: Fix terminology

Browse Source 
Make it clear we don't disable specific diagnostics, but the checks that
triggered them.

Change-Id: Ie9b5568a1749f59d80827e342cb5299ebfc63227
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-24 14:35:11 +01:00
parent 02c876f6e8
commit a10a1acd23
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/clangtools/clangtoolsdiagnosticview.cpp
View File

@@ -175,7 +175,7 @@ DiagnosticView::DiagnosticView(QWidget *parent)
m_disableGloballyAction = new QAction(this); m_disableGloballyAction = new QAction(this);
connect(m_disableGloballyAction, &QAction::triggered, connect(m_disableGloballyAction, &QAction::triggered,
this, &DiagnosticView::disableCurrentDiagnosticGlobally); this, &DiagnosticView::disableCheckForCurrentDiagnosticGlobally);
installEventFilter(this); installEventFilter(this);
@@ -239,7 +239,7 @@ void DiagnosticView::suppressCurrentDiagnostic()
filterModel->addSuppressedDiagnostics(diags); filterModel->addSuppressedDiagnostics(diags);
} }
void DiagnosticView::disableCurrentDiagnosticGlobally() void DiagnosticView::disableCheckForCurrentDiagnosticGlobally()
{ {
ClangToolsSettings * const settings = ClangToolsSettings::instance(); ClangToolsSettings * const settings = ClangToolsSettings::instance();
ClangDiagnosticConfigs configs = settings->diagnosticConfigs(); ClangDiagnosticConfigs configs = settings->diagnosticConfigs();
@@ -386,8 +386,8 @@ QList<QAction *> DiagnosticView::customActions() const
m_suppressAction->setText(hasMultiSelection ? tr("Suppress Selected Diagnostics") m_suppressAction->setText(hasMultiSelection ? tr("Suppress Selected Diagnostics")
: tr("Suppress This Diagnostic")); : tr("Suppress This Diagnostic"));
m_disableGloballyAction->setEnabled(disableGloballyEnabled()); m_disableGloballyAction->setEnabled(disableGloballyEnabled());
m_disableGloballyAction->setText(hasMultiSelection ? tr("Disable Selected Diagnostics Globally") m_disableGloballyAction->setText(hasMultiSelection ? tr("Disable These Checks Globally")
: tr("Disable This Diagnostic Globally")); : tr("Disable This Check Globally"));
return { return {
m_help, m_help,

2
src/plugins/clangtools/clangtoolsdiagnosticview.h
View File

@@ -61,7 +61,7 @@ private:
void openEditorForCurrentIndex(); void openEditorForCurrentIndex();
void suppressCurrentDiagnostic(); void suppressCurrentDiagnostic();
void disableCurrentDiagnosticGlobally(); void disableCheckForCurrentDiagnosticGlobally();
enum Direction { Next = 1, Previous = -1 }; enum Direction { Next = 1, Previous = -1 };
QModelIndex getIndex(const QModelIndex &index, Direction direction) const; QModelIndex getIndex(const QModelIndex &index, Direction direction) const;
QModelIndex getTopLevelIndex(const QModelIndex &index, Direction direction) const; QModelIndex getTopLevelIndex(const QModelIndex &index, Direction direction) const;