napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use iterators instead.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-02-17 17:17:50 +01:00
parent dc038dfe1e
commit 569f2d9d50
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/partition/gui/PartitionSplitterWidget.cpp
View File

@ -280,33 +280,36 @@ PartitionSplitterWidget::mouseMoveEvent( QMouseEvent* event )
if ( m_resizing ) if ( m_resizing )
{ {
qint64 start = 0; qint64 start = 0;
foreach ( const PartitionSplitterItem& item, m_items ) QString itemPath = m_itemToResize->itemPath;
for ( auto it = m_items.constBegin();
it != m_items.constEnd(); ++it )
{ {
if ( item.itemPath == m_itemToResize->itemPath ) if ( it->itemPath == itemPath )
break; break;
else if ( !item.children.isEmpty() ) else if ( !it->children.isEmpty() )
{ {
bool done = false; bool done = false;
foreach ( const PartitionSplitterItem& child, item.children ) for ( auto jt = it->children.constBegin();
jt != it->children.constEnd(); ++jt )
{ {
if ( child.itemPath == m_itemToResize->itemPath ) if ( jt->itemPath == itemPath )
{ {
done = true; done = true;
break; break;
} }
start += child.size; start += jt->size;
} }
if ( done ) if ( done )
break; break;
} }
else else
start += item.size; start += it->size;
} }
qint64 total = 0; qint64 total = 0;
for ( int row = 0; row < m_items.count(); ++row ) for ( auto it = m_items.constBegin(); it != m_items.constEnd(); ++it )
{ {
total += m_items[ row ].size; total += it->size;
} }
int ew = rect().width(); //effective width int ew = rect().width(); //effective width
@ -328,7 +331,7 @@ PartitionSplitterWidget::mouseMoveEvent( QMouseEvent* event )
repaint(); repaint();
emit partitionResized( m_itemToResize->itemPath, emit partitionResized( itemPath,
m_itemToResize->size, m_itemToResize->size,
m_itemToResizeNext->size ); m_itemToResizeNext->size );
} }