applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-28 09:55:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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)
This commit is contained in:
Andrius Štikonas 2016-09-01 13:21:05 +01:00
parent b0122f25e5
commit 9f0ca042fe
35 changed files with 105 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/partition/gui/PartitionLabelsView.cpp
View file

@ -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 );