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

KPMCore: drop conditional code

Browse Source
This commit is contained in:
Adriaan de Groot 2017-09-30 16:50:02 +02:00
parent ca037af6ca
commit 96c3f7def3
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/partition/core/KPMHelpers.cpp
View File

@ -116,9 +116,7 @@ createNewPartition( PartitionNode* parent,
PartitionTable::Flags flags ) PartitionTable::Flags flags )
{ {
FileSystem* fs = FileSystemFactory::create( fsType, firstSector, lastSector FileSystem* fs = FileSystemFactory::create( fsType, firstSector, lastSector
#ifdef WITH_KPMCORE22
,device.logicalSize() ,device.logicalSize()
#endif
); );
return new Partition( return new Partition(
parent, parent,
@ -153,9 +151,7 @@ createNewEncryptedPartition( PartitionNode* parent,
FileSystemFactory::create( FileSystem::Luks, FileSystemFactory::create( FileSystem::Luks,
firstSector, firstSector,
lastSector lastSector
#ifdef WITH_KPMCORE22
,device.logicalSize() ,device.logicalSize()
#endif
) ); ) );
if ( !fs ) if ( !fs )
{ {
@ -186,9 +182,7 @@ clonePartition( Device* device, Partition* partition )
partition->fileSystem().type(), partition->fileSystem().type(),
partition->firstSector(), partition->firstSector(),
partition->lastSector() partition->lastSector()
#ifdef WITH_KPMCORE22
,device->logicalSize() ,device->logicalSize()
#endif
); );
return new Partition( partition->parent(), return new Partition( partition->parent(),
*device, *device,

2
src/modules/partition/tests/PartitionJobTests.cpp
View File

@ -219,9 +219,7 @@ PartitionJobTests::newCreatePartitionJob( Partition* freeSpacePartition, Partiti
else else
lastSector = freeSpacePartition->lastSector(); lastSector = freeSpacePartition->lastSector();
FileSystem* fs = FileSystemFactory::create( type, firstSector, lastSector FileSystem* fs = FileSystemFactory::create( type, firstSector, lastSector
#ifdef WITH_KPMCORE22
,m_device->logicalSize() ,m_device->logicalSize()
#endif
); );
Partition* partition = new Partition( Partition* partition = new Partition(