[partition] Reduce confused naming

main
Adriaan de Groot 4 years ago
parent ebecfb9f8b
commit 5e3a0eda73

@ -72,7 +72,7 @@ public:
*/ */
void updateGlobalStorage( const QStringList& selected ) const; void updateGlobalStorage( const QStringList& selected ) const;
/// As updateGlobalStorage() with an empty selection list /// As updateGlobalStorage() with an empty selection list
void updateGlobalStorage() const { updateGlobalStorage( QStringList() ); } void fillGSSecondaryConfiguration() const { updateGlobalStorage( QStringList() ); }
private: private:
PackageListModel* m_model = nullptr; PackageListModel* m_model = nullptr;

@ -295,7 +295,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
} }
void void
Config::updateGlobalStorage() const Config::fillGSSecondaryConfiguration() const
{ {
// If there's no setting (e.g. from the welcome page) for required storage // If there's no setting (e.g. from the welcome page) for required storage
// then use ours, if it was set. // then use ours, if it was set.

@ -60,7 +60,16 @@ public:
using EraseFsTypesSet = QStringList; using EraseFsTypesSet = QStringList;
void setConfigurationMap( const QVariantMap& ); void setConfigurationMap( const QVariantMap& );
void updateGlobalStorage() const; /** @brief Set GS values where other modules configuration has priority
*
* Some "required" values are duplicated between modules; if some
* othe module hasn't already set the GS value, take a value from
* the partitioning configuration.
*
* Applicable GS keys:
* - requiredStorageGiB
*/
void fillGSSecondaryConfiguration() const;
/** @brief What kind of installation (partitioning) is requested **initially**? /** @brief What kind of installation (partitioning) is requested **initially**?
* *

@ -368,7 +368,7 @@ PartitionViewStep::isAtEnd() const
void void
PartitionViewStep::onActivate() PartitionViewStep::onActivate()
{ {
m_config->updateGlobalStorage(); m_config->fillGSSecondaryConfiguration();
// if we're coming back to PVS from the next VS // if we're coming back to PVS from the next VS
if ( m_widget->currentWidget() == m_choicePage && m_config->installChoice() == Config::InstallChoice::Alongside ) if ( m_widget->currentWidget() == m_choicePage && m_config->installChoice() == Config::InstallChoice::Alongside )

Loading…
Cancel
Save