applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-03 04:15:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Move initLayout logic to object PartitionLayout

Browse source 
- The logic of the method initLayout belongs to the object
  PartitionLayout. Move logic to that object.
- Use a single method initLayout in object PartitionCoreModule.
- Member m_partLayout in object PartitionCoreModule is no longer
  allocated.
This commit is contained in:
Gaël PORTAY 2020-06-19 23:06:38 -04:00
parent eae1e90dce
commit d6ea30b23e
5 changed files with 81 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/partition/core/PartitionCoreModule.h
View file

@ -156,8 +156,7 @@ public:
/// @brief Set the path where the bootloader will be installed
void setBootLoaderInstallPath( const QString& path );
void initLayout();
void initLayout( const QVariantList& config );
void initLayout( const QVariantList& config = QVariantList() );
void layoutApply( Device* dev, qint64 firstSector, qint64 lastSector, QString luksPassphrase );
void layoutApply( Device* dev,
@ -256,7 +255,7 @@ private:
bool m_hasRootMountPoint = false;
bool m_isDirty = false;
QString m_bootLoaderInstallPath;
PartitionLayout* m_partLayout;
PartitionLayout m_partLayout;
OsproberEntryList m_osproberLines;