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

[partition] Initialize the filesystem type, not the partition type

Browse source 
- Passing FileSystem::Type to the QString constructor for
  partition type is not what I intended.
This commit is contained in:
Adriaan de Groot 2020-11-02 22:32:44 +01:00
parent 73b5a0898d
commit ffce79e30e
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/partition/core/PartitionLayout.cpp
View file

@ -41,14 +41,14 @@ PartitionLayout::PartitionEntry::PartitionEntry()
{ {
} }
PartitionLayout::PartitionEntry::PartitionEntry( FileSystem::Type type, PartitionLayout::PartitionEntry::PartitionEntry( FileSystem::Type fs,
const QString& mountPoint, const QString& mountPoint,
const QString& size, const QString& size,
const QString& minSize, const QString& minSize,
const QString& maxSize ) const QString& maxSize )
: partType( type ) : partAttributes( 0 )
, partAttributes( 0 )
, partMountPoint( mountPoint ) , partMountPoint( mountPoint )
, partFileSystem( fs )
, partSize( size ) , partSize( size )
, partMinSize( minSize ) , partMinSize( minSize )
, partMaxSize( maxSize ) , partMaxSize( maxSize )

2
src/modules/partition/core/PartitionLayout.h
View file

@ -49,7 +49,7 @@ public:
* Sets a specific FS type (not parsed from string like the other * Sets a specific FS type (not parsed from string like the other
* constructor). * constructor).
*/ */
PartitionEntry( FileSystem::Type type, PartitionEntry( FileSystem::Type fs,
const QString& mountPoint, const QString& mountPoint,
const QString& size, const QString& size,
const QString& minSize = QString(), const QString& minSize = QString(),