diff options
author | hjk <hjk@qt.io> | 2019-07-24 13:43:54 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-07-29 08:54:18 +0000 |
commit | e3b1106afae5de6cd54ce627a0b11be041624591 (patch) | |
tree | accfac6791013e79476650b6dd840d5cf243e12b /src/plugins/cppeditor/cppfunctiondecldeflink.cpp | |
parent | 02e224fcfa7135f1e32adb02a14426ea153ae618 (diff) | |
download | qt-creator-e3b1106afae5de6cd54ce627a0b11be041624591.tar.gz |
Compile fix with recent Qt dev
The reasoning in 1b4766e26c6b did not take into account that the scope
of QT_NO_JAVA_STYLE_ITERATORS may change over time, as done with
f70905448f6 in Qt base.
Change-Id: Ib1966ff26c4d36d5f62e149d6b45baa4aecf825d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/cppeditor/cppfunctiondecldeflink.cpp')
-rw-r--r-- | src/plugins/cppeditor/cppfunctiondecldeflink.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp index 2a53648b31..beb2e2aaf7 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp @@ -878,9 +878,8 @@ ChangeSet FunctionDeclDefLink::changes(const Snapshot &snapshot, int targetOffse const LocalSymbols localSymbols(targetFile->cppDocument(), targetDefinition); const int endOfArguments = targetFile->endOf(targetFunctionDeclarator->rparen_token); - QHashIterator<Symbol *, QString> it(renamedTargetParameters); - while (it.hasNext()) { - it.next(); + for (auto it = renamedTargetParameters.cbegin(), end = renamedTargetParameters.cend(); + it != end; ++it) { const QList<SemanticInfo::Use> &uses = localSymbols.uses.value(it.key()); foreach (const SemanticInfo::Use &use, uses) { if (use.isInvalid()) |