forked from qt-creator/qt-creator
Compile fix with recent Qt dev
The reasoning in 1b4766e26c 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>
This commit is contained in:
@@ -814,9 +814,8 @@ static void find_helper(QFutureInterface<FindReferences::Usage> &future,
|
||||
// update snapshot from workingCopy to make sure it's up to date
|
||||
// ### remove?
|
||||
// ### this is a great candidate for map-reduce
|
||||
QHashIterator< QString, QPair<QString, int> > it(workingCopy.all());
|
||||
while (it.hasNext()) {
|
||||
it.next();
|
||||
const ModelManagerInterface::WorkingCopy::Table &all = workingCopy.all();
|
||||
for (auto it = all.cbegin(), end = all.cend(); it != end; ++it) {
|
||||
const QString fileName = it.key();
|
||||
Document::Ptr oldDoc = snapshot.document(fileName);
|
||||
if (oldDoc && oldDoc->editorRevision() == it.value().second)
|
||||
|
||||
@@ -139,9 +139,7 @@ public:
|
||||
|
||||
// handle inner ids
|
||||
QString innerIdForwarders;
|
||||
QHashIterator<QString, SourceLocation> it(innerIds);
|
||||
while (it.hasNext()) {
|
||||
it.next();
|
||||
for (auto it = innerIds.cbegin(), end = innerIds.cend(); it != end; ++it) {
|
||||
const QString innerId = it.key();
|
||||
comment += tr("// Rename all outer uses of the id \"%1\" to \"%2.item.%1\".\n").arg(
|
||||
innerId, loaderId);
|
||||
|
||||
Reference in New Issue
Block a user