From 829f72363e8626a2181d9a523b9c4dae345807e5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 12 Jun 2017 03:32:22 -0400 Subject: [PATCH] Cleanup: remove duplicate #define --- src/modules/partition/core/PartitionActions.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index d47021bed..12de1f13c 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -34,14 +34,12 @@ namespace PartitionActions { +#define MiB * static_cast< qint64 >( 1024 ) * 1024 +#define GiB * static_cast< qint64 >( 1024 ) * 1024 * 1024 qint64 swapSuggestion( const qint64 availableSpaceB ) { - -#define MiB * static_cast< qint64 >( 1024 ) * 1024 -#define GiB * static_cast< qint64 >( 1024 ) * 1024 * 1024 - // swap(mem) = max(2, 2 * mem), if mem < 2 GiB // = mem, if 2 GiB <= mem < 8 GiB // = mem / 2, if 8 GIB <= mem < 64 GiB @@ -110,9 +108,6 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass if ( FileSystem::typeForName( defaultFsType ) == FileSystem::Unknown ) defaultFsType = "ext4"; -#define MiB * static_cast< qint64 >( 1024 ) * 1024 -#define GiB * static_cast< qint64 >( 1024 ) * 1024 * 1024 - // Partition sizes are expressed in MiB, should be multiples of // the logical sector size (usually 512B). int uefisys_part_size = 0;