applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-30 02:45:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Apply newer formatting tool

Browse source
This commit is contained in:
Adriaan de Groot 2021-03-16 16:08:13 +01:00
parent 3b9c0bdf91
commit 2b4bc7adf4
1 changed files with 52 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -360,7 +360,8 @@ ChoicePage::applyDeviceChoice()
if ( m_core->isDirty() ) if ( m_core->isDirty() )
{ {
ScanningDialog::run( QtConcurrent::run( [=] { ScanningDialog::run(
QtConcurrent::run( [=] {
QMutexLocker locker( &m_coreMutex ); QMutexLocker locker( &m_coreMutex );
m_core->revertAllDevices(); m_core->revertAllDevices();
} ), } ),
@ -452,7 +453,8 @@ ChoicePage::applyActionChoice( InstallChoice choice )
if ( m_core->isDirty() ) if ( m_core->isDirty() )
{ {
ScanningDialog::run( QtConcurrent::run( [=] { ScanningDialog::run(
QtConcurrent::run( [=] {
QMutexLocker locker( &m_coreMutex ); QMutexLocker locker( &m_coreMutex );
m_core->revertDevice( selectedDevice() ); m_core->revertDevice( selectedDevice() );
} ), } ),
@ -472,7 +474,8 @@ ChoicePage::applyActionChoice( InstallChoice choice )
case InstallChoice::Replace: case InstallChoice::Replace:
if ( m_core->isDirty() ) if ( m_core->isDirty() )
{ {
ScanningDialog::run( QtConcurrent::run( [=] { ScanningDialog::run(
QtConcurrent::run( [=] {
QMutexLocker locker( &m_coreMutex ); QMutexLocker locker( &m_coreMutex );
m_core->revertDevice( selectedDevice() ); m_core->revertDevice( selectedDevice() );
} ), } ),
@ -491,7 +494,8 @@ ChoicePage::applyActionChoice( InstallChoice choice )
case InstallChoice::Alongside: case InstallChoice::Alongside:
if ( m_core->isDirty() ) if ( m_core->isDirty() )
{ {
ScanningDialog::run( QtConcurrent::run( [=] { ScanningDialog::run(
QtConcurrent::run( [=] {
QMutexLocker locker( &m_coreMutex ); QMutexLocker locker( &m_coreMutex );
m_core->revertDevice( selectedDevice() ); m_core->revertDevice( selectedDevice() );
} ), } ),
@ -1033,7 +1037,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() ); Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() );
} }
} ); } );
connect( m_core, connect(
m_core,
&PartitionCoreModule::deviceReverted, &PartitionCoreModule::deviceReverted,
this, this,
[this]( Device* dev ) { [this]( Device* dev ) {