napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] Warnings-- by calling formatting consistently

Browse Source
This commit is contained in:
Adriaan de Groot 2021-12-07 15:36:11 +01:00
parent 09a03fbbc0
commit 6e715205d7
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/partition/core/DeviceModel.cpp
View File

@ -8,9 +8,10 @@
* Calamares is Free Software: see the License-Identifier above. * Calamares is Free Software: see the License-Identifier above.
* *
*/ */
#include "core/DeviceModel.h" #include "DeviceModel.h"
#include "core/PartitionModel.h" #include "core/PartitionModel.h"
#include "core/SizeUtils.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h" #include "utils/Logger.h"
@ -18,9 +19,6 @@
// KPMcore // KPMcore
#include <kpmcore/core/device.h> #include <kpmcore/core/device.h>
// KF5
#include <KFormat>
#include <QIcon> #include <QIcon>
#include <QStandardItemModel> #include <QStandardItemModel>
@ -83,7 +81,7 @@ DeviceModel::data( const QModelIndex& index, int role ) const
//: device[name] - size[number] (device-node[name]) //: device[name] - size[number] (device-node[name])
return tr( "%1 - %2 (%3)" ) return tr( "%1 - %2 (%3)" )
.arg( device->name() ) .arg( device->name() )
.arg( KFormat().formatByteSize( device->capacity() ) ) .arg( formatByteSize( device->capacity() ) )
.arg( device->deviceNode() ); .arg( device->deviceNode() );
} }
else else

10
src/modules/partition/core/PartitionModel.cpp
View File

@ -8,11 +8,12 @@
* *
*/ */
#include "core/PartitionModel.h" #include "PartitionModel.h"
#include "core/ColorUtils.h" #include "core/ColorUtils.h"
#include "core/KPMHelpers.h" #include "core/KPMHelpers.h"
#include "core/PartitionInfo.h" #include "core/PartitionInfo.h"
#include "core/SizeUtils.h"
#include "partition/FileSystem.h" #include "partition/FileSystem.h"
#include "partition/PartitionQuery.h" #include "partition/PartitionQuery.h"
@ -24,9 +25,6 @@
#include <kpmcore/core/partitiontable.h> #include <kpmcore/core/partitiontable.h>
#include <kpmcore/fs/filesystem.h> #include <kpmcore/fs/filesystem.h>
// KF5
#include <KFormat>
// Qt // Qt
#include <QColor> #include <QColor>
@ -178,7 +176,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const
if ( col == SizeColumn ) if ( col == SizeColumn )
{ {
qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize(); qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize();
return KFormat().formatByteSize( size ); return formatByteSize( size );
} }
cDebug() << "Unknown column" << col; cDebug() << "Unknown column" << col;
return QVariant(); return QVariant();
@ -210,7 +208,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const
QString prettyFileSystem QString prettyFileSystem
= CalamaresUtils::Partition::prettyNameForFileSystemType( partition->fileSystem().type() ); = CalamaresUtils::Partition::prettyNameForFileSystemType( partition->fileSystem().type() );
qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize(); qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize();
QString prettySize = KFormat().formatByteSize( size ); QString prettySize = formatByteSize( size );
return QVariant( name + " " + prettyFileSystem + " " + prettySize ); return QVariant( name + " " + prettyFileSystem + " " + prettySize );
} }
case SizeRole: case SizeRole:

5
src/modules/partition/gui/PartitionLabelsView.cpp
View File

@ -12,6 +12,7 @@
#include "core/ColorUtils.h" #include "core/ColorUtils.h"
#include "core/PartitionModel.h" #include "core/PartitionModel.h"
#include "core/SizeUtils.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h" #include "utils/Logger.h"
@ -20,8 +21,6 @@
#include <kpmcore/core/device.h> #include <kpmcore/core/device.h>
#include <kpmcore/fs/filesystem.h> #include <kpmcore/fs/filesystem.h>
#include <KFormat>
// Qt // Qt
#include <QGuiApplication> #include <QGuiApplication>
#include <QMouseEvent> #include <QMouseEvent>
@ -39,7 +38,7 @@ static QStringList
buildUnknownDisklabelTexts( Device* dev ) buildUnknownDisklabelTexts( Device* dev )
{ {
QStringList texts = { QObject::tr( "Unpartitioned space or unknown partition table" ), QStringList texts = { QObject::tr( "Unpartitioned space or unknown partition table" ),
KFormat().formatByteSize( dev->totalLogical() * dev->logicalSize() ) }; formatByteSize( dev->totalLogical() * dev->logicalSize() ) };
return texts; return texts;
} }

7
src/modules/partition/gui/VolumeGroupBaseDialog.cpp
View File

@ -10,10 +10,9 @@
#include "VolumeGroupBaseDialog.h" #include "VolumeGroupBaseDialog.h"
#include "ui_VolumeGroupBaseDialog.h" #include "ui_VolumeGroupBaseDialog.h"
#include "core/SizeUtils.h"
#include "gui/ListPhysicalVolumeWidgetItem.h" #include "gui/ListPhysicalVolumeWidgetItem.h"
#include <kpmcore/util/capacity.h>
#include <QComboBox> #include <QComboBox>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QLabel> #include <QLabel>
@ -100,7 +99,7 @@ VolumeGroupBaseDialog::setUsedSizeValue( qint64 usedSize )
{ {
m_usedSizeValue = usedSize; m_usedSizeValue = usedSize;
ui->usedSize->setText( Capacity::formatByteSize( m_usedSizeValue ) ); ui->usedSize->setText( formatByteSize( m_usedSizeValue ) );
} }
void void
@ -121,7 +120,7 @@ VolumeGroupBaseDialog::updateTotalSize()
% ( ui->peSize->value() * Capacity::unitFactor( Capacity::Unit::Byte, Capacity::Unit::MiB ) ); % ( 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(); updateTotalSectors();
} }