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

[partition] Reduce warnings (shadow, ;, types)

Browse Source
This commit is contained in:
Adriaan de Groot 2019-04-15 10:06:21 -04:00
parent 1a4a265262
commit d2404851cd
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,10 +64,10 @@ namespace Choices
quint64 requiredSpaceB; // estimated required space for root partition
SwapChoice swap;
AutoPartitionOptions( const QString& fs, const QString& luks, const QString& efi, qint64 r, SwapChoice s )
AutoPartitionOptions( const QString& fs, const QString& luks, const QString& efi, qint64 requiredBytes, SwapChoice s )
: ReplacePartitionOptions( fs, luks )
, efiPartitionMountPoint( efi )
, requiredSpaceB( r > 0 ? r : 0 )
, requiredSpaceB( requiredBytes > 0 ? static_cast<quint64>( requiredBytes ) : 0 )
, swap( s )
{
}

4
src/modules/partition/core/PartitionLayout.cpp
View File

@ -60,8 +60,8 @@ PartitionLayout::PartitionLayout( PartitionLayout::PartitionEntry entry )
}
PartitionLayout::PartitionLayout( const PartitionLayout& layout )
: m_partLayout( layout.m_partLayout )
, m_defaultFsType( layout.m_defaultFsType )
: m_defaultFsType( layout.m_defaultFsType )
, m_partLayout( layout.m_partLayout )
{
}

2
src/modules/partition/core/PartitionLayout.h
View File

@ -51,7 +51,7 @@ public:
PartUtils::SizeUnit partMaxSizeUnit = PartUtils::SizeUnit::Percent;
/// @brief All-zeroes PartitionEntry
PartitionEntry() {};
PartitionEntry() {}
/// @brief Parse @p size, @p min and @p max to their respective member variables
PartitionEntry( const QString& size, const QString& min, const QString& max );
};

4
src/modules/partition/core/PartitionModel.cpp
View File

@ -65,7 +65,7 @@ PartitionModel::init( Device* device , const OsproberEntryList& osproberEntries
}
int
PartitionModel::columnCount( const QModelIndex& parent ) const
PartitionModel::columnCount( const QModelIndex& ) const
{
return ColumnCount;
}
@ -247,7 +247,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const
}
QVariant
PartitionModel::headerData( int section, Qt::Orientation orientation, int role ) const
PartitionModel::headerData( int section, Qt::Orientation, int role ) const
{
if ( role != Qt::DisplayRole )
return QVariant();