applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-25 16:38:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Indent lambdas to tab-stop.

Browse source 
- Lambdas are all over the place in this codebase, formulate
   a standard and start adjusting code to it in passing.
This commit is contained in:
Adriaan de Groot 2019-05-31 10:48:57 +02:00
parent 353e713f81
commit 2ce2b08027
2 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ci/HACKING.md
View file

@ -60,6 +60,8 @@ some PEP8 guidelines.
* Function and class definitions have their braces on separate lines. * Function and class definitions have their braces on separate lines.
* A function implementation's return type is on its own line. * A function implementation's return type is on its own line.
* `CamelCase.{cpp,h}` style file names. * `CamelCase.{cpp,h}` style file names.
* Lambdas are preferrably indented to a 4-space tab, even when passed as an
argument to functions.
Example: Example:
``` ```

55
src/modules/partition/gui/ChoicePage.cpp
View file

@ -960,19 +960,18 @@ ChoicePage::updateActionChoicePreview( ChoicePage::InstallChoice choice )
QLabel* sizeLabel = new QLabel( m_previewAfterFrame ); QLabel* sizeLabel = new QLabel( m_previewAfterFrame );
layout->addWidget( sizeLabel ); layout->addWidget( sizeLabel );
sizeLabel->setWordWrap( true ); sizeLabel->setWordWrap( true );
connect( m_afterPartitionSplitterWidget, &PartitionSplitterWidget::partitionResized, connect( m_afterPartitionSplitterWidget, &PartitionSplitterWidget::partitionResized, this,
this, [ this, sizeLabel ]( const QString& path, [ this, sizeLabel ]( const QString& path, qint64 size, qint64 sizeNext )
qint64 size, {
qint64 sizeNext ) Q_UNUSED( path )
{ sizeLabel->setText( tr( "%1 will be shrunk to %2MiB and a new "
Q_UNUSED( path ) "%3MiB partition will be created for %4." )
sizeLabel->setText( tr( "%1 will be shrunk to %2MiB and a new " .arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() )
"%3MiB partition will be created for %4." ) .arg( CalamaresUtils::BytesToMiB( size ) )
.arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() ) .arg( CalamaresUtils::BytesToMiB( sizeNext ) )
.arg( CalamaresUtils::BytesToMiB( size ) ) .arg( *Calamares::Branding::ShortProductName ) );
.arg( CalamaresUtils::BytesToMiB( sizeNext ) ) }
.arg( *Calamares::Branding::ShortProductName ) ); );
} );
m_previewAfterFrame->show(); m_previewAfterFrame->show();
m_previewAfterLabel->show(); m_previewAfterLabel->show();
@ -1026,23 +1025,23 @@ ChoicePage::updateActionChoicePreview( ChoicePage::InstallChoice choice )
m_bootloaderComboBox = createBootloaderComboBox( eraseWidget ); m_bootloaderComboBox = createBootloaderComboBox( eraseWidget );
connect( m_core->bootLoaderModel(), &QAbstractItemModel::modelReset, connect( m_core->bootLoaderModel(), &QAbstractItemModel::modelReset,
[ this ]() [ this ]()
{
Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() );
}
);
connect( m_core, &PartitionCoreModule::deviceReverted,
this, [ this ]( Device* dev )
{
Q_UNUSED( dev )
if ( !m_bootloaderComboBox.isNull() )
{ {
if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() ) Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() );
m_bootloaderComboBox->setModel( m_core->bootLoaderModel() );
m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex );
} }
}, Qt::QueuedConnection ); );
connect( m_core, &PartitionCoreModule::deviceReverted, this,
[ this ]( Device* dev )
{
Q_UNUSED( dev )
if ( !m_bootloaderComboBox.isNull() )
{
if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() )
m_bootloaderComboBox->setModel( m_core->bootLoaderModel() );
m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex );
}
}, Qt::QueuedConnection );
// ^ Must be Queued so it's sure to run when the widget is already visible. // ^ Must be Queued so it's sure to run when the widget is already visible.
eraseLayout->addWidget( m_bootloaderComboBox ); eraseLayout->addWidget( m_bootloaderComboBox );