diff --git a/src/core/copysourcedevice.h b/src/core/copysourcedevice.h index cccfbe2..eaf08e1 100644 --- a/src/core/copysourcedevice.h +++ b/src/core/copysourcedevice.h @@ -43,16 +43,16 @@ public: ~CopySourceDevice(); public: - virtual bool open(); - virtual qint32 sectorSize() const; - virtual bool readSectors(void* buffer, qint64 readOffset, qint64 numSectors); - virtual qint64 length() const; - virtual bool overlaps(const CopyTarget& target) const; + virtual bool open() override; + virtual qint32 sectorSize() const override; + virtual bool readSectors(void* buffer, qint64 readOffset, qint64 numSectors) override; + virtual qint64 length() const override; + virtual bool overlaps(const CopyTarget& target) const override; - virtual qint64 firstSector() const { + virtual qint64 firstSector() const override { return m_FirstSector; /**< @return first sector to copying */ } - virtual qint64 lastSector() const { + virtual qint64 lastSector() const override { return m_LastSector; /**< @return last sector to copy */ } diff --git a/src/core/copysourcefile.h b/src/core/copysourcefile.h index 6d21a18..66f3e39 100644 --- a/src/core/copysourcefile.h +++ b/src/core/copysourcefile.h @@ -39,20 +39,20 @@ public: CopySourceFile(const QString& filename, qint32 sectorsize); public: - virtual bool open(); - virtual bool readSectors(void* buffer, qint64 readOffset, qint64 numSectors); - virtual qint64 length() const; + virtual bool open() override; + virtual bool readSectors(void* buffer, qint64 readOffset, qint64 numSectors) override; + virtual qint64 length() const override; - virtual qint32 sectorSize() const { + virtual qint32 sectorSize() const override { return m_SectorSize; /**< @return the file's sector size */ } - virtual bool overlaps(const CopyTarget&) const { + virtual bool overlaps(const CopyTarget&) const override { return false; /**< @return false for file */ } - virtual qint64 firstSector() const { + virtual qint64 firstSector() const override { return 0; /**< @return 0 for file */ } - virtual qint64 lastSector() const { + virtual qint64 lastSector() const override { return length(); /**< @return equal to length for file. @see length() */ } diff --git a/src/core/copysourceshred.h b/src/core/copysourceshred.h index 8fa2e8b..79aa1e0 100644 --- a/src/core/copysourceshred.h +++ b/src/core/copysourceshred.h @@ -37,20 +37,20 @@ public: CopySourceShred(qint64 size, qint32 sectorsize, bool randomShred); public: - virtual bool open(); - virtual bool readSectors(void* buffer, qint64 readOffset, qint64 numSectors); - virtual qint64 length() const; + virtual bool open() override; + virtual bool readSectors(void* buffer, qint64 readOffset, qint64 numSectors) override; + virtual qint64 length() const override; - virtual qint32 sectorSize() const { + virtual qint32 sectorSize() const override { return m_SectorSize; /**< @return the file's sector size */ } - virtual bool overlaps(const CopyTarget&) const { + virtual bool overlaps(const CopyTarget&) const override { return false; /**< @return false for shred source */ } - virtual qint64 firstSector() const { + virtual qint64 firstSector() const override { return 0; /**< @return 0 for shred source */ } - virtual qint64 lastSector() const { + virtual qint64 lastSector() const override { return length(); /**< @return equal to length for shred source. @see length() */ } diff --git a/src/core/copytargetdevice.h b/src/core/copytargetdevice.h index 00eb155..5b63eef 100644 --- a/src/core/copytargetdevice.h +++ b/src/core/copytargetdevice.h @@ -45,13 +45,13 @@ public: ~CopyTargetDevice(); public: - virtual bool open(); - virtual qint32 sectorSize() const; - virtual bool writeSectors(void* buffer, qint64 writeOffset, qint64 numSectors); - virtual qint64 firstSector() const { + virtual bool open() override; + virtual qint32 sectorSize() const override; + virtual bool writeSectors(void* buffer, qint64 writeOffset, qint64 numSectors) override; + virtual qint64 firstSector() const override { return m_FirstSector; /**< @return the first sector to write to */ } - virtual qint64 lastSector() const { + virtual qint64 lastSector() const override { return m_LastSector; /**< @return the last sector to write to */ } diff --git a/src/core/copytargetfile.h b/src/core/copytargetfile.h index 5e2e9ba..7a2624f 100644 --- a/src/core/copytargetfile.h +++ b/src/core/copytargetfile.h @@ -39,16 +39,16 @@ public: CopyTargetFile(const QString& filename, qint32 sectorsize); public: - virtual bool open(); - virtual bool writeSectors(void* buffer, qint64 writeOffset, qint64 numSectors); + virtual bool open() override; + virtual bool writeSectors(void* buffer, qint64 writeOffset, qint64 numSectors) override; - virtual qint32 sectorSize() const { + virtual qint32 sectorSize() const override { return m_SectorSize; /**< @return the file's sector size */ } - virtual qint64 firstSector() const { + virtual qint64 firstSector() const override { return 0; /**< @return always 0 for a file */ } - virtual qint64 lastSector() const { + virtual qint64 lastSector() const override { return sectorsWritten(); /**< @return the number of sectors written so far */ } diff --git a/src/core/devicescanner.h b/src/core/devicescanner.h index 037eec6..24d78a0 100644 --- a/src/core/devicescanner.h +++ b/src/core/devicescanner.h @@ -46,7 +46,7 @@ Q_SIGNALS: void progress(const QString& device_node, int progress); protected: - virtual void run(); + virtual void run() override; OperationStack& operationStack() { return m_OperationStack; } diff --git a/src/core/partition.h b/src/core/partition.h index bbda5a3..9872392 100644 --- a/src/core/partition.h +++ b/src/core/partition.h @@ -124,21 +124,21 @@ public: return m_Number; /**< @return the Partition's device number, e.g. 7 for /dev/sdd7 */ } - bool isRoot() const { + bool isRoot() const override { return false; /**< @return always false for Partition */ } - PartitionNode* parent() { + PartitionNode* parent() override { return m_Parent; /**< @return the Partition's parent PartitionNode */ } - const PartitionNode* parent() const { + const PartitionNode* parent() const override { return m_Parent; /**< @return the Partition's parent PartitionNode */ } - Partitions& children() { + Partitions& children() override { return m_Children; /**< @return the Partition's children. empty for non-extended. */ } - const Partitions& children() const { + const Partitions& children() const override { return m_Children; /**< @return the Partition's children. empty for non-extended. */ } @@ -226,7 +226,7 @@ public: } protected: - void append(Partition* p) { + void append(Partition* p) override { m_Children.append(p); } void setDevicePath(const QString& s) { diff --git a/src/core/partitiontable.h b/src/core/partitiontable.h index 1531bc4..a67520f 100644 --- a/src/core/partitiontable.h +++ b/src/core/partitiontable.h @@ -97,30 +97,30 @@ public: ~PartitionTable(); public: - PartitionNode* parent() { + PartitionNode* parent() override { return nullptr; /**< @return always nullptr for PartitionTable */ } - const PartitionNode* parent() const { + const PartitionNode* parent() const override { return nullptr; /**< @return always nullptr for PartitionTable */ } - bool isRoot() const { + bool isRoot() const override { return true; /**< @return always true for PartitionTable */ } bool isReadOnly() const { return tableTypeIsReadOnly(type()); /**< @return true if the PartitionTable is read only */ } - Partitions& children() { + Partitions& children() override { return m_Children; /**< @return the children in this PartitionTable */ } - const Partitions& children() const { + const Partitions& children() const override { return m_Children; /**< @return the children in this PartitionTable */ } void setType(const Device& d, TableType t); - void append(Partition* partition); + void append(Partition* partition) override; qint64 freeSectorsBefore(const Partition& p) const; qint64 freeSectorsAfter(const Partition& p) const; diff --git a/src/fs/btrfs.h b/src/fs/btrfs.h index 45b5326..c94dfe3 100644 --- a/src/fs/btrfs.h +++ b/src/fs/btrfs.h @@ -43,55 +43,55 @@ public: public: static void init(); - virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; - virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); - virtual bool updateUUID(Report& report, const QString& deviceNode) const; + virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; + virtual bool updateUUID(Report& report, const QString& deviceNode) const override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } - virtual qint64 minCapacity() const; - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 minCapacity() const override; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/exfat.h b/src/fs/exfat.h index 16dd6e7..70ae9b2 100644 --- a/src/fs/exfat.h +++ b/src/fs/exfat.h @@ -42,55 +42,55 @@ public: public: static void init(); -// virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; -// virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); - virtual bool updateUUID(Report& report, const QString& deviceNode) const; +// virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; +// virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; + virtual bool updateUUID(Report& report, const QString& deviceNode) const override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } // virtual qint64 minCapacity() const; - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/ext2.h b/src/fs/ext2.h index 1c37b53..6f2426a 100644 --- a/src/fs/ext2.h +++ b/src/fs/ext2.h @@ -42,54 +42,54 @@ public: public: static void init(); - virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; - virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); - virtual bool updateUUID(Report& report, const QString& deviceNode) const; + virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; + virtual bool updateUUID(Report& report, const QString& deviceNode) const override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/ext3.h b/src/fs/ext3.h index 8a34b4f..3ebb02b 100644 --- a/src/fs/ext3.h +++ b/src/fs/ext3.h @@ -44,8 +44,8 @@ public: public: static void init() {} - virtual bool create(Report& report, const QString& deviceNode) const; - virtual qint64 maxCapacity() const; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual qint64 maxCapacity() const override; }; } diff --git a/src/fs/ext4.h b/src/fs/ext4.h index 7f971f0..3e12809 100644 --- a/src/fs/ext4.h +++ b/src/fs/ext4.h @@ -44,8 +44,8 @@ public: public: static void init() {} - virtual bool create(Report& report, const QString& deviceNode) const; - virtual qint64 maxCapacity() const; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual qint64 maxCapacity() const override; }; } diff --git a/src/fs/extended.h b/src/fs/extended.h index 571bc52..1a70340 100644 --- a/src/fs/extended.h +++ b/src/fs/extended.h @@ -45,22 +45,22 @@ public: public: static void init() {} - virtual bool create(Report&, const QString&) const; + virtual bool create(Report&, const QString&) const override; - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual bool supportToolFound() const { + virtual bool supportToolFound() const override { return true; } diff --git a/src/fs/f2fs.h b/src/fs/f2fs.h index 021a18e..8c2feb4 100644 --- a/src/fs/f2fs.h +++ b/src/fs/f2fs.h @@ -42,56 +42,56 @@ public: public: static void init(); -// virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; -// virtual qint64 readUsedCapacity(const QString& deviceNode) const; -// virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; -// virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); -// virtual bool updateUUID(Report& report, const QString& deviceNode) const; +// virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; +// virtual qint64 readUsedCapacity(const QString& deviceNode) const override; +// virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; +// virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; +// virtual bool updateUUID(Report& report, const QString& deviceNode) const override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } - virtual qint64 minCapacity() const; - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 minCapacity() const override; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/fat16.h b/src/fs/fat16.h index 94bb093..cc7fbc5 100644 --- a/src/fs/fat16.h +++ b/src/fs/fat16.h @@ -42,54 +42,54 @@ public: public: static void init(); - virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; - virtual bool updateUUID(Report& report, const QString& deviceNode) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); + virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual bool updateUUID(Report& report, const QString& deviceNode) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } - virtual qint64 minCapacity() const; - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 minCapacity() const override; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/fat32.h b/src/fs/fat32.h index 2999836..aac7b12 100644 --- a/src/fs/fat32.h +++ b/src/fs/fat32.h @@ -45,11 +45,11 @@ public: public: static void init() {} - virtual bool create(Report& report, const QString& deviceNode) const; - virtual bool updateUUID(Report& report, const QString& deviceNode) const; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual bool updateUUID(Report& report, const QString& deviceNode) const override; - virtual qint64 minCapacity() const; - virtual qint64 maxCapacity() const; + virtual qint64 minCapacity() const override; + virtual qint64 maxCapacity() const override; }; } diff --git a/src/fs/hfs.h b/src/fs/hfs.h index fa28d2e..35a9a7c 100644 --- a/src/fs/hfs.h +++ b/src/fs/hfs.h @@ -42,38 +42,38 @@ public: public: static void init(); - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/hfsplus.h b/src/fs/hfsplus.h index 8166b0f..3c23fd6 100644 --- a/src/fs/hfsplus.h +++ b/src/fs/hfsplus.h @@ -42,31 +42,31 @@ public: public: static void init(); - virtual bool check(Report& report, const QString& deviceNode) const; + virtual bool check(Report& report, const QString& deviceNode) const override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/hpfs.h b/src/fs/hpfs.h index 59f783b..0ed004f 100644 --- a/src/fs/hpfs.h +++ b/src/fs/hpfs.h @@ -42,45 +42,45 @@ public: public: static void init(); - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } - virtual qint64 maxCapacity() const; - virtual bool supportToolFound() const { + virtual qint64 maxCapacity() const override; + virtual bool supportToolFound() const override { return true; } diff --git a/src/fs/jfs.h b/src/fs/jfs.h index 6b338e8..024f1eb 100644 --- a/src/fs/jfs.h +++ b/src/fs/jfs.h @@ -42,45 +42,45 @@ public: public: static void init(); - virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; - virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); + virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual qint64 minCapacity() const; - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 minCapacity() const override; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/linuxswap.h b/src/fs/linuxswap.h index 545aae2..ed647e2 100644 --- a/src/fs/linuxswap.h +++ b/src/fs/linuxswap.h @@ -42,16 +42,16 @@ public: public: static void init(); - virtual bool create(Report& report, const QString& deviceNode) const; - virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); - virtual bool copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const; - virtual bool updateUUID(Report& report, const QString& deviceNode) const; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; + virtual bool copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const override; + virtual bool updateUUID(Report& report, const QString& deviceNode) const override; - virtual bool canMount(const QString&) const { + virtual bool canMount(const QString&) const override { return true; } - virtual bool canUnmount(const QString&) const { + virtual bool canUnmount(const QString&) const override { return true; } @@ -61,37 +61,37 @@ public: virtual QString mountTitle() const override; virtual QString unmountTitle() const override; - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_Create; diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp index 6718e23..99441c3 100644 --- a/src/fs/luks.cpp +++ b/src/fs/luks.cpp @@ -210,7 +210,7 @@ void luks::setMounted(bool mounted) bool luks::canCryptOpen(const QString&) const { - return supportToolFound() && !m_isCryptOpen && !m_isMounted; + return !m_isCryptOpen && !m_isMounted && supportToolFound(); } bool luks::canCryptClose(const QString&) const diff --git a/src/fs/luks.h b/src/fs/luks.h index 68682e9..0aa2a95 100644 --- a/src/fs/luks.h +++ b/src/fs/luks.h @@ -46,65 +46,65 @@ public: public: static void init(); - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { if (!m_isCryptOpen) return cmdSupportNone; if (m_Grow && m_innerFs) return m_innerFs->supportGrow(); return cmdSupportNone; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { if (!m_isCryptOpen) return cmdSupportNone; if (m_Shrink && m_innerFs) return m_innerFs->supportShrink(); return cmdSupportNone; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { if (!m_isCryptOpen) return cmdSupportNone; if (m_Check && m_innerFs) return m_innerFs->supportCheck(); return cmdSupportNone; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } virtual bool check(Report& report, const QString& deviceNode) const override; virtual bool create(Report &report, const QString &deviceNode) const override; - virtual qint64 minCapacity() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; - virtual QString readUUID(const QString& deviceNode) const; - virtual bool updateUUID(Report& report, const QString& deviceNode) const; - virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; - virtual QString readLabel(const QString& deviceNode) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); + virtual qint64 minCapacity() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; + virtual QString readUUID(const QString& deviceNode) const override; + virtual bool updateUUID(Report& report, const QString& deviceNode) const override; + virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; + virtual QString readLabel(const QString& deviceNode) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; virtual QString mountTitle() const override; virtual QString unmountTitle() const override; @@ -113,8 +113,8 @@ public: void setPassphrase(const QString&); - virtual bool canMount(const QString&) const; - virtual bool canUnmount(const QString&) const; + virtual bool canMount(const QString&) const override; + virtual bool canUnmount(const QString&) const override; bool isMounted() const; void setMounted(bool mounted); diff --git a/src/fs/lvm2_pv.h b/src/fs/lvm2_pv.h index 700548d..4dcba37 100644 --- a/src/fs/lvm2_pv.h +++ b/src/fs/lvm2_pv.h @@ -43,54 +43,54 @@ public: public: static void init(); -// virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; - virtual bool remove(Report& report, const QString& deviceNode) const; -// virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; -// virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); - virtual bool updateUUID(Report& report, const QString& deviceNode) const; +// virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual bool remove(Report& report, const QString& deviceNode) const override; +// virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; +// virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; + virtual bool updateUUID(Report& report, const QString& deviceNode) const override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } - virtual qint64 maxCapacity() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 maxCapacity() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/nilfs2.h b/src/fs/nilfs2.h index 04e40a2..44eb6d1 100644 --- a/src/fs/nilfs2.h +++ b/src/fs/nilfs2.h @@ -43,56 +43,56 @@ public: public: static void init(); -// virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; - virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); - virtual bool updateUUID(Report& report, const QString& deviceNode) const; +// virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; + virtual bool updateUUID(Report& report, const QString& deviceNode) const override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } - virtual qint64 minCapacity() const; - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 minCapacity() const override; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/ntfs.h b/src/fs/ntfs.h index 6c6f8a0..b8089cb 100644 --- a/src/fs/ntfs.h +++ b/src/fs/ntfs.h @@ -42,57 +42,57 @@ public: public: static void init(); - virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; - virtual bool copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const; - virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); - virtual bool updateUUID(Report& report, const QString& deviceNode) const; - virtual bool updateBootSector(Report& report, const QString& deviceNode) const; + virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual bool copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const override; + virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; + virtual bool updateUUID(Report& report, const QString& deviceNode) const override; + virtual bool updateBootSector(Report& report, const QString& deviceNode) const override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } - virtual qint64 minCapacity() const; - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 minCapacity() const override; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/ocfs2.h b/src/fs/ocfs2.h index 4f477be..a9817b3 100644 --- a/src/fs/ocfs2.h +++ b/src/fs/ocfs2.h @@ -42,54 +42,54 @@ public: public: static void init(); - virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; - virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); - virtual bool updateUUID(Report& report, const QString& deviceNode) const; + virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; + virtual bool updateUUID(Report& report, const QString& deviceNode) const override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } - virtual qint64 minCapacity() const; - virtual qint64 maxCapacity() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 minCapacity() const override; + virtual qint64 maxCapacity() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/reiser4.h b/src/fs/reiser4.h index f5edc14..6d85351 100644 --- a/src/fs/reiser4.h +++ b/src/fs/reiser4.h @@ -42,36 +42,36 @@ public: public: static void init(); - virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; + virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/reiserfs.h b/src/fs/reiserfs.h index aa5ed60..f1edefe 100644 --- a/src/fs/reiserfs.h +++ b/src/fs/reiserfs.h @@ -44,55 +44,55 @@ public: public: static void init(); - virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; - virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); - virtual bool updateUUID(Report& report, const QString& deviceNode) const; + virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; + virtual bool updateUUID(Report& report, const QString& deviceNode) const override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } - virtual qint64 minCapacity() const; - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 minCapacity() const override; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/ufs.h b/src/fs/ufs.h index b07f0ed..dadee83 100644 --- a/src/fs/ufs.h +++ b/src/fs/ufs.h @@ -40,17 +40,17 @@ public: public: static void init() {} - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual bool supportToolFound() const { + virtual bool supportToolFound() const override { return true; } diff --git a/src/fs/unformatted.h b/src/fs/unformatted.h index d38283a..167e9b2 100644 --- a/src/fs/unformatted.h +++ b/src/fs/unformatted.h @@ -42,13 +42,13 @@ public: public: static void init() {} - virtual bool create(Report&, const QString&) const; + virtual bool create(Report&, const QString&) const override; - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual bool supportToolFound() const { + virtual bool supportToolFound() const override { return true; } diff --git a/src/fs/unknown.h b/src/fs/unknown.h index 6cc0cde..85a2b27 100644 --- a/src/fs/unknown.h +++ b/src/fs/unknown.h @@ -37,7 +37,7 @@ public: public: static void init() {} - virtual bool supportToolFound() const { + virtual bool supportToolFound() const override { return true; } }; diff --git a/src/fs/xfs.h b/src/fs/xfs.h index 520a33c..fe1f37e 100644 --- a/src/fs/xfs.h +++ b/src/fs/xfs.h @@ -42,46 +42,46 @@ public: public: static void init(); - virtual qint64 readUsedCapacity(const QString& deviceNode) const; - virtual bool check(Report& report, const QString& deviceNode) const; - virtual bool create(Report& report, const QString& deviceNode) const; - virtual bool copy(Report& report, const QString&, const QString&) const; - virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); + virtual qint64 readUsedCapacity(const QString& deviceNode) const override; + virtual bool check(Report& report, const QString& deviceNode) const override; + virtual bool create(Report& report, const QString& deviceNode) const override; + virtual bool copy(Report& report, const QString&, const QString&) const override; + virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual qint64 minCapacity() const; - virtual qint64 maxCapacity() const; - virtual qint64 maxLabelLength() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 minCapacity() const override; + virtual qint64 maxCapacity() const override; + virtual qint64 maxLabelLength() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/fs/zfs.h b/src/fs/zfs.h index b9d7845..5deb538 100644 --- a/src/fs/zfs.h +++ b/src/fs/zfs.h @@ -43,50 +43,50 @@ public: public: static void init(); - virtual bool remove(Report& report, const QString& deviceNode) const; - virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); + virtual bool remove(Report& report, const QString& deviceNode) const override; + virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override; - virtual CommandSupportType supportGetUsed() const { + virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } - virtual CommandSupportType supportGetLabel() const { + virtual CommandSupportType supportGetLabel() const override { return m_GetLabel; } - virtual CommandSupportType supportCreate() const { + virtual CommandSupportType supportCreate() const override { return m_Create; } - virtual CommandSupportType supportGrow() const { + virtual CommandSupportType supportGrow() const override { return m_Grow; } - virtual CommandSupportType supportShrink() const { + virtual CommandSupportType supportShrink() const override { return m_Shrink; } - virtual CommandSupportType supportMove() const { + virtual CommandSupportType supportMove() const override { return m_Move; } - virtual CommandSupportType supportCheck() const { + virtual CommandSupportType supportCheck() const override { return m_Check; } - virtual CommandSupportType supportCopy() const { + virtual CommandSupportType supportCopy() const override { return m_Copy; } - virtual CommandSupportType supportBackup() const { + virtual CommandSupportType supportBackup() const override { return m_Backup; } - virtual CommandSupportType supportSetLabel() const { + virtual CommandSupportType supportSetLabel() const override { return m_SetLabel; } - virtual CommandSupportType supportUpdateUUID() const { + virtual CommandSupportType supportUpdateUUID() const override { return m_UpdateUUID; } - virtual CommandSupportType supportGetUUID() const { + virtual CommandSupportType supportGetUUID() const override { return m_GetUUID; } - virtual qint64 minCapacity() const; - virtual qint64 maxCapacity() const; - virtual SupportTool supportToolName() const; - virtual bool supportToolFound() const; + virtual qint64 minCapacity() const override; + virtual qint64 maxCapacity() const override; + virtual SupportTool supportToolName() const override; + virtual bool supportToolFound() const override; public: static CommandSupportType m_GetUsed; diff --git a/src/jobs/backupfilesystemjob.h b/src/jobs/backupfilesystemjob.h index 3d8da48..3ab4e18 100644 --- a/src/jobs/backupfilesystemjob.h +++ b/src/jobs/backupfilesystemjob.h @@ -39,9 +39,9 @@ public: BackupFileSystemJob(Device& sourcedevice, Partition& sourcepartition, const QString& filename); public: - virtual bool run(Report& parent); - virtual qint32 numSteps() const; - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual qint32 numSteps() const override; + virtual QString description() const override; protected: Partition& sourcePartition() { diff --git a/src/jobs/checkfilesystemjob.h b/src/jobs/checkfilesystemjob.h index 7e84743..2f82282 100644 --- a/src/jobs/checkfilesystemjob.h +++ b/src/jobs/checkfilesystemjob.h @@ -35,8 +35,8 @@ public: CheckFileSystemJob(Partition& p); public: - virtual bool run(Report& parent); - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual QString description() const override; protected: Partition& partition() { diff --git a/src/jobs/copyfilesystemjob.h b/src/jobs/copyfilesystemjob.h index dd4b39f..18ecfd8 100644 --- a/src/jobs/copyfilesystemjob.h +++ b/src/jobs/copyfilesystemjob.h @@ -41,9 +41,9 @@ public: CopyFileSystemJob(Device& targetdevice, Partition& targetpartition, Device& sourcedevice, Partition& sourcepartition); public: - virtual bool run(Report& parent); - virtual qint32 numSteps() const; - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual qint32 numSteps() const override; + virtual QString description() const override; protected: Partition& targetPartition() { diff --git a/src/jobs/createfilesystemjob.h b/src/jobs/createfilesystemjob.h index c9ced7c..b8573bb 100644 --- a/src/jobs/createfilesystemjob.h +++ b/src/jobs/createfilesystemjob.h @@ -36,8 +36,8 @@ public: CreateFileSystemJob(Device& d, Partition& p); public: - virtual bool run(Report& parent); - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual QString description() const override; protected: Partition& partition() { diff --git a/src/jobs/createpartitionjob.h b/src/jobs/createpartitionjob.h index cf86f10..077a0bf 100644 --- a/src/jobs/createpartitionjob.h +++ b/src/jobs/createpartitionjob.h @@ -36,8 +36,8 @@ public: CreatePartitionJob(Device& d, Partition& p); public: - virtual bool run(Report& parent); - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual QString description() const override; protected: Partition& partition() { diff --git a/src/jobs/createpartitiontablejob.h b/src/jobs/createpartitiontablejob.h index 7089ee4..67e1857 100644 --- a/src/jobs/createpartitiontablejob.h +++ b/src/jobs/createpartitiontablejob.h @@ -35,8 +35,8 @@ public: CreatePartitionTableJob(Device& d); public: - virtual bool run(Report& parent); - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual QString description() const override; protected: Device& device() { diff --git a/src/jobs/deletefilesystemjob.h b/src/jobs/deletefilesystemjob.h index 36e53ad..db305a4 100644 --- a/src/jobs/deletefilesystemjob.h +++ b/src/jobs/deletefilesystemjob.h @@ -39,8 +39,8 @@ public: DeleteFileSystemJob(Device& d, Partition& p); public: - virtual bool run(Report& parent); - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual QString description() const override; protected: Partition& partition() { diff --git a/src/jobs/deletepartitionjob.h b/src/jobs/deletepartitionjob.h index 9bf642f..fa55ce4 100644 --- a/src/jobs/deletepartitionjob.h +++ b/src/jobs/deletepartitionjob.h @@ -36,8 +36,8 @@ public: DeletePartitionJob(Device& d, Partition& p); public: - virtual bool run(Report& parent); - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual QString description() const override; protected: Partition& partition() { diff --git a/src/jobs/movefilesystemjob.h b/src/jobs/movefilesystemjob.h index be0c171..44b4b44 100644 --- a/src/jobs/movefilesystemjob.h +++ b/src/jobs/movefilesystemjob.h @@ -39,9 +39,9 @@ public: MoveFileSystemJob(Device& d, Partition& p, qint64 newstart); public: - virtual bool run(Report& parent); - virtual qint32 numSteps() const; - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual qint32 numSteps() const override; + virtual QString description() const override; protected: Partition& partition() { diff --git a/src/jobs/resizefilesystemjob.h b/src/jobs/resizefilesystemjob.h index 13129cf..56d6865 100644 --- a/src/jobs/resizefilesystemjob.h +++ b/src/jobs/resizefilesystemjob.h @@ -40,9 +40,9 @@ public: ResizeFileSystemJob(Device& d, Partition& p, qint64 newlength = -1); public: - virtual bool run(Report& parent); - virtual qint32 numSteps() const; - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual qint32 numSteps() const override; + virtual QString description() const override; protected: bool resizeFileSystemBackend(Report& report); diff --git a/src/jobs/restorefilesystemjob.h b/src/jobs/restorefilesystemjob.h index 1b36db4..fecca52 100644 --- a/src/jobs/restorefilesystemjob.h +++ b/src/jobs/restorefilesystemjob.h @@ -39,9 +39,9 @@ public: RestoreFileSystemJob(Device& targetdevice, Partition& targetpartition, const QString& filename); public: - virtual bool run(Report& parent); - virtual qint32 numSteps() const; - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual qint32 numSteps() const override; + virtual QString description() const override; protected: Partition& targetPartition() { diff --git a/src/jobs/setfilesystemlabeljob.h b/src/jobs/setfilesystemlabeljob.h index a426d70..49573a4 100644 --- a/src/jobs/setfilesystemlabeljob.h +++ b/src/jobs/setfilesystemlabeljob.h @@ -38,8 +38,8 @@ public: SetFileSystemLabelJob(Partition& p, const QString& newlabel); public: - virtual bool run(Report& parent); - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual QString description() const override; protected: Partition& partition() { diff --git a/src/jobs/setpartflagsjob.h b/src/jobs/setpartflagsjob.h index 4a1b87c..51ca4a4 100644 --- a/src/jobs/setpartflagsjob.h +++ b/src/jobs/setpartflagsjob.h @@ -41,9 +41,9 @@ public: SetPartFlagsJob(Device& d, Partition& p, PartitionTable::Flags flags); public: - virtual bool run(Report& parent); - virtual qint32 numSteps() const; - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual qint32 numSteps() const override; + virtual QString description() const override; protected: Device& device() { diff --git a/src/jobs/setpartgeometryjob.h b/src/jobs/setpartgeometryjob.h index 08ec789..d413083 100644 --- a/src/jobs/setpartgeometryjob.h +++ b/src/jobs/setpartgeometryjob.h @@ -43,8 +43,8 @@ public: SetPartGeometryJob(Device& d, Partition& p, qint64 newstart, qint64 newlength); public: - virtual bool run(Report& parent); - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual QString description() const override; protected: Partition& partition() { diff --git a/src/jobs/shredfilesystemjob.h b/src/jobs/shredfilesystemjob.h index 0f28c13..785a416 100644 --- a/src/jobs/shredfilesystemjob.h +++ b/src/jobs/shredfilesystemjob.h @@ -39,9 +39,9 @@ public: ShredFileSystemJob(Device& d, Partition& p, bool randomShred); public: - virtual bool run(Report& parent); - virtual qint32 numSteps() const; - virtual QString description() const; + virtual bool run(Report& parent) override; + virtual qint32 numSteps() const override; + virtual QString description() const override; protected: Partition& partition() { diff --git a/src/ops/backupoperation.h b/src/ops/backupoperation.h index fc65758..0526463 100644 --- a/src/ops/backupoperation.h +++ b/src/ops/backupoperation.h @@ -42,17 +42,17 @@ public: BackupOperation(Device& targetDevice, Partition& backupPartition, const QString& filename); public: - QString iconName() const { + QString iconName() const override { return QStringLiteral("document-export"); } - QString description() const; - void preview() {} - void undo() {} + QString description() const override; + void preview() override {} + void undo() override {} - virtual bool targets(const Device&) const { + virtual bool targets(const Device&) const override { return false; } - virtual bool targets(const Partition&) const { + virtual bool targets(const Partition&) const override{ return false; } diff --git a/src/ops/checkoperation.h b/src/ops/checkoperation.h index d16d6e0..cb523c8 100644 --- a/src/ops/checkoperation.h +++ b/src/ops/checkoperation.h @@ -45,15 +45,15 @@ public: CheckOperation(Device& targetDevice, Partition& checkedPartition); public: - QString iconName() const { + QString iconName() const override { return QStringLiteral("flag"); } - QString description() const; - void preview() {} - void undo() {} + QString description() const override; + void preview() override {} + void undo() override {} - virtual bool targets(const Device& d) const; - virtual bool targets(const Partition& p) const; + virtual bool targets(const Device& d) const override; + virtual bool targets(const Partition& p) const override; static bool canCheck(const Partition* p); diff --git a/src/ops/copyoperation.h b/src/ops/copyoperation.h index 9c9a501..a62f67f 100644 --- a/src/ops/copyoperation.h +++ b/src/ops/copyoperation.h @@ -55,19 +55,19 @@ public: ~CopyOperation(); public: - QString iconName() const { + QString iconName() const override { return QStringLiteral("edit-copy"); } - QString description() const { + QString description() const override { return m_Description; } - bool execute(Report& parent); - void preview(); - void undo(); + bool execute(Report& parent) override; + void preview() override; + void undo() override; - virtual bool targets(const Device& d) const; - virtual bool targets(const Partition& p) const; + virtual bool targets(const Device& d) const override; + virtual bool targets(const Partition& p) const override; static bool canCopy(const Partition* p); static bool canPaste(const Partition* p, const Partition* source); diff --git a/src/ops/createfilesystemoperation.h b/src/ops/createfilesystemoperation.h index bed0db8..53581bb 100644 --- a/src/ops/createfilesystemoperation.h +++ b/src/ops/createfilesystemoperation.h @@ -53,16 +53,16 @@ public: ~CreateFileSystemOperation(); public: - QString iconName() const { + QString iconName() const override { return QStringLiteral("draw-eraser"); } - QString description() const; - void preview(); - void undo(); - bool execute(Report& parent); + QString description() const override; + void preview() override; + void undo() override; + bool execute(Report& parent) override; - virtual bool targets(const Device& d) const; - virtual bool targets(const Partition& p) const; + virtual bool targets(const Device& d) const override; + virtual bool targets(const Partition& p) const override; protected: Device& targetDevice() { diff --git a/src/ops/createpartitiontableoperation.h b/src/ops/createpartitiontableoperation.h index e4b12b0..153dcab 100644 --- a/src/ops/createpartitiontableoperation.h +++ b/src/ops/createpartitiontableoperation.h @@ -49,16 +49,16 @@ public: ~CreatePartitionTableOperation(); public: - QString iconName() const { + QString iconName() const override { return QStringLiteral("edit-clear"); } - QString description() const; - void preview(); - void undo(); - bool execute(Report& parent); + QString description() const override; + void preview() override; + void undo() override; + bool execute(Report& parent) override; - virtual bool targets(const Device& d) const; - virtual bool targets(const Partition&) const { + virtual bool targets(const Device& d) const override; + virtual bool targets(const Partition&) const override{ return false; } diff --git a/src/ops/deleteoperation.h b/src/ops/deleteoperation.h index 73972dd..be0b2cd 100644 --- a/src/ops/deleteoperation.h +++ b/src/ops/deleteoperation.h @@ -54,20 +54,20 @@ public: ~DeleteOperation(); public: - QString iconName() const { + QString iconName() const override { return shredAction() == NoShred ? QStringLiteral("edit-delete") : QStringLiteral("edit-delete-shred"); } - QString description() const; - void preview(); - void undo(); + QString description() const override; + void preview() override; + void undo() override; ShredAction shredAction() const { return m_ShredAction; } - virtual bool targets(const Device& d) const; - virtual bool targets(const Partition& p) const; + virtual bool targets(const Device& d) const override; + virtual bool targets(const Partition& p) const override; static bool canDelete(const Partition* p); diff --git a/src/ops/newoperation.h b/src/ops/newoperation.h index 080adc0..9abad30 100644 --- a/src/ops/newoperation.h +++ b/src/ops/newoperation.h @@ -53,15 +53,15 @@ public: ~NewOperation(); public: - QString iconName() const { + QString iconName() const override { return QStringLiteral("document-new"); } - QString description() const; - void preview(); - void undo(); + QString description() const override; + void preview() override; + void undo() override; - virtual bool targets(const Device& d) const; - virtual bool targets(const Partition& p) const; + virtual bool targets(const Device& d) const override; + virtual bool targets(const Partition& p) const override; static bool canCreateNew(const Partition* p); static Partition* createNew(const Partition& cloneFrom, FileSystem::Type type); diff --git a/src/ops/resizeoperation.h b/src/ops/resizeoperation.h index 4eed013..cffc2b1 100644 --- a/src/ops/resizeoperation.h +++ b/src/ops/resizeoperation.h @@ -75,16 +75,16 @@ public: ResizeOperation(Device& d, Partition& p, qint64 newfirst, qint64 newlast); public: - QString iconName() const { + QString iconName() const override { return QStringLiteral("arrow-right-double"); } - QString description() const; - bool execute(Report& parent); - void preview(); - void undo(); + QString description() const override; + bool execute(Report& parent) override; + void preview() override; + void undo() override; - virtual bool targets(const Device& d) const; - virtual bool targets(const Partition& p) const; + virtual bool targets(const Device& d) const override; + virtual bool targets(const Partition& p) const override; static bool canGrow(const Partition* p); static bool canShrink(const Partition* p); diff --git a/src/ops/restoreoperation.h b/src/ops/restoreoperation.h index c261241..c4e4de8 100644 --- a/src/ops/restoreoperation.h +++ b/src/ops/restoreoperation.h @@ -56,17 +56,17 @@ public: ~RestoreOperation(); public: - QString iconName() const { + QString iconName() const override { return QStringLiteral("document-import"); } - QString description() const; - bool execute(Report& parent); - void undo(); + QString description() const override; + bool execute(Report& parent) override; + void undo() override; - void preview(); + void preview() override; - virtual bool targets(const Device& d) const; - virtual bool targets(const Partition& p) const; + virtual bool targets(const Device& d) const override; + virtual bool targets(const Partition& p) const override; static bool canRestore(const Partition* p); static Partition* createRestorePartition(const Device& device, PartitionNode& parent, qint64 start, const QString& fileName); diff --git a/src/ops/setfilesystemlabeloperation.h b/src/ops/setfilesystemlabeloperation.h index 23fa189..666fbb3 100644 --- a/src/ops/setfilesystemlabeloperation.h +++ b/src/ops/setfilesystemlabeloperation.h @@ -48,15 +48,15 @@ public: SetFileSystemLabelOperation(Partition& p, const QString& newlabel); public: - QString iconName() const { + QString iconName() const override { return QStringLiteral("edit-rename"); } - QString description() const; - void preview(); - void undo(); + QString description() const override; + void preview() override; + void undo() override; - virtual bool targets(const Device& d) const; - virtual bool targets(const Partition& p) const; + virtual bool targets(const Device& d) const override; + virtual bool targets(const Partition& p) const override; protected: Partition& labeledPartition() { diff --git a/src/ops/setpartflagsoperation.h b/src/ops/setpartflagsoperation.h index 4732976..aeb0015 100644 --- a/src/ops/setpartflagsoperation.h +++ b/src/ops/setpartflagsoperation.h @@ -51,15 +51,15 @@ public: SetPartFlagsOperation(Device& d, Partition& p, const PartitionTable::Flags& flags); public: - QString iconName() const { + QString iconName() const override { return QStringLiteral("flag-blue"); } - QString description() const; - void preview(); - void undo(); + QString description() const override; + void preview() override; + void undo() override; - virtual bool targets(const Device& d) const; - virtual bool targets(const Partition& p) const; + virtual bool targets(const Device& d) const override; + virtual bool targets(const Partition& p) const override; protected: Partition& flagPartition() { diff --git a/src/plugins/dummy/dummybackend.h b/src/plugins/dummy/dummybackend.h index 47776a1..9fa5be7 100644 --- a/src/plugins/dummy/dummybackend.h +++ b/src/plugins/dummy/dummybackend.h @@ -42,7 +42,7 @@ private: DummyBackend(QObject* parent, const QList& args); public: - virtual void initFSSupport(); + virtual void initFSSupport() override; virtual QList scanDevices(bool excludeReadOnly = false) override; virtual CoreBackendDevice* openDevice(const QString& device_node) override; diff --git a/src/plugins/dummy/dummydevice.h b/src/plugins/dummy/dummydevice.h index f374a07..51a3d38 100644 --- a/src/plugins/dummy/dummydevice.h +++ b/src/plugins/dummy/dummydevice.h @@ -37,16 +37,16 @@ public: ~DummyDevice(); public: - virtual bool open(); - virtual bool openExclusive(); - virtual bool close(); + virtual bool open() override; + virtual bool openExclusive() override; + virtual bool close() override; - virtual CoreBackendPartitionTable* openPartitionTable(); + virtual CoreBackendPartitionTable* openPartitionTable() override; - virtual bool createPartitionTable(Report& report, const PartitionTable& ptable); + virtual bool createPartitionTable(Report& report, const PartitionTable& ptable) override; - virtual bool readSectors(void* buffer, qint64 offset, qint64 numSectors); - virtual bool writeSectors(void* buffer, qint64 offset, qint64 numSectors); + virtual bool readSectors(void* buffer, qint64 offset, qint64 numSectors) override; + virtual bool writeSectors(void* buffer, qint64 offset, qint64 numSectors) override; }; #endif diff --git a/src/plugins/dummy/dummypartition.h b/src/plugins/dummy/dummypartition.h index f8d0f50..4cbbb06 100644 --- a/src/plugins/dummy/dummypartition.h +++ b/src/plugins/dummy/dummypartition.h @@ -33,7 +33,7 @@ public: DummyPartition(); public: - virtual bool setFlag(Report& report, PartitionTable::Flag flag, bool state); + virtual bool setFlag(Report& report, PartitionTable::Flag flag, bool state) override; }; diff --git a/src/plugins/dummy/dummypartitiontable.h b/src/plugins/dummy/dummypartitiontable.h index 90a1179..7cb4a1e 100644 --- a/src/plugins/dummy/dummypartitiontable.h +++ b/src/plugins/dummy/dummypartitiontable.h @@ -36,20 +36,20 @@ public: ~DummyPartitionTable(); public: - virtual bool open(); + virtual bool open() override; - virtual bool commit(quint32 timeout = 10); + virtual bool commit(quint32 timeout = 10) override; - virtual CoreBackendPartition* getExtendedPartition(); - virtual CoreBackendPartition* getPartitionBySector(qint64 sector); + virtual CoreBackendPartition* getExtendedPartition() override; + virtual CoreBackendPartition* getPartitionBySector(qint64 sector) override; - virtual QString createPartition(Report& report, const Partition& partition); - virtual bool deletePartition(Report& report, const Partition& partition); - virtual bool updateGeometry(Report& report, const Partition& partition, qint64 sector_start, qint64 sector_end); - virtual bool clobberFileSystem(Report& report, const Partition& partition); - virtual bool resizeFileSystem(Report& report, const Partition& partition, qint64 newLength); - virtual FileSystem::Type detectFileSystemBySector(Report& report, const Device& device, qint64 sector); - virtual bool setPartitionSystemType(Report& report, const Partition& partition); + virtual QString createPartition(Report& report, const Partition& partition) override; + virtual bool deletePartition(Report& report, const Partition& partition) override; + virtual bool updateGeometry(Report& report, const Partition& partition, qint64 sector_start, qint64 sector_end) override; + virtual bool clobberFileSystem(Report& report, const Partition& partition) override; + virtual bool resizeFileSystem(Report& report, const Partition& partition, qint64 newLength) override; + virtual FileSystem::Type detectFileSystemBySector(Report& report, const Device& device, qint64 sector) override; + virtual bool setPartitionSystemType(Report& report, const Partition& partition) override; }; #endif diff --git a/src/plugins/libparted/libpartedbackend.h b/src/plugins/libparted/libpartedbackend.h index 2131e5c..976263e 100644 --- a/src/plugins/libparted/libpartedbackend.h +++ b/src/plugins/libparted/libpartedbackend.h @@ -59,7 +59,7 @@ private: LibPartedBackend(QObject* parent, const QList& args); public: - virtual void initFSSupport(); + virtual void initFSSupport() override; virtual CoreBackendDevice* openDevice(const QString& device_node) override; virtual CoreBackendDevice* openDeviceExclusive(const QString& device_node) override; diff --git a/src/plugins/libparted/libparteddevice.h b/src/plugins/libparted/libparteddevice.h index 2a5a10d..2a36315 100644 --- a/src/plugins/libparted/libparteddevice.h +++ b/src/plugins/libparted/libparteddevice.h @@ -39,16 +39,16 @@ public: ~LibPartedDevice(); public: - virtual bool open(); - virtual bool openExclusive(); - virtual bool close(); + virtual bool open() override; + virtual bool openExclusive() override; + virtual bool close() override; - virtual CoreBackendPartitionTable* openPartitionTable(); + virtual CoreBackendPartitionTable* openPartitionTable() override; - virtual bool createPartitionTable(Report& report, const PartitionTable& ptable); + virtual bool createPartitionTable(Report& report, const PartitionTable& ptable) override; - virtual bool readSectors(void* buffer, qint64 offset, qint64 numSectors); - virtual bool writeSectors(void* buffer, qint64 offset, qint64 numSectors); + virtual bool readSectors(void* buffer, qint64 offset, qint64 numSectors) override; + virtual bool writeSectors(void* buffer, qint64 offset, qint64 numSectors) override; protected: PedDevice* pedDevice() { diff --git a/src/plugins/libparted/libpartedpartition.h b/src/plugins/libparted/libpartedpartition.h index f626f39..4bfed4a 100644 --- a/src/plugins/libparted/libpartedpartition.h +++ b/src/plugins/libparted/libpartedpartition.h @@ -35,7 +35,7 @@ public: LibPartedPartition(PedPartition* ped_partition); public: - virtual bool setFlag(Report& report, PartitionTable::Flag flag, bool state); + virtual bool setFlag(Report& report, PartitionTable::Flag flag, bool state) override; private: PedPartition* pedPartition() { diff --git a/src/plugins/libparted/libpartedpartitiontable.h b/src/plugins/libparted/libpartedpartitiontable.h index c41e45e..c2ad610 100644 --- a/src/plugins/libparted/libpartedpartitiontable.h +++ b/src/plugins/libparted/libpartedpartitiontable.h @@ -38,21 +38,21 @@ public: ~LibPartedPartitionTable(); public: - virtual bool open(); + virtual bool open() override; - virtual bool commit(quint32 timeout = 10); + virtual bool commit(quint32 timeout = 10) override; static bool commit(PedDisk* pd, quint32 timeout = 10); - virtual CoreBackendPartition* getExtendedPartition(); - virtual CoreBackendPartition* getPartitionBySector(qint64 sector); + virtual CoreBackendPartition* getExtendedPartition() override; + virtual CoreBackendPartition* getPartitionBySector(qint64 sector) override; - virtual QString createPartition(Report& report, const Partition& partition); - virtual bool deletePartition(Report& report, const Partition& partition); - virtual bool updateGeometry(Report& report, const Partition& partition, qint64 sector_start, qint64 sector_end); - virtual bool clobberFileSystem(Report& report, const Partition& partition); - virtual bool resizeFileSystem(Report& report, const Partition& partition, qint64 newLength); - virtual FileSystem::Type detectFileSystemBySector(Report& report, const Device& device, qint64 sector); - virtual bool setPartitionSystemType(Report& report, const Partition& partition); + virtual QString createPartition(Report& report, const Partition& partition) override; + virtual bool deletePartition(Report& report, const Partition& partition) override; + virtual bool updateGeometry(Report& report, const Partition& partition, qint64 sector_start, qint64 sector_end) override; + virtual bool clobberFileSystem(Report& report, const Partition& partition) override; + virtual bool resizeFileSystem(Report& report, const Partition& partition, qint64 newLength) override; + virtual FileSystem::Type detectFileSystemBySector(Report& report, const Device& device, qint64 sector) override; + virtual bool setPartitionSystemType(Report& report, const Partition& partition) override; private: PedDevice* pedDevice() {