applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-26 08:58:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamares] Consistent namespace usage in partition service

Browse source 
- The sub-directories under libcalamares (e.g. Utils, ..)
   all live in namespace CalamaresUtils (well, except for Logger).
   The services (e.g. subdirs other than utils/) live in their
   own nested namespace, so partitioning should go into
   CalamaresUtils::Partition for consistency.
This commit is contained in:
Adriaan de Groot 2019-05-14 05:52:58 -04:00
parent 63507801b7
commit 34ffc7a20a
9 changed files with 72 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/partition/core/PartitionActions.cpp
View file

@ -103,7 +103,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
{
if ( gs->contains( "efiSystemPartitionSize" ) )
{
Calamares::PartitionSize part_size = Calamares::PartitionSize(
CalamaresUtils::Partition::PartitionSize part_size = CalamaresUtils::Partition::PartitionSize(
gs->value( "efiSystemPartitionSize" ).toString() );
uefisys_part_sizeB = part_size.toBytes( dev->capacity() );
}

6
src/modules/partition/core/PartitionLayout.cpp
View file

@ -86,10 +86,10 @@ PartitionLayout::addEntry( PartitionLayout::PartitionEntry entry )
}
PartitionLayout::PartitionEntry::PartitionEntry( const QString& size, const QString& min, const QString& max )
: partSize( size )
, partMinSize( min )
, partMaxSize( max )
{
partSize = Calamares::PartitionSize( size );
partMinSize = Calamares::PartitionSize( min );
partMaxSize = Calamares::PartitionSize( max );
}
bool

6
src/modules/partition/core/PartitionLayout.h
View file

@ -43,9 +43,9 @@ public:
QString partLabel;
QString partMountPoint;
FileSystem::Type partFileSystem = FileSystem::Unknown;
Calamares::PartitionSize partSize;
Calamares::PartitionSize partMinSize;
Calamares::PartitionSize partMaxSize;
CalamaresUtils::Partition::PartitionSize partSize;
CalamaresUtils::Partition::PartitionSize partMinSize;
CalamaresUtils::Partition::PartitionSize partMaxSize;
/// @brief All-zeroes PartitionEntry
PartitionEntry() {}