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

[partition] Name deviceInfo consistently, auto*

Browse Source 
- use auto* for pointer type where we already say "device info" twice
This commit is contained in:
Adriaan de Groot 2020-08-03 13:41:34 +02:00
parent 22ba3cc62d
commit 6e31d9de4b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/partition/core/PartitionCoreModule.cpp
View File

@ -328,24 +328,24 @@ PartitionCoreModule::immutableDeviceCopy( const Device* device )
void void
PartitionCoreModule::createPartitionTable( Device* device, PartitionTable::TableType type ) PartitionCoreModule::createPartitionTable( Device* device, PartitionTable::TableType type )
{ {
DeviceInfo* info = infoForDevice( device ); auto* deviceInfo = infoForDevice( device );
if ( info ) if ( deviceInfo )
{ {
// Creating a partition table wipes all the disk, so there is no need to // Creating a partition table wipes all the disk, so there is no need to
// keep previous changes // keep previous changes
info->forgetChanges(); deviceInfo->forgetChanges();
OperationHelper helper( partitionModelForDevice( device ), this ); OperationHelper helper( partitionModelForDevice( device ), this );
CreatePartitionTableJob* job = new CreatePartitionTableJob( device, type ); CreatePartitionTableJob* job = new CreatePartitionTableJob( device, type );
job->updatePreview(); job->updatePreview();
info->jobs << Calamares::job_ptr( job ); deviceInfo->jobs << Calamares::job_ptr( job );
} }
} }
void void
PartitionCoreModule::createPartition( Device* device, Partition* partition, PartitionTable::Flags flags ) PartitionCoreModule::createPartition( Device* device, Partition* partition, PartitionTable::Flags flags )
{ {
auto deviceInfo = infoForDevice( device ); auto* deviceInfo = infoForDevice( device );
Q_ASSERT( deviceInfo ); Q_ASSERT( deviceInfo );
OperationHelper helper( partitionModelForDevice( device ), this ); OperationHelper helper( partitionModelForDevice( device ), this );
@ -396,7 +396,7 @@ PartitionCoreModule::createVolumeGroup( QString& vgName, QVector< const Partitio
void void
PartitionCoreModule::resizeVolumeGroup( LvmDevice* device, QVector< const Partition* >& pvList ) PartitionCoreModule::resizeVolumeGroup( LvmDevice* device, QVector< const Partition* >& pvList )
{ {
DeviceInfo* deviceInfo = infoForDevice( device ); auto* deviceInfo = infoForDevice( device );
Q_ASSERT( deviceInfo ); Q_ASSERT( deviceInfo );
ResizeVolumeGroupJob* job = new ResizeVolumeGroupJob( device, pvList ); ResizeVolumeGroupJob* job = new ResizeVolumeGroupJob( device, pvList );
@ -409,7 +409,7 @@ PartitionCoreModule::resizeVolumeGroup( LvmDevice* device, QVector< const Partit
void void
PartitionCoreModule::deactivateVolumeGroup( LvmDevice* device ) PartitionCoreModule::deactivateVolumeGroup( LvmDevice* device )
{ {
DeviceInfo* deviceInfo = infoForDevice( device ); auto* deviceInfo = infoForDevice( device );
Q_ASSERT( deviceInfo ); Q_ASSERT( deviceInfo );
deviceInfo->isAvailable = false; deviceInfo->isAvailable = false;
@ -425,7 +425,7 @@ PartitionCoreModule::deactivateVolumeGroup( LvmDevice* device )
void void
PartitionCoreModule::removeVolumeGroup( LvmDevice* device ) PartitionCoreModule::removeVolumeGroup( LvmDevice* device )
{ {
DeviceInfo* deviceInfo = infoForDevice( device ); auto* deviceInfo = infoForDevice( device );
Q_ASSERT( deviceInfo ); Q_ASSERT( deviceInfo );
RemoveVolumeGroupJob* job = new RemoveVolumeGroupJob( device ); RemoveVolumeGroupJob* job = new RemoveVolumeGroupJob( device );
@ -438,7 +438,7 @@ PartitionCoreModule::removeVolumeGroup( LvmDevice* device )
void void
PartitionCoreModule::deletePartition( Device* device, Partition* partition ) PartitionCoreModule::deletePartition( Device* device, Partition* partition )
{ {
auto deviceInfo = infoForDevice( device ); auto* deviceInfo = infoForDevice( device );
Q_ASSERT( deviceInfo ); Q_ASSERT( deviceInfo );
OperationHelper helper( partitionModelForDevice( device ), this ); OperationHelper helper( partitionModelForDevice( device ), this );
@ -525,7 +525,7 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition )
void void
PartitionCoreModule::formatPartition( Device* device, Partition* partition ) PartitionCoreModule::formatPartition( Device* device, Partition* partition )
{ {
auto deviceInfo = infoForDevice( device ); auto* deviceInfo = infoForDevice( device );
Q_ASSERT( deviceInfo ); Q_ASSERT( deviceInfo );
OperationHelper helper( partitionModelForDevice( device ), this ); OperationHelper helper( partitionModelForDevice( device ), this );
@ -536,7 +536,7 @@ PartitionCoreModule::formatPartition( Device* device, Partition* partition )
void void
PartitionCoreModule::resizePartition( Device* device, Partition* partition, qint64 first, qint64 last ) PartitionCoreModule::resizePartition( Device* device, Partition* partition, qint64 first, qint64 last )
{ {
auto deviceInfo = infoForDevice( device ); auto* deviceInfo = infoForDevice( device );
Q_ASSERT( deviceInfo ); Q_ASSERT( deviceInfo );
OperationHelper helper( partitionModelForDevice( device ), this ); OperationHelper helper( partitionModelForDevice( device ), this );
@ -548,7 +548,7 @@ PartitionCoreModule::resizePartition( Device* device, Partition* partition, qint
void void
PartitionCoreModule::setPartitionFlags( Device* device, Partition* partition, PartitionTable::Flags flags ) PartitionCoreModule::setPartitionFlags( Device* device, Partition* partition, PartitionTable::Flags flags )
{ {
auto deviceInfo = infoForDevice( device ); auto* deviceInfo = infoForDevice( device );
Q_ASSERT( deviceInfo ); Q_ASSERT( deviceInfo );
OperationHelper( partitionModelForDevice( device ), this ); OperationHelper( partitionModelForDevice( device ), this );