diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2015-12-12 20:27:35 +0000 |
|---|---|---|
| committer | Sérgio Martins <iamsergio@gmail.com> | 2015-12-15 22:03:38 +0000 |
| commit | 142b97ce92c6b7d9ef9c5febebf748ea79ea4eea (patch) | |
| tree | 600777f276564c07fdc43864d7090232d180ff10 /src/plugins | |
| parent | 57f7fe3e1c92d11bb9e3bf2c87a11e4bc740e255 (diff) | |
Fix build with QT_STRICT_ITERATORS
Change-Id: Ie25b5fa4f25392da29389c990494f704b7c80c95
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp index e3347be14c..0469cd51d6 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp @@ -280,8 +280,8 @@ QV4::ReturnedValue QV4DataCollector::getValue(Ref ref) bool QV4DataCollector::lookupSpecialRef(Ref ref, QJsonObject *dict) { - SpecialRefs::const_iterator it = specialRefs.find(ref); - if (it == specialRefs.end()) + SpecialRefs::const_iterator it = specialRefs.constFind(ref); + if (it == specialRefs.cend()) return false; *dict = it.value(); diff --git a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp index 93e01b3824..58eadbcf7e 100644 --- a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp +++ b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp @@ -280,9 +280,8 @@ void QQmlNativeDebugConnector::announceObjectAvailability(const QString &objectT bool QQmlNativeDebugConnector::addService(const QString &name, QQmlDebugService *service) { TRACE_PROTOCOL("Add service to connector: " << qPrintable(name) << service); - for (QVector<QQmlDebugService *>::ConstIterator i = m_services.begin(); i != m_services.end(); - ++i) { - if ((*i)->name() == name) + for (auto it = m_services.cbegin(), end = m_services.cend(); it != end; ++it) { + if ((*it)->name() == name) return false; } |