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:
@@ -286,12 +286,9 @@ public:
|
||||
ReplaceInTrie() { }
|
||||
void operator()(QString s)
|
||||
{
|
||||
QHashIterator<QString, QString> i(replacements);
|
||||
QString res = s;
|
||||
while (i.hasNext()) {
|
||||
i.next();
|
||||
for (auto i = replacements.cbegin(), end = replacements.cend(); i != end; ++i)
|
||||
res.replace(i.key(), i.value());
|
||||
}
|
||||
trie = TrieNode::insertF(trie,res);
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user