From 502d43d111aa6900aa8ca38c5d50dbd705e63f1c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 6 May 2019 16:39:14 +0200
Subject: [PATCH] [welcome] [partition] Rename GlobalStorage variable used for
storage
- Change name passed into GS to use "GiB" instead of "GB", for
consistency. This needs to be done in consumers as well.
---
src/modules/partition/core/PartUtils.cpp | 4 ++--
src/modules/partition/gui/ChoicePage.cpp | 4 ++--
src/modules/partition/gui/ReplaceWidget.cpp | 2 +-
src/modules/welcome/checker/GeneralRequirements.cpp | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 251fc62db..de4d3a09e 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -284,7 +284,7 @@ canBeReplaced( Partition* candidate )
bool ok = false;
double requiredStorageGB = Calamares::JobQueue::instance()
->globalStorage()
- ->value( "requiredStorageGB" )
+ ->value( "requiredStorageGiB" )
.toDouble( &ok );
qint64 availableStorageB = candidate->capacity();
@@ -356,7 +356,7 @@ canBeResized( Partition* candidate )
bool ok = false;
double requiredStorageGB = Calamares::JobQueue::instance()
->globalStorage()
- ->value( "requiredStorageGB" )
+ ->value( "requiredStorageGiB" )
.toDouble( &ok );
// We require a little more for partitioning overhead and swap file
double advisedStorageGB = requiredStorageGB + 0.5 + 2.0;
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 8ec048f0e..956cdbd10 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -462,7 +462,7 @@ ChoicePage::applyActionChoice( ChoicePage::InstallChoice choice )
gs->value( "defaultFileSystemType" ).toString(),
m_encryptWidget->passphrase(),
gs->value( "efiSystemPartition" ).toString(),
- CalamaresUtils::GiBtoBytes( gs->value( "requiredStorageGB" ).toDouble() ),
+ CalamaresUtils::GiBtoBytes( gs->value( "requiredStorageGiB" ).toDouble() ),
m_eraseSwapChoice
};
@@ -560,7 +560,7 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
double requiredStorageGB = Calamares::JobQueue::instance()
->globalStorage()
- ->value( "requiredStorageGB" )
+ ->value( "requiredStorageGiB" )
.toDouble();
// TODO: make this consistent
diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp
index 13001468f..2ee360ced 100644
--- a/src/modules/partition/gui/ReplaceWidget.cpp
+++ b/src/modules/partition/gui/ReplaceWidget.cpp
@@ -143,7 +143,7 @@ ReplaceWidget::onPartitionSelected()
bool ok = false;
double requiredSpaceB = Calamares::JobQueue::instance()
->globalStorage()
- ->value( "requiredStorageGB" )
+ ->value( "requiredStorageGiB" )
.toDouble( &ok ) * 1024 * 1024 * 1024;
PartitionModel* model = qobject_cast< PartitionModel* >( m_ui->partitionTreeView->model() );
diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp
index 4497535b5..812605091 100644
--- a/src/modules/welcome/checker/GeneralRequirements.cpp
+++ b/src/modules/welcome/checker/GeneralRequirements.cpp
@@ -216,7 +216,7 @@ GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap )
m_requiredStorageGiB = 3.;
}
- Calamares::JobQueue::instance()->globalStorage()->insert( "requiredStorageGB", m_requiredStorageGiB );
+ Calamares::JobQueue::instance()->globalStorage()->insert( "requiredStorageGiB", m_requiredStorageGiB );
}
else
{