diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-12-03 13:06:12 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-19 07:41:50 +0000 |
commit | 66441d7a828ddcdae709cf4699420147f376bdcd (patch) | |
tree | fc16433f11c0eb8dd05971566528c70686a72dcc /src/corelib/statemachine | |
parent | 0f923a8ce45a0b9379bf0a43e68897a3a8333fda (diff) |
Make use of new QHash::erase(const_iterator) overload
Drive-by changes:
- use auto for iterators
- add Q_UNLIKELY for conditions leading to a qWarning etc
Change-Id: Iff8f36d67c96674d354a501b26640f73c15ce58d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sérgio Martins <iamsergio@gmail.com>
Diffstat (limited to 'src/corelib/statemachine')
-rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 20d5ed890b..0ce3ecc30e 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -1341,9 +1341,8 @@ void QStateMachinePrivate::unregisterRestorables(const QList<QAbstractState *> & if (it == registeredRestorablesForState.end()) continue; QHash<RestorableId, QVariant> &restorables = it.value(); - QHash<RestorableId, QVariant>::iterator it2; - it2 = restorables.find(id); - if (it2 == restorables.end()) + const auto it2 = restorables.constFind(id); + if (it2 == restorables.cend()) continue; #ifdef QSTATEMACHINE_RESTORE_PROPERTIES_DEBUG qDebug() << q_func() << ": unregistered for" << s; |