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

Partition: reduce code duplications

Browse Source
This commit is contained in:
Adriaan de Groot 2017-07-12 05:54:22 -04:00
parent 7d49255a78
commit 18a1f459db
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/partition/core/DeviceList.cpp
View File

@ -98,6 +98,13 @@ isIso9660( const Device* device )
} }
static inline QDebug&
operator <<( QDebug& s, QList< Device* >::iterator& it )
{
s << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) );
return s;
}
QList< Device* > getDevices( DeviceType which ) QList< Device* > getDevices( DeviceType which )
{ {
bool writableOnly = (which == DeviceType::WritableOnly); bool writableOnly = (which == DeviceType::WritableOnly);
@ -115,7 +122,7 @@ QList< Device* > getDevices( DeviceType which )
( *it )->deviceNode().startsWith( "/dev/zram" ) ( *it )->deviceNode().startsWith( "/dev/zram" )
) )
{ {
cDebug() << " .. Removing" << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) ); cDebug() << " .. Removing" << it;
it = devices.erase( it ); it = devices.erase( it );
} }
@ -125,7 +132,7 @@ QList< Device* > getDevices( DeviceType which )
isMounted( *it ) ) isMounted( *it ) )
) )
{ {
cDebug() << " .. Removing" << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) ); cDebug() << " .. Removing" << it;
it = devices.erase( it ); it = devices.erase( it );
} }
else else