mirror of
https://github.com/parchlinux/calamares.git
synced 2025-06-30 02:45:37 -04:00
[partition] Apply coding style to core/ subdir
Because this is a giant code change, with no functional effect, I've been saving this until the end of the kpmcore-manager branch.
This commit is contained in:
parent
2bc296b468
commit
7f295d9565
23 changed files with 690 additions and 484 deletions
|
@ -37,7 +37,6 @@ class Partition;
|
|||
class PartitionLayout
|
||||
{
|
||||
public:
|
||||
|
||||
struct PartitionEntry
|
||||
{
|
||||
QString partLabel;
|
||||
|
@ -54,9 +53,11 @@ public:
|
|||
|
||||
bool isValid() const
|
||||
{
|
||||
if ( !partSize.isValid() ||
|
||||
( partMinSize.isValid() && partMaxSize.isValid() && partMinSize > partMaxSize ) )
|
||||
if ( !partSize.isValid()
|
||||
|| ( partMinSize.isValid() && partMaxSize.isValid() && partMinSize > partMaxSize ) )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
@ -67,14 +68,27 @@ public:
|
|||
~PartitionLayout();
|
||||
|
||||
bool addEntry( PartitionEntry entry );
|
||||
bool addEntry( const QString& mountPoint, const QString& size, const QString& min = QString(), const QString& max = QString() );
|
||||
bool addEntry( const QString& label, const QString& mountPoint, const QString& fs, const QString& size, const QString& min = QString(), const QString& max = QString() );
|
||||
bool addEntry( const QString& mountPoint,
|
||||
const QString& size,
|
||||
const QString& min = QString(),
|
||||
const QString& max = QString() );
|
||||
bool addEntry( const QString& label,
|
||||
const QString& mountPoint,
|
||||
const QString& fs,
|
||||
const QString& size,
|
||||
const QString& min = QString(),
|
||||
const QString& max = QString() );
|
||||
|
||||
/**
|
||||
* @brief Apply the current partition layout to the selected drive space.
|
||||
* @return A list of Partition objects.
|
||||
*/
|
||||
QList< Partition* > execute( Device *dev, qint64 firstSector, qint64 lastSector, QString luksPassphrase, PartitionNode* parent, const PartitionRole& role );
|
||||
QList< Partition* > execute( Device* dev,
|
||||
qint64 firstSector,
|
||||
qint64 lastSector,
|
||||
QString luksPassphrase,
|
||||
PartitionNode* parent,
|
||||
const PartitionRole& role );
|
||||
|
||||
private:
|
||||
FileSystem::Type m_defaultFsType;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue