Rename d pointer to d_ptr to disambiguate from Device d.
This commit is contained in:
parent
2012e01b88
commit
2382b9e1c5
|
@ -65,22 +65,22 @@ struct NewOperationPrivate
|
||||||
*/
|
*/
|
||||||
NewOperation::NewOperation(Device& d, Partition* p) :
|
NewOperation::NewOperation(Device& d, Partition* p) :
|
||||||
Operation(),
|
Operation(),
|
||||||
d(std::make_unique<NewOperationPrivate>(d, p))
|
d_ptr(std::make_unique<NewOperationPrivate>(d, p))
|
||||||
{
|
{
|
||||||
addJob(createPartitionJob());
|
addJob(createPartitionJob());
|
||||||
|
|
||||||
if (!p->label().isEmpty()) {
|
if (!p->label().isEmpty()) {
|
||||||
this->d->m_SetPartitionLabelJob = new SetPartitionLabelJob(targetDevice(), newPartition(), p->label());
|
d_ptr->m_SetPartitionLabelJob = new SetPartitionLabelJob(targetDevice(), newPartition(), p->label());
|
||||||
addJob(setPartitionLabelJob());
|
addJob(setPartitionLabelJob());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!p->uuid().isEmpty()) {
|
if (!p->uuid().isEmpty()) {
|
||||||
this->d->m_SetPartitionUUIDJob = new SetPartitionUUIDJob(targetDevice(), newPartition(), p->uuid());
|
d_ptr->m_SetPartitionUUIDJob = new SetPartitionUUIDJob(targetDevice(), newPartition(), p->uuid());
|
||||||
addJob(setPartitionUUIDJob());
|
addJob(setPartitionUUIDJob());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p->attributes()) {
|
if (p->attributes()) {
|
||||||
this->d->m_SetPartitionAttributesJob = new SetPartitionAttributesJob(targetDevice(), newPartition(), p->attributes());
|
d_ptr->m_SetPartitionAttributesJob = new SetPartitionAttributesJob(targetDevice(), newPartition(), p->attributes());
|
||||||
addJob(setPartitionAttributesJob());
|
addJob(setPartitionAttributesJob());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,18 +93,18 @@ NewOperation::NewOperation(Device& d, Partition* p) :
|
||||||
// label. The operation stack will merge these operations with this one here
|
// label. The operation stack will merge these operations with this one here
|
||||||
// and if the jobs don't exist things will break.
|
// and if the jobs don't exist things will break.
|
||||||
|
|
||||||
this->d->m_CreateFileSystemJob = new CreateFileSystemJob(targetDevice(), newPartition(), fs.label());
|
d_ptr->m_CreateFileSystemJob = new CreateFileSystemJob(targetDevice(), newPartition(), fs.label());
|
||||||
addJob(createFileSystemJob());
|
addJob(createFileSystemJob());
|
||||||
|
|
||||||
if (fs.type() == FileSystem::Type::Lvm2_PV) {
|
if (fs.type() == FileSystem::Type::Lvm2_PV) {
|
||||||
this->d->m_SetPartFlagsJob = new SetPartFlagsJob(targetDevice(), newPartition(), PartitionTable::Flag::Lvm);
|
d_ptr->m_SetPartFlagsJob = new SetPartFlagsJob(targetDevice(), newPartition(), PartitionTable::Flag::Lvm);
|
||||||
addJob(setPartFlagsJob());
|
addJob(setPartFlagsJob());
|
||||||
}
|
}
|
||||||
|
|
||||||
this->d->m_SetFileSystemLabelJob = new SetFileSystemLabelJob(newPartition(), fs.label());
|
d_ptr->m_SetFileSystemLabelJob = new SetFileSystemLabelJob(newPartition(), fs.label());
|
||||||
addJob(setLabelJob());
|
addJob(setLabelJob());
|
||||||
|
|
||||||
this->d->m_CheckFileSystemJob = new CheckFileSystemJob(newPartition());
|
d_ptr->m_CheckFileSystemJob = new CheckFileSystemJob(newPartition());
|
||||||
addJob(checkJob());
|
addJob(checkJob());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -112,67 +112,67 @@ NewOperation::NewOperation(Device& d, Partition* p) :
|
||||||
NewOperation::~NewOperation()
|
NewOperation::~NewOperation()
|
||||||
{
|
{
|
||||||
if (status() == StatusPending)
|
if (status() == StatusPending)
|
||||||
delete d->m_NewPartition;
|
delete d_ptr->m_NewPartition;
|
||||||
}
|
}
|
||||||
|
|
||||||
Partition& NewOperation::newPartition()
|
Partition& NewOperation::newPartition()
|
||||||
{
|
{
|
||||||
return *d->m_NewPartition;
|
return *d_ptr->m_NewPartition;
|
||||||
}
|
}
|
||||||
|
|
||||||
const Partition& NewOperation::newPartition() const
|
const Partition& NewOperation::newPartition() const
|
||||||
{
|
{
|
||||||
return *d->m_NewPartition;
|
return *d_ptr->m_NewPartition;
|
||||||
}
|
}
|
||||||
|
|
||||||
Device& NewOperation::targetDevice()
|
Device& NewOperation::targetDevice()
|
||||||
{
|
{
|
||||||
return d->m_TargetDevice;
|
return d_ptr->m_TargetDevice;
|
||||||
}
|
}
|
||||||
|
|
||||||
const Device& NewOperation::targetDevice() const
|
const Device& NewOperation::targetDevice() const
|
||||||
{
|
{
|
||||||
return d->m_TargetDevice;
|
return d_ptr->m_TargetDevice;
|
||||||
}
|
}
|
||||||
|
|
||||||
CreatePartitionJob* NewOperation::createPartitionJob()
|
CreatePartitionJob* NewOperation::createPartitionJob()
|
||||||
{
|
{
|
||||||
return d->m_CreatePartitionJob;
|
return d_ptr->m_CreatePartitionJob;
|
||||||
}
|
}
|
||||||
|
|
||||||
SetPartitionLabelJob* NewOperation::setPartitionLabelJob()
|
SetPartitionLabelJob* NewOperation::setPartitionLabelJob()
|
||||||
{
|
{
|
||||||
return d->m_SetPartitionLabelJob;
|
return d_ptr->m_SetPartitionLabelJob;
|
||||||
}
|
}
|
||||||
|
|
||||||
SetPartitionUUIDJob* NewOperation::setPartitionUUIDJob()
|
SetPartitionUUIDJob* NewOperation::setPartitionUUIDJob()
|
||||||
{
|
{
|
||||||
return d->m_SetPartitionUUIDJob;
|
return d_ptr->m_SetPartitionUUIDJob;
|
||||||
}
|
}
|
||||||
|
|
||||||
SetPartitionAttributesJob* NewOperation::setPartitionAttributesJob()
|
SetPartitionAttributesJob* NewOperation::setPartitionAttributesJob()
|
||||||
{
|
{
|
||||||
return d->m_SetPartitionAttributesJob;
|
return d_ptr->m_SetPartitionAttributesJob;
|
||||||
}
|
}
|
||||||
|
|
||||||
CreateFileSystemJob* NewOperation::createFileSystemJob()
|
CreateFileSystemJob* NewOperation::createFileSystemJob()
|
||||||
{
|
{
|
||||||
return d->m_CreateFileSystemJob;
|
return d_ptr->m_CreateFileSystemJob;
|
||||||
}
|
}
|
||||||
|
|
||||||
SetPartFlagsJob* NewOperation::setPartFlagsJob()
|
SetPartFlagsJob* NewOperation::setPartFlagsJob()
|
||||||
{
|
{
|
||||||
return d->m_SetPartFlagsJob;
|
return d_ptr->m_SetPartFlagsJob;
|
||||||
}
|
}
|
||||||
|
|
||||||
SetFileSystemLabelJob* NewOperation::setLabelJob()
|
SetFileSystemLabelJob* NewOperation::setLabelJob()
|
||||||
{
|
{
|
||||||
return d->m_SetFileSystemLabelJob;
|
return d_ptr->m_SetFileSystemLabelJob;
|
||||||
}
|
}
|
||||||
|
|
||||||
CheckFileSystemJob* NewOperation::checkJob()
|
CheckFileSystemJob* NewOperation::checkJob()
|
||||||
{
|
{
|
||||||
return d->m_CheckFileSystemJob;
|
return d_ptr->m_CheckFileSystemJob;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool NewOperation::targets(const Device& d) const
|
bool NewOperation::targets(const Device& d) const
|
||||||
|
|
|
@ -77,7 +77,7 @@ protected:
|
||||||
CheckFileSystemJob* checkJob();
|
CheckFileSystemJob* checkJob();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::unique_ptr<NewOperationPrivate> d;
|
std::unique_ptr<NewOperationPrivate> d_ptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue