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

[partition] Fix build now swapChoices lives in config

Browse Source
This commit is contained in:
Adriaan de Groot 2020-07-30 10:26:58 +02:00
parent baabcc5bb4
commit d103c42091
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/partition/core/Config.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2020, Adriaan de Groot <groot@kde.org> * SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
* SPDX-License-Identifier: GPL-3.0-or-later
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

6
src/modules/partition/core/Config.h
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2020, Adriaan de Groot <groot@kde.org> * SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
* SPDX-License-Identifier: GPL-3.0-or-later
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -33,9 +34,10 @@ public:
virtual ~Config() = default; virtual ~Config() = default;
void setConfigurationMap( const QVariantMap& ); void setConfigurationMap( const QVariantMap& );
void updateGlobalStorage() const; void updateGlobalStorage() const;
PartitionActions::Choices::SwapChoiceSet swapChoices() const { return m_swapChoices; }
private: private:
PartitionActions::Choices::SwapChoiceSet m_swapChoices; PartitionActions::Choices::SwapChoiceSet m_swapChoices;
qreal m_requiredStorageGiB = 0.0; // May duplicate setting in the welcome module qreal m_requiredStorageGiB = 0.0; // May duplicate setting in the welcome module

2
src/modules/partition/gui/PartitionViewStep.cpp
View File

@ -94,7 +94,7 @@ void
PartitionViewStep::continueLoading() PartitionViewStep::continueLoading()
{ {
Q_ASSERT( !m_choicePage ); Q_ASSERT( !m_choicePage );
m_choicePage = new ChoicePage( m_swapChoices ); m_choicePage = new ChoicePage( m_config->swapChoices() );
m_choicePage->init( m_core ); m_choicePage->init( m_core );
m_widget->addWidget( m_choicePage ); m_widget->addWidget( m_choicePage );