From 6e715205d785f63a997d48aaa59d9be6de44705b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 7 Dec 2021 15:36:11 +0100
Subject: [PATCH] [partition] Warnings-- by calling formatting consistently

---
 src/modules/partition/core/DeviceModel.cpp          |  8 +++-----
 src/modules/partition/core/PartitionModel.cpp       | 10 ++++------
 src/modules/partition/gui/PartitionLabelsView.cpp   |  5 ++---
 src/modules/partition/gui/VolumeGroupBaseDialog.cpp |  7 +++----
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp
index 33aae20c0..25bdbff6c 100644
--- a/src/modules/partition/core/DeviceModel.cpp
+++ b/src/modules/partition/core/DeviceModel.cpp
@@ -8,9 +8,10 @@
  *   Calamares is Free Software: see the License-Identifier above.
  *
  */
-#include "core/DeviceModel.h"
+#include "DeviceModel.h"
 
 #include "core/PartitionModel.h"
+#include "core/SizeUtils.h"
 
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
@@ -18,9 +19,6 @@
 // KPMcore
 #include <kpmcore/core/device.h>
 
-// KF5
-#include <KFormat>
-
 #include <QIcon>
 #include <QStandardItemModel>
 
@@ -83,7 +81,7 @@ DeviceModel::data( const QModelIndex& index, int role ) const
                 //: device[name] - size[number] (device-node[name])
                 return tr( "%1 - %2 (%3)" )
                     .arg( device->name() )
-                    .arg( KFormat().formatByteSize( device->capacity() ) )
+                    .arg( formatByteSize( device->capacity() ) )
                     .arg( device->deviceNode() );
             }
             else
diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp
index e310eee5e..19dbcd076 100644
--- a/src/modules/partition/core/PartitionModel.cpp
+++ b/src/modules/partition/core/PartitionModel.cpp
@@ -8,11 +8,12 @@
  *
  */
 
-#include "core/PartitionModel.h"
+#include "PartitionModel.h"
 
 #include "core/ColorUtils.h"
 #include "core/KPMHelpers.h"
 #include "core/PartitionInfo.h"
+#include "core/SizeUtils.h"
 
 #include "partition/FileSystem.h"
 #include "partition/PartitionQuery.h"
@@ -24,9 +25,6 @@
 #include <kpmcore/core/partitiontable.h>
 #include <kpmcore/fs/filesystem.h>
 
-// KF5
-#include <KFormat>
-
 // Qt
 #include <QColor>
 
@@ -178,7 +176,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const
         if ( col == SizeColumn )
         {
             qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize();
-            return KFormat().formatByteSize( size );
+            return formatByteSize( size );
         }
         cDebug() << "Unknown column" << col;
         return QVariant();
@@ -210,7 +208,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const
         QString prettyFileSystem
             = CalamaresUtils::Partition::prettyNameForFileSystemType( partition->fileSystem().type() );
         qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize();
-        QString prettySize = KFormat().formatByteSize( size );
+        QString prettySize = formatByteSize( size );
         return QVariant( name + " " + prettyFileSystem + " " + prettySize );
     }
     case SizeRole:
diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp
index 5803d59a2..e73d7f4af 100644
--- a/src/modules/partition/gui/PartitionLabelsView.cpp
+++ b/src/modules/partition/gui/PartitionLabelsView.cpp
@@ -12,6 +12,7 @@
 
 #include "core/ColorUtils.h"
 #include "core/PartitionModel.h"
+#include "core/SizeUtils.h"
 
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
@@ -20,8 +21,6 @@
 #include <kpmcore/core/device.h>
 #include <kpmcore/fs/filesystem.h>
 
-#include <KFormat>
-
 // Qt
 #include <QGuiApplication>
 #include <QMouseEvent>
@@ -39,7 +38,7 @@ static QStringList
 buildUnknownDisklabelTexts( Device* dev )
 {
     QStringList texts = { QObject::tr( "Unpartitioned space or unknown partition table" ),
-                          KFormat().formatByteSize( dev->totalLogical() * dev->logicalSize() ) };
+                          formatByteSize( dev->totalLogical() * dev->logicalSize() ) };
     return texts;
 }
 
diff --git a/src/modules/partition/gui/VolumeGroupBaseDialog.cpp b/src/modules/partition/gui/VolumeGroupBaseDialog.cpp
index 6277c30e5..48b44f68d 100644
--- a/src/modules/partition/gui/VolumeGroupBaseDialog.cpp
+++ b/src/modules/partition/gui/VolumeGroupBaseDialog.cpp
@@ -10,10 +10,9 @@
 #include "VolumeGroupBaseDialog.h"
 #include "ui_VolumeGroupBaseDialog.h"
 
+#include "core/SizeUtils.h"
 #include "gui/ListPhysicalVolumeWidgetItem.h"
 
-#include <kpmcore/util/capacity.h>
-
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QLabel>
@@ -100,7 +99,7 @@ VolumeGroupBaseDialog::setUsedSizeValue( qint64 usedSize )
 {
     m_usedSizeValue = usedSize;
 
-    ui->usedSize->setText( Capacity::formatByteSize( m_usedSizeValue ) );
+    ui->usedSize->setText( formatByteSize( m_usedSizeValue ) );
 }
 
 void
@@ -121,7 +120,7 @@ VolumeGroupBaseDialog::updateTotalSize()
                 % ( ui->peSize->value() * Capacity::unitFactor( Capacity::Unit::Byte, Capacity::Unit::MiB ) );
     }
 
-    ui->totalSize->setText( Capacity::formatByteSize( m_totalSizeValue ) );
+    ui->totalSize->setText( formatByteSize( m_totalSizeValue ) );
 
     updateTotalSectors();
 }