From d2ce0145898b1399401f11e73a8e78173907ec6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Thu, 1 Jun 2017 11:16:09 +0100
Subject: [PATCH] Use range based for instead of Q_FOREACH.

Bump Qt version requirements to 5.7.0
---
 CMakeLists.txt                             | 2 +-
 src/core/partitiontable.cpp                | 8 +++++---
 src/plugins/libparted/libpartedbackend.cpp | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d677a0c..4e47dd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 set(CMAKE_USE_RELATIVE_PATHS OFF)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 
-set(QT_MIN_VERSION "5.6.1")
+set(QT_MIN_VERSION "5.7.0")
 set(VERSION_MAJOR "3")
 set(VERSION_MINOR "0")
 set(VERSION_RELEASE "50")
diff --git a/src/core/partitiontable.cpp b/src/core/partitiontable.cpp
index 186f7c8..c34d367 100644
--- a/src/core/partitiontable.cpp
+++ b/src/core/partitiontable.cpp
@@ -566,17 +566,19 @@ QTextStream& operator<<(QTextStream& stream, const PartitionTable& ptable)
         if (!p->roles().has(PartitionRole::Unallocated)) {
             partitions.append(p);
 
-            if (p->roles().has(PartitionRole::Extended))
-                for (const auto &child : p->children()) {
+            if (p->roles().has(PartitionRole::Extended)) {
+                const auto partChildren = p->children();
+                for (const auto &child : partChildren) {
                     if (!child->roles().has(PartitionRole::Unallocated))
                         partitions.append(child);
                 }
+            }
         }
     }
 
     std::sort(partitions.begin(), partitions.end(), [](const Partition* p1, const Partition* p2) { return p1->number() < p2->number(); });
 
-    foreach(const auto &p, partitions)
+    for (const auto &p : qAsConst(partitions))
         stream << *p;
 
     return stream;
diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp
index 3c1283c..c7a7205 100644
--- a/src/plugins/libparted/libpartedbackend.cpp
+++ b/src/plugins/libparted/libpartedbackend.cpp
@@ -374,7 +374,7 @@ void LibPartedBackend::scanDevicePartitions(Device& d, PedDisk* pedDisk)
     if (d.partitionTable()->isSectorBased(d))
         d.partitionTable()->setType(d, PartitionTable::msdos_sectorbased);
 
-    foreach(const Partition * part, partitions)
+    for (const Partition * part : qAsConst(partitions))
         PartitionAlignment::isAligned(d, *part);
 }