From 4e7daf6ea09804287c5baa4d97783a3b54f9a8f4 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 21 Jul 2022 09:30:07 +0200 Subject: [PATCH] SubmitEditorWidget: Use Utils::Guard Change-Id: I7db043bc6f3226fff6c5bbb67139902fc99cb563 Reviewed-by: Orgad Shaneh --- src/plugins/vcsbase/submiteditorwidget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/vcsbase/submiteditorwidget.cpp b/src/plugins/vcsbase/submiteditorwidget.cpp index 26a7fd600dc..814c71bfb36 100644 --- a/src/plugins/vcsbase/submiteditorwidget.cpp +++ b/src/plugins/vcsbase/submiteditorwidget.cpp @@ -29,6 +29,7 @@ #include "ui_submiteditorwidget.h" #include +#include #include #include @@ -121,9 +122,9 @@ struct SubmitEditorWidgetPrivate bool m_filesSelected = false; bool m_emptyFileListEnabled = false; bool m_commitEnabled = false; - bool m_ignoreChange = false; bool m_descriptionMandatory = true; bool m_updateInProgress = false; + Guard m_ignoreChanges; }; SubmitEditorWidget::SubmitEditorWidget() : @@ -444,7 +445,7 @@ void SubmitEditorWidget::updateDiffAction() void SubmitEditorWidget::updateCheckAllComboBox() { - d->m_ignoreChange = true; + const GuardLocker locker(d->m_ignoreChanges); int checkedCount = checkedFilesCount(); if (checkedCount == 0) d->m_ui.checkAllCheckBox->setCheckState(Qt::Unchecked); @@ -452,7 +453,6 @@ void SubmitEditorWidget::updateCheckAllComboBox() d->m_ui.checkAllCheckBox->setCheckState(Qt::Checked); else d->m_ui.checkAllCheckBox->setCheckState(Qt::PartiallyChecked); - d->m_ignoreChange = false; } bool SubmitEditorWidget::hasSelection() const @@ -669,7 +669,7 @@ void SubmitEditorWidget::editorCustomContextMenuRequested(const QPoint &pos) void SubmitEditorWidget::checkAllToggled() { - if (d->m_ignoreChange) + if (d->m_ignoreChanges.isLocked()) return; Qt::CheckState checkState = d->m_ui.checkAllCheckBox->checkState(); fileModel()->setAllChecked(checkState == Qt::Checked || checkState == Qt::PartiallyChecked);