Merge branch 'master' into kauth
This commit is contained in:
commit
0263e45251
|
@ -80,10 +80,10 @@ public:
|
||||||
New, /**< from a NewOperation */
|
New, /**< from a NewOperation */
|
||||||
Copy, /**< from a CopyOperation */
|
Copy, /**< from a CopyOperation */
|
||||||
Restore, /**< from a RestoreOperation */
|
Restore, /**< from a RestoreOperation */
|
||||||
StateNone = 0, /**< deprecated */
|
StateNone __attribute__((deprecated("Use Partition::State::None"))) = None,
|
||||||
StateNew = 1, /**< deprecated */
|
StateNew __attribute__((deprecated("Use Partition::State::New"))) = New,
|
||||||
StateCopy = 2, /**< deprecated */
|
StateCopy __attribute__((deprecated("Use Partition::State::Copy"))) = Copy,
|
||||||
StateRestore = 3 /**< deprecated */
|
StateRestore __attribute__((deprecated("Use Partition::State::Restore"))) = Restore
|
||||||
};
|
};
|
||||||
|
|
||||||
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(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);
|
||||||
|
|
Loading…
Reference in New Issue