examples: port away from Java-style iterators

There's no reason to use them here, the Mutable is misleading in a
few instances, ranged-for is much simpler, and more future-proof.

Change-Id: Ifd5eaae95bbaa0b4cf0f435e6cfee6d778817b44
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Marc Mutz 2017-12-14 00:29:30 +01:00
parent 923e08132c
commit b4a88aa758
4 changed files with 6 additions and 19 deletions

View File

@ -247,12 +247,8 @@ void GLWidget::createBubbles(int number)
//! [13]
void GLWidget::animate()
{
QMutableListIterator<Bubble*> iter(bubbles);
while (iter.hasNext()) {
Bubble *bubble = iter.next();
for (Bubble *bubble : qAsConst(bubbles))
bubble->move(rect());
}
update();
}
//! [13]

View File

@ -399,12 +399,9 @@ void GLWidget::paintGL()
painter.end();
QMutableListIterator<Bubble*> iter(m_bubbles);
while (iter.hasNext()) {
Bubble *bubble = iter.next();
for (Bubble *bubble : qAsConst(m_bubbles))
bubble->move(rect());
}
if (!(m_frames % 100)) {
m_time.start();
m_frames = 0;

View File

@ -126,11 +126,8 @@ WordCount countWords(const QString &file)
// at a time.
void reduce(WordCount &result, const WordCount &w)
{
QMapIterator<QString, int> i(w);
while (i.hasNext()) {
i.next();
for (auto i = w.begin(), end = w.end(); i != end; ++i)
result[i.key()] += i.value();
}
}
int main(int argc, char** argv)

View File

@ -163,11 +163,8 @@ QStringList LanguageChooser::findQmFiles()
QDir dir(":/translations");
QStringList fileNames = dir.entryList(QStringList("*.qm"), QDir::Files,
QDir::Name);
QMutableStringListIterator i(fileNames);
while (i.hasNext()) {
i.next();
i.setValue(dir.filePath(i.value()));
}
for (QString &fileName : fileNames)
fileName = dir.filePath(fileName);
return fileNames;
}