From aa10fe982ab0fe86f3580370e1f542045f9ee65e Mon Sep 17 00:00:00 2001
From: Chantara Tith <tith.chantara@gmail.com>
Date: Wed, 31 Aug 2016 10:30:45 +0700
Subject: [PATCH] API Changes, logicalSectorSize -> logicalSize, totalSectors
-> totalLogical.
---
src/modules/partition/core/PartitionActions.cpp | 14 +++++++-------
src/modules/partition/core/PartitionModel.cpp | 6 +++---
src/modules/partition/gui/ChoicePage.cpp | 2 +-
src/modules/partition/gui/PartitionLabelsView.cpp | 2 +-
.../partition/gui/PartitionSizeController.cpp | 4 ++--
src/modules/partition/jobs/ResizePartitionJob.cpp | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index e2c6ca6386..a3c1224361 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -128,11 +128,11 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
empty_space_size = 1;
}
- qint64 firstFreeSector = empty_space_size MiB / dev->logicalSectorSize() + 1;
+ qint64 firstFreeSector = empty_space_size MiB / dev->logicalSize() + 1;
if ( isEfi )
{
- qint64 lastSector = firstFreeSector + ( uefisys_part_size MiB / dev->logicalSectorSize() );
+ qint64 lastSector = firstFreeSector + ( uefisys_part_size MiB / dev->logicalSize() );
core->createPartitionTable( dev, PartitionTable::gpt );
Partition* efiPartition = KPMHelpers::createNewPartition(
dev->partitionTable(),
@@ -156,7 +156,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
}
bool shouldCreateSwap = false;
- qint64 availableSpaceB = ( dev->totalSectors() - firstFreeSector ) * dev->logicalSectorSize();
+ qint64 availableSpaceB = ( dev->totalLogical() - firstFreeSector ) * dev->logicalSize();
qint64 suggestedSwapSizeB = swapSuggestion( availableSpaceB );
qint64 requiredSpaceB =
( Calamares::JobQueue::instance()->
@@ -167,10 +167,10 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
// If there is enough room for ESP + root + swap, create swap, otherwise don't.
shouldCreateSwap = availableSpaceB > requiredSpaceB;
- qint64 lastSectorForRoot = dev->totalSectors() - 1; //last sector of the device
+ qint64 lastSectorForRoot = dev->totalLogical() - 1; //last sector of the device
if ( shouldCreateSwap )
{
- lastSectorForRoot -= suggestedSwapSizeB / dev->logicalSectorSize() + 1;
+ lastSectorForRoot -= suggestedSwapSizeB / dev->logicalSize() + 1;
}
Partition* rootPartition = nullptr;
@@ -212,7 +212,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
PartitionRole( PartitionRole::Primary ),
FileSystem::LinuxSwap,
lastSectorForRoot + 1,
- dev->totalSectors() - 1
+ dev->totalLogical() - 1
);
}
else
@@ -223,7 +223,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
PartitionRole( PartitionRole::Primary ),
FileSystem::LinuxSwap,
lastSectorForRoot + 1,
- dev->totalSectors() - 1,
+ dev->totalLogical() - 1,
luksPassphrase
);
}
diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp
index ae15b5c91e..648c579324 100644
--- a/src/modules/partition/core/PartitionModel.cpp
+++ b/src/modules/partition/core/PartitionModel.cpp
@@ -148,7 +148,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const
return PartitionInfo::mountPoint( partition );
if ( col == SizeColumn )
{
- qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSectorSize();
+ qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize();
return KFormat().formatByteSize( size );
}
cDebug() << "Unknown column" << col;
@@ -175,12 +175,12 @@ PartitionModel::data( const QModelIndex& index, int role ) const
}
}
QString prettyFileSystem = KPMHelpers::prettyNameForFileSystemType( partition->fileSystem().type() );
- qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSectorSize();
+ qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize();
QString prettySize = KFormat().formatByteSize( size );
return QVariant(name + " " + prettyFileSystem + " " + prettySize);
}
case SizeRole:
- return ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSectorSize();
+ return ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize();
case IsFreeSpaceRole:
return KPMHelpers::isPartitionFreeSpace( partition );
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 1538d2f72a..b95a28c25e 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -590,7 +590,7 @@ ChoicePage::doAlongsideApply()
qint64 oldLastSector = candidate->lastSector();
qint64 newLastSector = firstSector +
m_afterPartitionSplitterWidget->splitPartitionSize() /
- dev->logicalSectorSize();
+ dev->logicalSize();
m_core->resizePartition( dev, candidate, firstSector, newLastSector );
Partition* newPartition = nullptr;
diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp
index d2629a6e25..a43b6b88b6 100644
--- a/src/modules/partition/gui/PartitionLabelsView.cpp
+++ b/src/modules/partition/gui/PartitionLabelsView.cpp
@@ -47,7 +47,7 @@ QStringList
buildUnknownDisklabelTexts( Device* dev )
{
QStringList texts = { QObject::tr( "Unpartitioned space or unknown partition table" ),
- KFormat().formatByteSize( dev->totalSectors() * dev->logicalSectorSize() ) };
+ KFormat().formatByteSize( dev->totalLogical() * dev->logicalSize() ) };
return texts;
}
diff --git a/src/modules/partition/gui/PartitionSizeController.cpp b/src/modules/partition/gui/PartitionSizeController.cpp
index c602501dba..d01924e8b5 100644
--- a/src/modules/partition/gui/PartitionSizeController.cpp
+++ b/src/modules/partition/gui/PartitionSizeController.cpp
@@ -135,7 +135,7 @@ PartitionSizeController::updatePartResizerWidget()
return;
m_updating = true;
- qint64 sectorSize = qint64( m_spinBox->value() ) * 1024 * 1024 / m_device->logicalSectorSize();
+ qint64 sectorSize = qint64( m_spinBox->value() ) * 1024 * 1024 / m_device->logicalSize();
qint64 firstSector = m_partition->firstSector();
qint64 lastSector = firstSector + sectorSize - 1;
@@ -185,7 +185,7 @@ PartitionSizeController::doUpdateSpinBox()
{
if ( !m_spinBox )
return;
- qint64 mbSize = m_partition->length() * m_device->logicalSectorSize() / 1024 / 1024;
+ qint64 mbSize = m_partition->length() * m_device->logicalSize() / 1024 / 1024;
m_spinBox->setValue( mbSize );
if ( m_currentSpinBoxValue != -1 && //if it's not the first time we're setting it
m_currentSpinBoxValue != mbSize ) //and the operation changes the SB value
diff --git a/src/modules/partition/jobs/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp
index 65ee13f720..d3fcb75b4d 100644
--- a/src/modules/partition/jobs/ResizePartitionJob.cpp
+++ b/src/modules/partition/jobs/ResizePartitionJob.cpp
@@ -93,7 +93,7 @@ public:
break;
case FileSystem::cmdSupportFileSystem:
{
- qint64 byteLength = m_device->logicalSectorSize() * m_length;
+ qint64 byteLength = m_device->logicalSize() * m_length;
bool ok = fs.resize( report, m_partition->partitionPath(), byteLength );
if ( !ok )
return Calamares::JobResult::error(
--
GitLab