From 5382a510a99e4173011b624c4e9fe4f3da43e2fc Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 12 Jun 2017 04:51:55 -0400
Subject: [PATCH] Cleanup: switch to C++11 user-defined literals

---
 .../partition/core/PartitionActions.cpp       | 45 +++++++++++++------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index 12de1f13c..000db7b7e 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -34,8 +34,25 @@
 
 namespace PartitionActions
 {
-#define MiB * static_cast< qint64 >( 1024 ) * 1024
-#define GiB * static_cast< qint64 >( 1024 ) * 1024 * 1024
+constexpr qint64 operator ""_MiB( unsigned long long m )
+{
+    return m * static_cast< qint64 >( 1024 ) * 1024;
+}
+
+constexpr qint64 operator ""_GiB( unsigned long long m )
+{
+    return operator ""_MiB(m) * static_cast< qint64 >( 1024 );
+}
+
+constexpr qint64 toMiB( unsigned long long m )
+{
+    return operator ""_MiB( m );
+}
+
+constexpr qint64 toGiB( unsigned long long m )
+{
+    return operator ""_GiB( m );
+}
 
 qint64
 swapSuggestion( const qint64 availableSpaceB )
@@ -60,10 +77,10 @@ swapSuggestion( const qint64 availableSpaceB )
 
     if ( ensureSuspendToDisk )
     {
-        if ( availableRamB < 4 GiB )
-            suggestedSwapSizeB = qMax( 2 GiB, availableRamB * 2 );
-        else if ( availableRamB >= 4 GiB && availableRamB < 8 GiB )
-            suggestedSwapSizeB = 8 GiB;
+        if ( availableRamB < 4_GiB )
+            suggestedSwapSizeB = qMax( 2_GiB, availableRamB * 2 );
+        else if ( availableRamB >= 4_GiB && availableRamB < 8_GiB )
+            suggestedSwapSizeB = 8_GiB;
         else
             suggestedSwapSizeB = availableRamB;
 
@@ -71,14 +88,14 @@ swapSuggestion( const qint64 availableSpaceB )
     }
     else //if we don't care about suspend to disk
     {
-        if ( availableRamB < 2 GiB )
-            suggestedSwapSizeB = qMax( 2 GiB, availableRamB * 2 );
-        else if ( availableRamB >= 2 GiB && availableRamB < 8 GiB )
+        if ( availableRamB < 2_GiB )
+            suggestedSwapSizeB = qMax( 2_GiB, availableRamB * 2 );
+        else if ( availableRamB >= 2_GiB && availableRamB < 8_GiB )
             suggestedSwapSizeB = availableRamB;
-        else if ( availableRamB >= 8 GiB && availableRamB < 64 GiB )
+        else if ( availableRamB >= 8_GiB && availableRamB < 64_GiB )
             suggestedSwapSizeB = availableRamB / 2;
         else
-            suggestedSwapSizeB = 4 GiB;
+            suggestedSwapSizeB = 4_GiB;
 
         suggestedSwapSizeB *= overestimationFactor;
 
@@ -123,11 +140,11 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
         empty_space_size = 1;
     }
 
-    qint64 firstFreeSector = empty_space_size MiB / dev->logicalSize() + 1;
+    qint64 firstFreeSector = toMiB(empty_space_size) / dev->logicalSize() + 1;
 
     if ( isEfi )
     {
-        qint64 lastSector = firstFreeSector + ( uefisys_part_size MiB / dev->logicalSize() );
+        qint64 lastSector = firstFreeSector + ( toMiB(uefisys_part_size) / dev->logicalSize() );
         core->createPartitionTable( dev, PartitionTable::gpt );
         Partition* efiPartition = KPMHelpers::createNewPartition(
             dev->partitionTable(),
@@ -158,7 +175,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
         qint64 availableSpaceB = ( dev->totalLogical() - firstFreeSector ) * dev->logicalSize();
         suggestedSwapSizeB = swapSuggestion( availableSpaceB );
         qint64 requiredSpaceB =
-                ( gs->value( "requiredStorageGB" ).toDouble() + 0.1 + 2.0 ) GiB +
+                toGiB( gs->value( "requiredStorageGB" ).toDouble() + 0.1 + 2.0 ) +
                 suggestedSwapSizeB;
 
         // If there is enough room for ESP + root + swap, create swap, otherwise don't.