From d103c42091542a60be2204db7fd12af04e024718 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 30 Jul 2020 10:26:58 +0200 Subject: [PATCH] [partition] Fix build now swapChoices lives in config --- src/modules/partition/core/Config.cpp | 3 ++- src/modules/partition/core/Config.h | 6 ++++-- src/modules/partition/gui/PartitionViewStep.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/modules/partition/core/Config.cpp b/src/modules/partition/core/Config.cpp index d3b5a0310..aaf9cb906 100644 --- a/src/modules/partition/core/Config.cpp +++ b/src/modules/partition/core/Config.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * - * Copyright 2020, Adriaan de Groot + * SPDX-FileCopyrightText: 2020 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/modules/partition/core/Config.h b/src/modules/partition/core/Config.h index c18506f7b..f6823e640 100644 --- a/src/modules/partition/core/Config.h +++ b/src/modules/partition/core/Config.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * - * Copyright 2020, Adriaan de Groot + * SPDX-FileCopyrightText: 2020 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,9 +34,10 @@ public: virtual ~Config() = default; void setConfigurationMap( const QVariantMap& ); - void updateGlobalStorage() const; + PartitionActions::Choices::SwapChoiceSet swapChoices() const { return m_swapChoices; } + private: PartitionActions::Choices::SwapChoiceSet m_swapChoices; qreal m_requiredStorageGiB = 0.0; // May duplicate setting in the welcome module diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index ef43e0584..04f14dd84 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -94,7 +94,7 @@ void PartitionViewStep::continueLoading() { Q_ASSERT( !m_choicePage ); - m_choicePage = new ChoicePage( m_swapChoices ); + m_choicePage = new ChoicePage( m_config->swapChoices() ); m_choicePage->init( m_core ); m_widget->addWidget( m_choicePage );