From f78752303b4456a0d821680b9748648e3e940c4d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 2 Nov 2020 15:40:32 +0100 Subject: [PATCH] [partition] Improve constructors for layout - initialize flags by default - the copy constructor was just doing the default thing, so make that explicit --- src/modules/partition/core/PartitionLayout.cpp | 14 -------------- src/modules/partition/core/PartitionLayout.h | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index 15b18da93..85ba683d0 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -95,20 +95,6 @@ PartitionLayout::PartitionEntry::PartitionEntry( const QString& label, PartUtils::findFS( fs, &partFileSystem ); } -PartitionLayout::PartitionEntry::PartitionEntry( const PartitionEntry& e ) - : partLabel( e.partLabel ) - , partUUID( e.partUUID ) - , partType( e.partType ) - , partAttributes( e.partAttributes ) - , partMountPoint( e.partMountPoint ) - , partFileSystem( e.partFileSystem ) - , partFeatures( e.partFeatures ) - , partSize( e.partSize ) - , partMinSize( e.partMinSize ) - , partMaxSize( e.partMaxSize ) -{ -} - bool PartitionLayout::addEntry( const PartitionEntry& entry ) diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h index 9720ab765..e54f28b63 100644 --- a/src/modules/partition/core/PartitionLayout.h +++ b/src/modules/partition/core/PartitionLayout.h @@ -34,7 +34,7 @@ public: QString partLabel; QString partUUID; QString partType; - quint64 partAttributes; + quint64 partAttributes = 0; QString partMountPoint; FileSystem::Type partFileSystem = FileSystem::Unknown; QVariantMap partFeatures; @@ -61,7 +61,7 @@ public: const QString& minSize = QString(), const QString& maxSize = QString() ); /// @brief Copy PartitionEntry - PartitionEntry( const PartitionEntry& e ); + PartitionEntry( const PartitionEntry& e ) = default; bool isValid() const {