Replace manual signal blocking/unblocking with QSignalBlocker

Change-Id: Ibb59fab4e37d045e506c5a8172b6f5cbb955b028
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-09-30 07:12:57 +02:00
parent 7c3ea5a78c
commit c330cf0679
39 changed files with 195 additions and 226 deletions

View File

@@ -301,13 +301,14 @@ void FindPrivate::readSettings()
{
QSettings *settings = ICore::settings();
settings->beginGroup(QLatin1String("Find"));
bool block = m_instance->blockSignals(true);
Find::setBackward(settings->value(QLatin1String("Backward"), false).toBool());
Find::setCaseSensitive(settings->value(QLatin1String("CaseSensitively"), false).toBool());
Find::setWholeWord(settings->value(QLatin1String("WholeWords"), false).toBool());
Find::setRegularExpression(settings->value(QLatin1String("RegularExpression"), false).toBool());
Find::setPreserveCase(settings->value(QLatin1String("PreserveCase"), false).toBool());
m_instance->blockSignals(block);
{
QSignalBlocker blocker(m_instance);
Find::setBackward(settings->value(QLatin1String("Backward"), false).toBool());
Find::setCaseSensitive(settings->value(QLatin1String("CaseSensitively"), false).toBool());
Find::setWholeWord(settings->value(QLatin1String("WholeWords"), false).toBool());
Find::setRegularExpression(settings->value(QLatin1String("RegularExpression"), false).toBool());
Find::setPreserveCase(settings->value(QLatin1String("PreserveCase"), false).toBool());
}
m_findCompletions = settings->value(QLatin1String("FindStrings")).toStringList();
m_replaceCompletions = settings->value(QLatin1String("ReplaceStrings")).toStringList();
m_findCompletionModel.setStringList(m_findCompletions);