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

[partition] Avoid "shadowing" of fields by constructor parameters

Browse Source 
Although the standard is clear about what this means, Clang
warns about it, so change names to avoid the warning (and make
it slightly easier to read).
This commit is contained in:
Adriaan de Groot 2024-06-24 22:32:19 +02:00
parent 4bba7ed893
commit ea90ca4118
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/partition/core/PartitionActions.h
View File

@ -37,11 +37,11 @@ struct ReplacePartitionOptions
ReplacePartitionOptions( const QString& pt, ReplacePartitionOptions( const QString& pt,
const QString& fs, const QString& fs,
Config::LuksGeneration luksFs, Config::LuksGeneration luksFs,
const QString& luksPassphrase ) const QString& passphrase )
: defaultPartitionTableType( pt ) : defaultPartitionTableType( pt )
, defaultFsType( fs ) , defaultFsType( fs )
, luksFsType( luksFs ) , luksFsType( luksFs )
, luksPassphrase( luksPassphrase ) , luksPassphrase( passphrase )
{ {
} }
}; };
@ -55,11 +55,11 @@ struct AutoPartitionOptions : ReplacePartitionOptions
AutoPartitionOptions( const QString& pt, AutoPartitionOptions( const QString& pt,
const QString& fs, const QString& fs,
Config::LuksGeneration luksFs, Config::LuksGeneration luksFs,
const QString& luksPassphrase, const QString& passphrase,
const QString& efi, const QString& efi,
qint64 requiredBytes, qint64 requiredBytes,
Config::SwapChoice s ) Config::SwapChoice s )
: ReplacePartitionOptions( pt, fs, luksFs, luksPassphrase ) : ReplacePartitionOptions( pt, fs, luksFs, passphrase )
, efiPartitionMountPoint( efi ) , efiPartitionMountPoint( efi )
, requiredSpaceB( requiredBytes > 0 ? quint64( requiredBytes ) : 0U ) , requiredSpaceB( requiredBytes > 0 ? quint64( requiredBytes ) : 0U )
, swap( s ) , swap( s )