From d2404851cd23c6f3e2363b45530d6b593f17f044 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 15 Apr 2019 10:06:21 -0400
Subject: [PATCH] [partition] Reduce warnings (shadow, ;, types)
---
src/modules/partition/core/PartitionActions.h | 4 ++--
src/modules/partition/core/PartitionLayout.cpp | 4 ++--
src/modules/partition/core/PartitionLayout.h | 2 +-
src/modules/partition/core/PartitionModel.cpp | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/modules/partition/core/PartitionActions.h b/src/modules/partition/core/PartitionActions.h
index d17852b63f..cc97161238 100644
--- a/src/modules/partition/core/PartitionActions.h
+++ b/src/modules/partition/core/PartitionActions.h
@@ -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 )
{
}
diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 36a61d088f..963a6ceb1a 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -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 )
{
}
diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h
index fd6075ba04..cc74782265 100644
--- a/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@ -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 );
};
diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp
index 8f0ecba81e..0515184b50 100644
--- a/src/modules/partition/core/PartitionModel.cpp
+++ b/src/modules/partition/core/PartitionModel.cpp
@@ -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();
--
GitLab