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

[partition] Reduce warnings (Clang, FreeBSD)

Browse Source 
- remove unused this captures from lambda
- rename variables that are short, cryptic, and shadowed
- remove documentation for parameters that don't exist
This commit is contained in:
Adriaan de Groot 2020-10-31 23:16:48 +01:00
parent 8bfc4dfcd2
commit 0a44ce381e
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/partition/gui/ChoicePage.cpp
View File

@ -906,7 +906,9 @@ ChoicePage::updateDeviceStatePreview()
m_beforePartitionBarsView->setSelectionMode( QAbstractItemView::SingleSelection );
m_beforePartitionLabelsView->setSelectionMode( QAbstractItemView::SingleSelection );
break;
default:
case InstallChoice::NoChoice:
case InstallChoice::Erase:
case InstallChoice::Manual:
m_beforePartitionBarsView->setSelectionMode( QAbstractItemView::NoSelection );
m_beforePartitionLabelsView->setSelectionMode( QAbstractItemView::NoSelection );
}
@ -990,7 +992,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
m_previewAfterFrame->show();
m_previewAfterLabel->show();
SelectionFilter filter = [this]( const QModelIndex& index ) {
SelectionFilter filter = []( const QModelIndex& index ) {
return PartUtils::canBeResized(
static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ) );
};
@ -1079,7 +1081,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
}
else
{
SelectionFilter filter = [this]( const QModelIndex& index ) {
SelectionFilter filter = []( const QModelIndex& index ) {
return PartUtils::canBeReplaced(
static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ) );
};
@ -1125,7 +1127,9 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
case InstallChoice::Alongside:
previewSelectionMode = QAbstractItemView::SingleSelection;
break;
default:
case InstallChoice::NoChoice:
case InstallChoice::Erase:
case InstallChoice::Manual:
previewSelectionMode = QAbstractItemView::NoSelection;
}
@ -1179,15 +1183,15 @@ ChoicePage::setupEfiSystemPartitionSelector()
QComboBox*
ChoicePage::createBootloaderComboBox( QWidget* parent )
{
QComboBox* bcb = new QComboBox( parent );
bcb->setModel( m_core->bootLoaderModel() );
QComboBox* comboForBootloader = new QComboBox( parent );
comboForBootloader->setModel( m_core->bootLoaderModel() );
// When the chosen bootloader device changes, we update the choice in the PCM
connect( bcb, QOverload< int >::of( &QComboBox::currentIndexChanged ), this, [this]( int newIndex ) {
QComboBox* bcb = qobject_cast< QComboBox* >( sender() );
if ( bcb )
connect( comboForBootloader, QOverload< int >::of( &QComboBox::currentIndexChanged ), this, [this]( int newIndex ) {
QComboBox* bootloaderCombo = qobject_cast< QComboBox* >( sender() );
if ( bootloaderCombo )
{
QVariant var = bcb->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
QVariant var = bootloaderCombo->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() )
{
return;
@ -1196,7 +1200,7 @@ ChoicePage::createBootloaderComboBox( QWidget* parent )
}
} );
return bcb;
return comboForBootloader;
}
@ -1220,7 +1224,6 @@ operator<<( QDebug& s, PartitionIterator& it )
* @brief ChoicePage::setupActions happens every time a new Device* is selected in the
* device picker. Sets up the text and visibility of the partitioning actions based
* on the currently selected Device*, bootloader and os-prober output.
* @param currentDevice
*/
void
ChoicePage::setupActions()