diff --git a/src/core/lvmdevice.cpp b/src/core/lvmdevice.cpp index e95b2a5..7c0ea0b 100644 --- a/src/core/lvmdevice.cpp +++ b/src/core/lvmdevice.cpp @@ -1,6 +1,6 @@ /************************************************************************* * Copyright (C) 2016 by Chantara Tith * - * Copyright (C) 2016 by Andrius Štikonas * + * Copyright (C) 2016-2018 by Andrius Štikonas * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License as * diff --git a/src/core/partition.cpp b/src/core/partition.cpp index 7ca7d70..a9ca51d 100644 --- a/src/core/partition.cpp +++ b/src/core/partition.cpp @@ -167,13 +167,13 @@ QString Partition::deviceNode() const if (roles().has(PartitionRole::None) || roles().has(PartitionRole::Unallocated)) return xi18nc("@item partition name", "unallocated"); - if (state() == StateNew) + if (state() == State::New) return xi18nc("@item partition name", "New Partition"); - if (state() == StateRestore) + if (state() == State::Restore) return xi18nc("@item partition name", "Restored Partition"); - if (state() == StateCopy) + if (state() == State::Copy) return xi18nc("@item partition name", "Copy of %1", partitionPath()); return partitionPath(); diff --git a/src/core/partition.h b/src/core/partition.h index 31da284..b1d6c01 100644 --- a/src/core/partition.h +++ b/src/core/partition.h @@ -77,13 +77,17 @@ class LIBKPMCORE_EXPORT Partition : public PartitionNode public: /** A Partition state -- where did it come from? */ enum State { - StateNone = 0, /**< exists on disk */ - StateNew = 1, /**< from a NewOperation */ - StateCopy = 2, /**< from a CopyOperation */ - StateRestore = 3 /**< from a RestoreOperation */ + None, /**< exists on disk */ + New, /**< from a NewOperation */ + Copy, /**< from a CopyOperation */ + Restore, /**< from a RestoreOperation */ + StateNone, /**< deprecated */ + StateNew, /**< deprecated */ + StateCopy, /**< deprecated */ + StateRestore /**< deprecated */ }; - Partition(PartitionNode* parent, const Device& device, const PartitionRole& role, FileSystem* fs, qint64 sectorStart, qint64 sectorEnd, QString partitionPath, PartitionTable::Flags availableFlags = PartitionTable::FlagNone, const QString& mountPoint = QString(), bool mounted = false, PartitionTable::Flags activeFlags = PartitionTable::FlagNone, State state = StateNone); + Partition(PartitionNode* parent, const Device& device, const PartitionRole& role, FileSystem* fs, qint64 sectorStart, qint64 sectorEnd, QString partitionPath, PartitionTable::Flags availableFlags = PartitionTable::FlagNone, const QString& mountPoint = QString(), bool mounted = false, PartitionTable::Flags activeFlags = PartitionTable::FlagNone, State state = State::None); ~Partition() override; Partition(const Partition& other, PartitionNode* parent = nullptr); diff --git a/src/jobs/createpartitionjob.cpp b/src/jobs/createpartitionjob.cpp index bb2b1b2..260aa92 100644 --- a/src/jobs/createpartitionjob.cpp +++ b/src/jobs/createpartitionjob.cpp @@ -62,7 +62,7 @@ bool CreatePartitionJob::run(Report& parent) if (partitionPath != QString()) { rval = true; partition().setPartitionPath(partitionPath); - partition().setState(Partition::StateNone); + partition().setState(Partition::State::None); backendPartitionTable->commit(); } else report->line() << xi18nc("@info/plain", "Failed to add partition %1 to device %2.", partition().deviceNode(), device().deviceNode()); @@ -76,7 +76,7 @@ bool CreatePartitionJob::run(Report& parent) report->line() << xi18nc("@info:progress", "Could not open device %1 to create new partition %2.", device().deviceNode(), partition().deviceNode()); } else if (device().type() == Device::LVM_Device) { LvmDevice& dev = dynamic_cast(device()); - partition().setState(Partition::StateNone); + partition().setState(Partition::State::None); QString partPath = partition().partitionPath(); QString lvname = partPath.right(partPath.length() - partPath.lastIndexOf(QStringLiteral("/")) - 1); diff --git a/src/ops/backupoperation.cpp b/src/ops/backupoperation.cpp index 1cc42ff..eee80f7 100644 --- a/src/ops/backupoperation.cpp +++ b/src/ops/backupoperation.cpp @@ -61,7 +61,7 @@ bool BackupOperation::canBackup(const Partition* p) if (p->isMounted()) return false; - if (p->state() == Partition::StateNew || p->state() == Partition::StateCopy || p->state() == Partition::StateRestore) + if (p->state() == Partition::State::New || p->state() == Partition::State::Copy || p->state() == Partition::State::Restore) return false; return p->fileSystem().supportBackup() != FileSystem::cmdSupportNone; diff --git a/src/ops/copyoperation.cpp b/src/ops/copyoperation.cpp index 5c516f2..08e670c 100644 --- a/src/ops/copyoperation.cpp +++ b/src/ops/copyoperation.cpp @@ -137,7 +137,7 @@ bool CopyOperation::execute(Report& parent) // set the state of the target partition from StateCopy to StateNone or checking // it will fail (because its deviceNode() will still be "Copy of sdXn"). This is // only required for overwritten partitions, but doesn't hurt in any case. - copiedPartition().setState(Partition::StateNone); + copiedPartition().setState(Partition::State::None); // if we have overwritten a partition, reset device path and number if (overwrittenPartition()) { @@ -237,7 +237,7 @@ void CopyOperation::setOverwrittenPartition(Partition* p) // have executed and we're asked to clean up after ourselves, the state of the overwritten partition // might have changed: If it was a new one and the NewOperation has successfully run, the state will // then be StateNone. - m_MustDeleteOverwritten = (p && p->state() == Partition::StateNone); + m_MustDeleteOverwritten = (p && p->state() == Partition::State::None); } void CopyOperation::cleanupOverwrittenPartition() @@ -259,7 +259,7 @@ Partition* CopyOperation::createCopy(const Partition& target, const Partition& s p->setDevicePath(source.devicePath()); p->setPartitionPath(source.partitionPath()); - p->setState(Partition::StateCopy); + p->setState(Partition::State::Copy); p->deleteFileSystem(); p->setFileSystem(FileSystemFactory::create(source.fileSystem())); @@ -281,7 +281,7 @@ bool CopyOperation::canCopy(const Partition* p) if (p == nullptr) return false; - if (p->state() == Partition::StateNew && p->roles().has(PartitionRole::Luks)) + if (p->state() == Partition::State::New && p->roles().has(PartitionRole::Luks)) return false; if (p->isMounted()) diff --git a/src/ops/newoperation.cpp b/src/ops/newoperation.cpp index 89b0be3..29b19ad 100644 --- a/src/ops/newoperation.cpp +++ b/src/ops/newoperation.cpp @@ -128,7 +128,7 @@ Partition* NewOperation::createNew(const Partition& cloneFrom, p->firstSector(), p->lastSector(), p->sectorSize())); - p->setState(Partition::StateNew); + p->setState(Partition::State::New); p->setPartitionPath(QString()); return p; diff --git a/src/ops/resizeoperation.cpp b/src/ops/resizeoperation.cpp index 37cf627..3bac007 100644 --- a/src/ops/resizeoperation.cpp +++ b/src/ops/resizeoperation.cpp @@ -333,7 +333,7 @@ bool ResizeOperation::canGrow(const Partition* p) return false; // we can always grow, shrink or move a partition not yet written to disk - if (p->state() == Partition::StateNew && !p->roles().has(PartitionRole::Luks)) + if (p->state() == Partition::State::New && !p->roles().has(PartitionRole::Luks)) return true; if (p->isMounted()) @@ -352,10 +352,10 @@ bool ResizeOperation::canShrink(const Partition* p) return false; // we can always grow, shrink or move a partition not yet written to disk - if (p->state() == Partition::StateNew && !p->roles().has(PartitionRole::Luks)) + if (p->state() == Partition::State::New && !p->roles().has(PartitionRole::Luks)) return true; - if (p->state() == Partition::StateCopy) + if (p->state() == Partition::State::Copy) return false; if (p->isMounted()) @@ -374,7 +374,7 @@ bool ResizeOperation::canMove(const Partition* p) return false; // we can always grow, shrink or move a partition not yet written to disk - if (p->state() == Partition::StateNew) + if (p->state() == Partition::State::New) // too many bad things can happen for LUKS partitions return p->roles().has(PartitionRole::Luks) ? false : true; diff --git a/src/ops/restoreoperation.cpp b/src/ops/restoreoperation.cpp index be8c0ab..ae89d01 100644 --- a/src/ops/restoreoperation.cpp +++ b/src/ops/restoreoperation.cpp @@ -60,7 +60,7 @@ RestoreOperation::RestoreOperation(Device& d, Partition* p, const QString& filen m_CheckTargetJob(nullptr), m_MaximizeJob(nullptr) { - restorePartition().setState(Partition::StateRestore); + restorePartition().setState(Partition::State::Restore); Q_ASSERT(targetDevice().partitionTable()); @@ -128,7 +128,7 @@ bool RestoreOperation::execute(Report& parent) restorePartition().setPartitionPath(overwrittenPartition()->devicePath()); if (overwrittenPartition() || (rval = createPartitionJob()->run(*report))) { - restorePartition().setState(Partition::StateNone); + restorePartition().setState(Partition::State::None); if ((rval = restoreJob()->run(*report))) { if ((rval = checkTargetJob()->run(*report))) { @@ -173,7 +173,7 @@ void RestoreOperation::setOverwrittenPartition(Partition* p) cleanupOverwrittenPartition(); m_OverwrittenPartition = p; - m_MustDeleteOverwritten = (p && p->state() == Partition::StateNone); + m_MustDeleteOverwritten = (p && p->state() == Partition::State::None); } void RestoreOperation::cleanupOverwrittenPartition() @@ -227,7 +227,7 @@ Partition* RestoreOperation::createRestorePartition(const Device& device, Partit const qint64 end = start + fileInfo.size() / device.logicalSize() - 1; Partition* p = new Partition(&parent, device, PartitionRole(r), FileSystemFactory::create(FileSystem::Unknown, start, end, device.logicalSize()), start, end, QString()); - p->setState(Partition::StateRestore); + p->setState(Partition::State::Restore); return p; }