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

Pass mount point to CreatePartitionJob

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-07-04 16:34:30 +02:00
parent ab4e81504e
commit 1247077ccc
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/partition/CreatePartitionDialog.cpp
View File

@ -107,10 +107,12 @@ CreatePartitionDialog::createJob()
fs, first, last,
QString() /* path */,
PartitionTable::FlagNone /* availableFlags */,
m_ui->mountPointComboBox->currentText(),
QString() /* mountPoint */,
false /* mounted */,
PartitionTable::FlagNone /* activeFlags */,
Partition::StateNew
);
return new CreatePartitionJob( m_device, partition );
return new CreatePartitionJob( m_device, partition,
m_ui->mountPointComboBox->currentText()
);
}

3
src/modules/partition/CreatePartitionJob.cpp
View File

@ -24,9 +24,10 @@
#include <core/partitiontable.h>
#include <fs/filesystem.h>
CreatePartitionJob::CreatePartitionJob( Device* device, Partition* partition )
CreatePartitionJob::CreatePartitionJob( Device* device, Partition* partition, const QString& mountPoint )
: m_device( device )
, m_partition( partition )
, m_mountPoint( mountPoint )
{
}

9
src/modules/partition/CreatePartitionJob.h
View File

@ -29,7 +29,7 @@ class CreatePartitionJob : public Calamares::Job
{
Q_OBJECT
public:
CreatePartitionJob( Device* device, Partition* partition );
CreatePartitionJob( Device* device, Partition* partition, const QString& mountPoint );
QString prettyName() override;
void exec() override;
@ -44,10 +44,15 @@ public:
return m_partition;
}
QString mountPoint() const
{
return m_mountPoint;
}
private:
Device* m_device;
Partition* m_partition;
FileSystem* m_fs;
QString m_mountPoint;
};
#endif /* CREATEPARTITIONJOB_H */