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

SubmitEditorWidget: Use Utils::Guard

Browse Source 
Change-Id: I7db043bc6f3226fff6c5bbb67139902fc99cb563
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-07-21 09:30:07 +02:00
parent 956cc2a257
commit 4e7daf6ea0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/vcsbase/submiteditorwidget.cpp
View File

@@ -29,6 +29,7 @@
#include "ui_submiteditorwidget.h" #include "ui_submiteditorwidget.h"
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/guard.h>
#include <utils/theme/theme.h> #include <utils/theme/theme.h>
#include <QDebug> #include <QDebug>
@@ -121,9 +122,9 @@ struct SubmitEditorWidgetPrivate
bool m_filesSelected = false; bool m_filesSelected = false;
bool m_emptyFileListEnabled = false; bool m_emptyFileListEnabled = false;
bool m_commitEnabled = false; bool m_commitEnabled = false;
bool m_ignoreChange = false;
bool m_descriptionMandatory = true; bool m_descriptionMandatory = true;
bool m_updateInProgress = false; bool m_updateInProgress = false;
Guard m_ignoreChanges;
}; };
SubmitEditorWidget::SubmitEditorWidget() : SubmitEditorWidget::SubmitEditorWidget() :
@@ -444,7 +445,7 @@ void SubmitEditorWidget::updateDiffAction()
void SubmitEditorWidget::updateCheckAllComboBox() void SubmitEditorWidget::updateCheckAllComboBox()
{ {
d->m_ignoreChange = true; const GuardLocker locker(d->m_ignoreChanges);
int checkedCount = checkedFilesCount(); int checkedCount = checkedFilesCount();
if (checkedCount == 0) if (checkedCount == 0)
d->m_ui.checkAllCheckBox->setCheckState(Qt::Unchecked); d->m_ui.checkAllCheckBox->setCheckState(Qt::Unchecked);
@@ -452,7 +453,6 @@ void SubmitEditorWidget::updateCheckAllComboBox()
d->m_ui.checkAllCheckBox->setCheckState(Qt::Checked); d->m_ui.checkAllCheckBox->setCheckState(Qt::Checked);
else else
d->m_ui.checkAllCheckBox->setCheckState(Qt::PartiallyChecked); d->m_ui.checkAllCheckBox->setCheckState(Qt::PartiallyChecked);
d->m_ignoreChange = false;
} }
bool SubmitEditorWidget::hasSelection() const bool SubmitEditorWidget::hasSelection() const
@@ -669,7 +669,7 @@ void SubmitEditorWidget::editorCustomContextMenuRequested(const QPoint &pos)
void SubmitEditorWidget::checkAllToggled() void SubmitEditorWidget::checkAllToggled()
{ {
if (d->m_ignoreChange) if (d->m_ignoreChanges.isLocked())
return; return;
Qt::CheckState checkState = d->m_ui.checkAllCheckBox->checkState(); Qt::CheckState checkState = d->m_ui.checkAllCheckBox->checkState();
fileModel()->setAllChecked(checkState == Qt::Checked || checkState == Qt::PartiallyChecked); fileModel()->setAllChecked(checkState == Qt::Checked || checkState == Qt::PartiallyChecked);