4 files changed, 31 insertions, 19 deletions
diff --git a/examples/svg/embedded/desktopservices/contenttab.cpp b/examples/svg/embedded/desktopservices/contenttab.cpp
index d388c23..8d467df 100644
--- a/examples/svg/embedded/desktopservices/contenttab.cpp
+++ b/examples/svg/embedded/desktopservices/contenttab.cpp
@@ -104,10 +104,9 @@ void ContentTab::setIcon(const QString &icon)
 
 void ContentTab::populateListWidget()
 {
-    QFileInfoList fileList = m_ContentDir.entryInfoList(QDir::Files, QDir::Time);
-    foreach(QFileInfo item, fileList) {
+    const QFileInfoList fileList = m_ContentDir.entryInfoList(QDir::Files, QDir::Time);
+    for (const QFileInfo &item : fileList)
         new QListWidgetItem(m_Icon, itemName(item), this);
-    }
 }
 
 QString ContentTab::itemName(const QFileInfo &item)
diff --git a/examples/svg/network/bearercloud/bearercloud.cpp b/examples/svg/network/bearercloud/bearercloud.cpp
index 1ec711e..bf2a444 100644
--- a/examples/svg/network/bearercloud/bearercloud.cpp
+++ b/examples/svg/network/bearercloud/bearercloud.cpp
@@ -113,17 +113,19 @@ void BearerCloud::cloudMoved()
 
 void BearerCloud::timerEvent(QTimerEvent *)
 {
-    QList<Cloud *> clouds;
-    foreach (QGraphicsItem *item, items()) {
+    std::vector<Cloud *> clouds;
+    const auto graphicsItems = items();
+    clouds.reserve(graphicsItems.size());
+    for (QGraphicsItem *item : graphicsItems) {
         if (Cloud *cloud = qgraphicsitem_cast<Cloud *>(item))
-            clouds << cloud;
+            clouds.push_back(cloud);
     }
 
-    foreach (Cloud *cloud, clouds)
+    for (Cloud *cloud : clouds)
         cloud->calculateForces();
 
     bool cloudsMoved = false;
-    foreach (Cloud *cloud, clouds)
+    for (Cloud *cloud : clouds)
         cloudsMoved |= cloud->advance();
 
     if (!cloudsMoved) {
@@ -158,8 +160,13 @@ void BearerCloud::configurationAdded(const QNetworkConfiguration &config)
 //! [3]
 void BearerCloud::configurationRemoved(const QNetworkConfiguration &config)
 {
-    foreach (const QNetworkConfiguration::StateFlags &state, configStates.uniqueKeys())
-        configStates.remove(state, config.identifier());
+    const auto id = config.identifier();
+    for (auto it = configStates.begin(), end = configStates.end(); it != end; /* erasing */) {
+        if (it.value() == id)
+            it = configStates.erase(it);
+        else
+            ++it;
+    }
 
     Cloud *item = configurations.take(config.identifier());
 
@@ -173,10 +180,15 @@ void BearerCloud::configurationRemoved(const QNetworkConfiguration &config)
 //! [4]
 void BearerCloud::configurationChanged(const QNetworkConfiguration &config)
 {
-    foreach (const QNetworkConfiguration::StateFlags &state, configStates.uniqueKeys())
-        configStates.remove(state, config.identifier());
+    const auto id = config.identifier();
+    for (auto it = configStates.begin(), end = configStates.end(); it != end; /* erasing */) {
+        if (it.value() == id)
+            it = configStates.erase(it);
+        else
+            ++it;
+    }
 
-    configStates.insert(config.state(), config.identifier());
+    configStates.insert(config.state(), id);
 
     cloudMoved();
 }
@@ -185,10 +197,9 @@ void BearerCloud::configurationChanged(const QNetworkConfiguration &config)
 //! [1]
 void BearerCloud::updateConfigurations()
 {
-    QList<QNetworkConfiguration> allConfigurations = manager.allConfigurations();
-
-    while (!allConfigurations.isEmpty())
-        configurationAdded(allConfigurations.takeFirst());
+    const auto allConfigurations = manager.allConfigurations();
+    for (const QNetworkConfiguration &config : allConfigurations)
+        configurationAdded(config);
 
     cloudMoved();
 }
diff --git a/examples/svg/network/bearercloud/cloud.cpp b/examples/svg/network/bearercloud/cloud.cpp
index 936c03a..fb5bfd2 100644
--- a/examples/svg/network/bearercloud/cloud.cpp
+++ b/examples/svg/network/bearercloud/cloud.cpp
@@ -108,7 +108,8 @@ void Cloud::calculateForces()
     qreal xvel = 0;
     qreal yvel = 0;
     QLineF orbitForce;
-    foreach (QGraphicsItem *item, scene()->items()) {
+    const auto graphicsItems = scene()->items();
+    for (QGraphicsItem *item : graphicsItems) {
         // other clouds
         Cloud *cloud = qgraphicsitem_cast<Cloud *>(item);
         if (!cloud && item->data(0) != QLatin1String("This Device"))
diff --git a/examples/svg/svgviewer/exportdialog.cpp b/examples/svg/svgviewer/exportdialog.cpp
index 04c9e12..b7cb96a 100644
--- a/examples/svg/svgviewer/exportdialog.cpp
+++ b/examples/svg/svgviewer/exportdialog.cpp
@@ -195,7 +195,8 @@ void ExportDialog::browse()
     if (!fileName.isEmpty())
         fileDialog.setDirectory(QFileInfo(fileName).absolutePath());
     QStringList mimeTypes;
-    foreach (const QByteArray &mimeType, QImageWriter::supportedMimeTypes())
+    const auto supportedMimeTypes = QImageWriter::supportedMimeTypes();
+    for (const QByteArray &mimeType : supportedMimeTypes)
         mimeTypes.append(QLatin1String(mimeType));
     fileDialog.setMimeTypeFilters(mimeTypes);
     const int pngIndex = mimeTypes.indexOf("image/png");