Merge branch 'master' into partition-type

This commit is contained in:
Adriaan de Groot 2020-03-23 17:09:44 +01:00 committed by GitHub
commit 1718f7a8a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 54 additions and 25 deletions

View file

@ -31,6 +31,7 @@
// Qt
#include <QList>
#include <QObject>
#include <QVariantMap>
class Partition;
@ -43,6 +44,7 @@ public:
QString partType;
QString partMountPoint;
FileSystem::Type partFileSystem = FileSystem::Unknown;
QVariantMap partFeatures;
CalamaresUtils::Partition::PartitionSize partSize;
CalamaresUtils::Partition::PartitionSize partMinSize;
CalamaresUtils::Partition::PartitionSize partMaxSize;
@ -77,6 +79,7 @@ public:
const QString& type,
const QString& mountPoint,
const QString& fs,
const QVariantMap& features,
const QString& size,
const QString& min = QString(),
const QString& max = QString() );