[partition] Apply coding style

This commit is contained in:
Adriaan de Groot 2021-06-22 00:21:01 +02:00
parent e2bf717ea0
commit 131352ca03
9 changed files with 45 additions and 31 deletions

View File

@ -10,8 +10,8 @@
#include "DeviceList.h" #include "DeviceList.h"
#include "utils/Logger.h"
#include "partition/PartitionIterator.h" #include "partition/PartitionIterator.h"
#include "utils/Logger.h"
#include <kpmcore/backend/corebackend.h> #include <kpmcore/backend/corebackend.h>
#include <kpmcore/backend/corebackendmanager.h> #include <kpmcore/backend/corebackendmanager.h>

View File

@ -177,7 +177,8 @@ canBeResized( Partition* candidate, const Logger::Once& o )
if ( availableStorageB > advisedStorageB ) if ( availableStorageB > advisedStorageB )
{ {
cDebug() << o << "Partition" << convenienceName( candidate ) << "authorized for resize + autopartition install."; cDebug() << o << "Partition" << convenienceName( candidate )
<< "authorized for resize + autopartition install.";
return true; return true;
} }
else else
@ -412,8 +413,14 @@ runOsprober( DeviceModel* dm )
FstabEntryList fstabEntries = lookForFstabEntries( path ); FstabEntryList fstabEntries = lookForFstabEntries( path );
QString homePath = findPartitionPathForMountPoint( fstabEntries, "/home" ); QString homePath = findPartitionPathForMountPoint( fstabEntries, "/home" );
osproberEntries.append( osproberEntries.append( { prettyName,
{ prettyName, path, file, QString(), canBeResized( dm, path, o ), lineColumns, fstabEntries, homePath } ); path,
file,
QString(),
canBeResized( dm, path, o ),
lineColumns,
fstabEntries,
homePath } );
osproberCleanLines.append( line ); osproberCleanLines.append( line );
} }
} }

View File

@ -144,7 +144,8 @@ ChoicePage::~ChoicePage() {}
* this avoids cases where the popup would truncate data being drawn * this avoids cases where the popup would truncate data being drawn
* because the overall box is sized too narrow. * because the overall box is sized too narrow.
*/ */
void setModelToComboBox( QComboBox* box, QAbstractItemModel* model ) void
setModelToComboBox( QComboBox* box, QAbstractItemModel* model )
{ {
box->setModel( model ); box->setModel( model );
if ( model->rowCount() > 0 ) if ( model->rowCount() > 0 )
@ -1005,7 +1006,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
SelectionFilter filter = []( const QModelIndex& index ) { SelectionFilter filter = []( const QModelIndex& index ) {
return PartUtils::canBeResized( return PartUtils::canBeResized(
static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ), Logger::Once() ); static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ),
Logger::Once() );
}; };
m_beforePartitionBarsView->setSelectionFilter( filter ); m_beforePartitionBarsView->setSelectionFilter( filter );
m_beforePartitionLabelsView->setSelectionFilter( filter ); m_beforePartitionLabelsView->setSelectionFilter( filter );
@ -1094,7 +1096,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
{ {
SelectionFilter filter = []( const QModelIndex& index ) { SelectionFilter filter = []( const QModelIndex& index ) {
return PartUtils::canBeReplaced( return PartUtils::canBeReplaced(
static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ), Logger::Once() ); static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ),
Logger::Once() );
}; };
m_beforePartitionBarsView->setSelectionFilter( filter ); m_beforePartitionBarsView->setSelectionFilter( filter );
m_beforePartitionLabelsView->setSelectionFilter( filter ); m_beforePartitionLabelsView->setSelectionFilter( filter );

View File

@ -150,8 +150,7 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device,
QWidget* parentWidget ) QWidget* parentWidget )
: CreatePartitionDialog( device, existingNewPartition.p->parent(), usedMountPoints, parentWidget ) : CreatePartitionDialog( device, existingNewPartition.p->parent(), usedMountPoints, parentWidget )
{ {
standardMountPoints( *( m_ui->mountPointComboBox ), standardMountPoints( *( m_ui->mountPointComboBox ), PartitionInfo::mountPoint( existingNewPartition.p ) );
PartitionInfo::mountPoint( existingNewPartition.p ) );
setFlagList( *( m_ui->m_listFlags ), setFlagList( *( m_ui->m_listFlags ),
static_cast< PartitionTable::Flags >( ~PartitionTable::Flags::Int( 0 ) ), static_cast< PartitionTable::Flags >( ~PartitionTable::Flags::Int( 0 ) ),
PartitionInfo::flags( existingNewPartition.p ) ); PartitionInfo::flags( existingNewPartition.p ) );
@ -248,8 +247,8 @@ CreatePartitionDialog::getNewlyCreatedPartition()
} }
else else
{ {
partition partition = KPMHelpers::createNewPartition(
= KPMHelpers::createNewPartition( m_parent, *m_device, m_role, fsType, fsLabel, first, last, PartitionTable::Flags() ); m_parent, *m_device, m_role, fsType, fsLabel, first, last, PartitionTable::Flags() );
} }
if ( m_device->type() == Device::Type::LVM_Device ) if ( m_device->type() == Device::Type::LVM_Device )

View File

@ -45,8 +45,14 @@ private:
QWidget* parentWidget ); QWidget* parentWidget );
public: public:
struct FreeSpace { Partition* p; }; struct FreeSpace
struct FreshPartition { Partition* p; }; {
Partition* p;
};
struct FreshPartition
{
Partition* p;
};
/** @brief Dialog for editing a new partition based on free space. /** @brief Dialog for editing a new partition based on free space.
* *

View File

@ -391,8 +391,8 @@ PartitionPage::onCreateClicked()
return; return;
} }
QPointer< CreatePartitionDialog > dlg = new QPointer< CreatePartitionDialog > dlg = new CreatePartitionDialog(
CreatePartitionDialog ( model->device(), CreatePartitionDialog::FreeSpace{ partition }, getCurrentUsedMountpoints(), this ); model->device(), CreatePartitionDialog::FreeSpace { partition }, getCurrentUsedMountpoints(), this );
if ( dlg->exec() == QDialog::Accepted ) if ( dlg->exec() == QDialog::Accepted )
{ {
Partition* newPart = dlg->getNewlyCreatedPartition(); Partition* newPart = dlg->getNewlyCreatedPartition();

View File

@ -403,8 +403,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core )
&& ( partition->fileSystem().type() == FileSystem::Unformatted ) && ( partition->fileSystem().type() == FileSystem::Unformatted )
&& ( partition->capacity() >= 8_MiB ) ) && ( partition->capacity() >= 8_MiB ) )
{ {
cDebug() << Logger::SubEntry << "Partition" << partition->devicePath() cDebug() << Logger::SubEntry << "Partition" << partition->devicePath() << partition->partitionPath()
<< partition->partitionPath()
<< "is a suitable bios_grub partition"; << "is a suitable bios_grub partition";
return false; return false;
} }