Port away from most cases of Q_FOREACH to C++11 ranged for loop.

In order to avoid deep copies, Qt containers over which we iterate must be const
The remaining unported cases require qAsConst (Qt 5.7) or std::as_const (C++17)

src/modules/partition/gui/AlongsidePage.cpp

@@ -129,7 +129,7 @@ AlongsidePage::init( PartitionCoreModule* core )
                                         string( Calamares::Branding::ProductName ) ) );
     } );
 
-    foreach ( const OsproberEntry& e, m_core->osproberEntries() )
+    for ( const OsproberEntry& e : m_core->osproberEntries() )
     {
         if ( e.canBeResized )
             m_partitionsComboBox->addItem( e.prettyName + " (" + e.path + ")", e.path );

src/modules/partition/gui/ChoicePage.cpp

@@ -733,7 +733,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
                 // Find out is the selected partition has a rootfs. If yes, then make the
                 // m_reuseHomeCheckBox visible and set its text to something meaningful.
                 homePartitionPath->clear();
-                foreach ( const OsproberEntry& osproberEntry, m_core->osproberEntries() )
+                for ( const OsproberEntry& osproberEntry : m_core->osproberEntries() )
                     if ( osproberEntry.path == partPath )
                         *homePartitionPath = osproberEntry.homePath;
                 if ( homePartitionPath->isEmpty() )
@@ -1329,7 +1329,7 @@ OsproberEntryList
 ChoicePage::getOsproberEntriesForDevice( Device* device ) const
 {
     OsproberEntryList eList;
-    foreach ( const OsproberEntry& entry, m_core->osproberEntries() )
+    for ( const OsproberEntry& entry : m_core->osproberEntries() )
     {
         if ( entry.path.startsWith( device->deviceNode() ) )
             eList.append( entry );

src/modules/partition/gui/PartitionLabelsView.cpp

@@ -240,11 +240,11 @@ PartitionLabelsView::drawLabels( QPainter* painter,
     if ( !modl )
         return;
 
-    QModelIndexList indexesToDraw = getIndexesToDraw( parent );
+    const QModelIndexList indexesToDraw = getIndexesToDraw( parent );
 
     int label_x = rect.x();
     int label_y = rect.y();
-    foreach ( const QModelIndex& index, indexesToDraw )
+    for ( const QModelIndex& index : indexesToDraw )
     {
         QStringList texts = buildTexts( index );
 
@@ -306,12 +306,12 @@ PartitionLabelsView::sizeForAllLabels( int maxLineWidth ) const
     if ( !modl )
         return QSize();
 
-    QModelIndexList indexesToDraw = getIndexesToDraw( QModelIndex() );
+    const QModelIndexList indexesToDraw = getIndexesToDraw( QModelIndex() );
 
     int lineLength = 0;
     int numLines = 1;
     int singleLabelHeight = 0;
-    foreach ( const QModelIndex& index, indexesToDraw )
+    for ( const QModelIndex& index : indexesToDraw )
     {
         QStringList texts = buildTexts( index );
 
@@ -349,7 +349,7 @@ PartitionLabelsView::sizeForLabel( const QStringList& text ) const
 {
     int vertOffset = 0;
     int width = 0;
-    foreach ( const QString& textLine, text )
+    for ( const QString& textLine : text )
     {
         QSize textSize = fontMetrics().size( Qt::TextSingleLine, textLine );
 
@@ -371,7 +371,7 @@ PartitionLabelsView::drawLabel( QPainter* painter,
     painter->setPen( Qt::black );
     int vertOffset = 0;
     int width = 0;
-    foreach ( const QString& textLine, text )
+    for ( const QString& textLine : text )
     {
         QSize textSize = painter->fontMetrics().size( Qt::TextSingleLine, textLine );
         painter->drawText( pos.x()+LABEL_PARTITION_SQUARE_MARGIN,
@@ -402,12 +402,12 @@ PartitionLabelsView::indexAt( const QPoint& point ) const
     if ( !modl )
         return QModelIndex();
 
-    QModelIndexList indexesToDraw = getIndexesToDraw( QModelIndex() );
+    const QModelIndexList indexesToDraw = getIndexesToDraw( QModelIndex() );
 
     QRect rect = this->rect();
     int label_x = rect.x();
     int label_y = rect.y();
-    foreach ( const QModelIndex& index, indexesToDraw )
+    for ( const QModelIndex& index : indexesToDraw )
     {
         QStringList texts = buildTexts( index );
 
@@ -437,12 +437,12 @@ PartitionLabelsView::visualRect( const QModelIndex& idx ) const
     if ( !modl )
         return QRect();
 
-    QModelIndexList indexesToDraw = getIndexesToDraw( QModelIndex() );
+    const QModelIndexList indexesToDraw = getIndexesToDraw( QModelIndex() );
 
     QRect rect = this->rect();
     int label_x = rect.x();
     int label_y = rect.y();
-    foreach ( const QModelIndex& index, indexesToDraw )
+    for ( const QModelIndex& index : indexesToDraw )
     {
         QStringList texts = buildTexts( index );
 

src/modules/partition/gui/PartitionSplitterWidget.cpp

@@ -105,7 +105,7 @@ PartitionSplitterWidget::setupItems( const QVector<PartitionSplitterItem>& items
     m_items.clear();
     m_items = items;
     repaint();
-    foreach ( const PartitionSplitterItem& item, items )
+    for ( const PartitionSplitterItem& item : items )
         cDebug() << "PSI added item" << item.itemPath << "size" << item.size;
 }
 

src/modules/partition/gui/ReplaceWidget.cpp

@@ -149,7 +149,7 @@ ReplaceWidget::onPartitionSelected()
     PartitionModel* model = qobject_cast< PartitionModel* >( m_ui->partitionTreeView->model() );
     if ( model && ok )
     {
-        QStringList osproberLines = Calamares::JobQueue::instance()
+        const QStringList osproberLines = Calamares::JobQueue::instance()
                                     ->globalStorage()
                                     ->value( "osproberLines" ).toStringList();
 
@@ -197,7 +197,7 @@ ReplaceWidget::onPartitionSelected()
 
         QString prettyName = tr( "Data partition (%1)" )
                              .arg( partition->fileSystem().name() );
-        foreach ( const QString& line, osproberLines )
+        for ( const QString& line : osproberLines )
         {
             QStringList lineColumns = line.split( ':' );