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

[libcalamares] Reformat new code in partition service

Browse Source
This commit is contained in:
Adriaan de Groot 2019-06-13 14:47:44 +02:00
parent 4b3bb54320
commit 93742a8efe
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libcalamares/partition/PartitionQuery.cpp
View File

@ -59,7 +59,9 @@ findPartitionByCurrentMountPoint( const QList< Device* >& devices, const QString
for ( auto device : devices )
for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it )
if ( ( *it )->mountPoint() == mountPoint )
{
return *it;
}
return nullptr;
}
@ -68,28 +70,33 @@ Partition*
findPartitionByPath( const QList< Device* >& devices, const QString& path )
{
if ( path.simplified().isEmpty() )
{
return nullptr;
}
for ( auto device : devices )
for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it )
if ( ( *it )->partitionPath() == path.simplified() )
{
return *it;
}
return nullptr;
}
QList< Partition* >
findPartitions( const QList< Device* >& devices,
std::function< bool ( Partition* ) > criterionFunction )
findPartitions( const QList< Device* >& devices, std::function< bool( Partition* ) > criterionFunction )
{
QList< Partition* > results;
for ( auto device : devices )
for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it )
if ( criterionFunction( *it ) )
{
results.append( *it );
}
return results;
}
}
} // namespace
} // namespace Partition
} // namespace CalamaresUtils

22
src/libcalamares/partition/PartitionQuery.h
View File

@ -33,38 +33,42 @@ namespace CalamaresUtils
{
namespace Partition
{
using ::Device;
using ::Partition;
/** @brief Is this a free-space area? */
bool isPartitionFreeSpace( ::Partition* );
bool isPartitionFreeSpace( Partition* );
/** @brief Is this partition newly-to-be-created?
*
* Returns true if the partition is planned to be created by the installer as
* opposed to already existing on the disk.
*/
bool isPartitionNew( ::Partition* );
bool isPartitionNew( Partition* );
/**
* Iterates on all devices and return the first partition which is (already)
* mounted on @p mountPoint.
*/
::Partition* findPartitionByCurrentMountPoint( const QList< ::Device* >& devices, const QString& mountPoint );
Partition* findPartitionByCurrentMountPoint( const QList< Device* >& devices, const QString& mountPoint );
// TODO: add this distinction
// ::Partition* findPartitionByIntendedMountPoint( const QList< ::Device* >& devices, const QString& mountPoint );
// Partition* findPartitionByIntendedMountPoint( const QList< Device* >& devices, const QString& mountPoint );
/**
* Iterates on all devices and partitions and returns a pointer to the Partition object
* for the given path, or nullptr if a Partition for the given path cannot be found.
*/
::Partition* findPartitionByPath( const QList< ::Device* >& devices, const QString& path );
Partition* findPartitionByPath( const QList< Device* >& devices, const QString& path );
/**
* Iterates on all devices and partitions and returns a list of pointers to the Partition
* objects that satisfy the conditions defined in the criterion function.
*/
QList< ::Partition* > findPartitions( const QList< ::Device* >& devices,
std::function< bool ( ::Partition* ) > criterionFunction );
}
}
QList< Partition* > findPartitions( const QList< Device* >& devices,
std::function< bool( Partition* ) > criterionFunction );
} // namespace Partition
} // namespace CalamaresUtils
#endif // PARTITION_PARTITIONQUERY_H