diff --git a/src/core/copysourcedevice.h b/src/core/copysourcedevice.h
index 02580f5..b05835a 100644
--- a/src/core/copysourcedevice.h
+++ b/src/core/copysourcedevice.h
@@ -43,16 +43,16 @@ public:
     ~CopySourceDevice();
 
 public:
-    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;
+    bool open() override;
+    qint32 sectorSize() const override;
+    bool readSectors(void* buffer, qint64 readOffset, qint64 numSectors) override;
+    qint64 length() const override;
+    bool overlaps(const CopyTarget& target) const override;
 
-    virtual qint64 firstSector() const override {
+    qint64 firstSector() const override {
         return m_FirstSector;    /**< @return first sector to copying */
     }
-    virtual qint64 lastSector() const override {
+    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 99250c3..8908b88 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() override;
-    virtual bool readSectors(void* buffer, qint64 readOffset, qint64 numSectors) override;
-    virtual qint64 length() const override;
+    bool open() override;
+    bool readSectors(void* buffer, qint64 readOffset, qint64 numSectors) override;
+    qint64 length() const override;
 
-    virtual qint32 sectorSize() const override {
+    qint32 sectorSize() const override {
         return m_SectorSize;    /**< @return the file's sector size */
     }
-    virtual bool overlaps(const CopyTarget&) const override {
+    bool overlaps(const CopyTarget&) const override {
         return false;    /**< @return false for file */
     }
-    virtual qint64 firstSector() const override {
+    qint64 firstSector() const override {
         return 0;    /**< @return 0 for file */
     }
-    virtual qint64 lastSector() const override {
+    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 d524448..485bf6f 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() override;
-    virtual bool readSectors(void* buffer, qint64 readOffset, qint64 numSectors) override;
-    virtual qint64 length() const override;
+    bool open() override;
+    bool readSectors(void* buffer, qint64 readOffset, qint64 numSectors) override;
+    qint64 length() const override;
 
-    virtual qint32 sectorSize() const override {
+    qint32 sectorSize() const override {
         return m_SectorSize;    /**< @return the file's sector size */
     }
-    virtual bool overlaps(const CopyTarget&) const override {
+    bool overlaps(const CopyTarget&) const override {
         return false;    /**< @return false for shred source */
     }
-    virtual qint64 firstSector() const override {
+    qint64 firstSector() const override {
         return 0;    /**< @return 0 for shred source */
     }
-    virtual qint64 lastSector() const override {
+    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 1a583f9..88ba492 100644
--- a/src/core/copytargetdevice.h
+++ b/src/core/copytargetdevice.h
@@ -45,13 +45,13 @@ public:
     ~CopyTargetDevice();
 
 public:
-    virtual bool open() override;
-    virtual qint32 sectorSize() const override;
-    virtual bool writeSectors(void* buffer, qint64 writeOffset, qint64 numSectors) override;
-    virtual qint64 firstSector() const override {
+    bool open() override;
+    qint32 sectorSize() const override;
+    bool writeSectors(void* buffer, qint64 writeOffset, qint64 numSectors) override;
+    qint64 firstSector() const override {
         return m_FirstSector;    /**< @return the first sector to write to */
     }
-    virtual qint64 lastSector() const override {
+    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 f12e585..c4fb06b 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() override;
-    virtual bool writeSectors(void* buffer, qint64 writeOffset, qint64 numSectors) override;
+    bool open() override;
+    bool writeSectors(void* buffer, qint64 writeOffset, qint64 numSectors) override;
 
-    virtual qint32 sectorSize() const override {
+    qint32 sectorSize() const override {
         return m_SectorSize;    /**< @return the file's sector size */
     }
-    virtual qint64 firstSector() const override {
+    qint64 firstSector() const override {
         return 0;    /**< @return always 0 for a file */
     }
-    virtual qint64 lastSector() const override {
+    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 78400a7..741c406 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() override;
+    void run() override;
     OperationStack& operationStack() {
         return m_OperationStack;
     }
diff --git a/src/fs/btrfs.h b/src/fs/btrfs.h
index ea3223c..6d2c30d 100644
--- a/src/fs/btrfs.h
+++ b/src/fs/btrfs.h
@@ -41,57 +41,57 @@ public:
     btrfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-    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;
+    qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
+    bool updateUUID(Report& report, const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-    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;
+    qint64 minCapacity() const override;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/exfat.h b/src/fs/exfat.h
index 5448114..f81dd28 100644
--- a/src/fs/exfat.h
+++ b/src/fs/exfat.h
@@ -40,57 +40,57 @@ public:
     exfat(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-//          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;
+//          qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+//          bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
+    bool updateUUID(Report& report, const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-//          virtual qint64 minCapacity() const;
-    virtual qint64 maxCapacity() const override;
-    virtual qint64 maxLabelLength() const override;
-    virtual SupportTool supportToolName() const override;
-    virtual bool supportToolFound() const override;
+//          qint64 minCapacity() const;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/ext2.h b/src/fs/ext2.h
index 15cb7d1..9405d76 100644
--- a/src/fs/ext2.h
+++ b/src/fs/ext2.h
@@ -40,56 +40,56 @@ public:
     ext2(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label, FileSystem::Type t = FileSystem::Ext2);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-    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;
+    qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
+    bool updateUUID(Report& report, const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-    virtual qint64 maxCapacity() const override;
-    virtual qint64 maxLabelLength() const override;
-    virtual SupportTool supportToolName() const override;
-    virtual bool supportToolFound() const override;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/ext3.h b/src/fs/ext3.h
index 44b7580..eef3695 100644
--- a/src/fs/ext3.h
+++ b/src/fs/ext3.h
@@ -43,8 +43,8 @@ public:
     ext3(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual bool create(Report& report, const QString& deviceNode) const override;
-    virtual qint64 maxCapacity() const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    qint64 maxCapacity() const override;
 };
 }
 
diff --git a/src/fs/ext4.h b/src/fs/ext4.h
index 29d03e2..afa2f0f 100644
--- a/src/fs/ext4.h
+++ b/src/fs/ext4.h
@@ -43,8 +43,8 @@ public:
     ext4(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual bool create(Report& report, const QString& deviceNode) const override;
-    virtual qint64 maxCapacity() const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    qint64 maxCapacity() const override;
 };
 }
 
diff --git a/src/fs/extended.h b/src/fs/extended.h
index ace9a1e..4ba4d0d 100644
--- a/src/fs/extended.h
+++ b/src/fs/extended.h
@@ -44,22 +44,22 @@ public:
 
 public:
 
-    virtual bool create(Report&, const QString&) const  override;
+    bool create(Report&, const QString&) const  override;
 
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
 
-    virtual bool supportToolFound() const override {
+    bool supportToolFound() const override {
         return true;
     }
 
diff --git a/src/fs/f2fs.h b/src/fs/f2fs.h
index 420d777..2b84f66 100644
--- a/src/fs/f2fs.h
+++ b/src/fs/f2fs.h
@@ -40,58 +40,58 @@ public:
     f2fs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-//          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;
+//          qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+//     qint64 readUsedCapacity(const QString& deviceNode) const override;
+//     bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+//     bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
+//     bool updateUUID(Report& report, const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-    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;
+    qint64 minCapacity() const override;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/fat16.h b/src/fs/fat16.h
index 6930abe..d29a5e3 100644
--- a/src/fs/fat16.h
+++ b/src/fs/fat16.h
@@ -40,56 +40,56 @@ public:
     fat16(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label, FileSystem::Type t = FileSystem::Fat16);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-    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;
+    qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    bool updateUUID(Report& report, const QString& deviceNode) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-    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;
+    qint64 minCapacity() const override;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/fat32.h b/src/fs/fat32.h
index 6b0ec57..2639826 100644
--- a/src/fs/fat32.h
+++ b/src/fs/fat32.h
@@ -43,11 +43,11 @@ public:
     fat32(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual bool create(Report& report, const QString& deviceNode) const override;
-    virtual bool updateUUID(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    bool updateUUID(Report& report, const QString& deviceNode) const override;
 
-    virtual qint64 minCapacity() const override;
-    virtual qint64 maxCapacity() const override;
+    qint64 minCapacity() const override;
+    qint64 maxCapacity() const override;
 };
 }
 
diff --git a/src/fs/hfs.h b/src/fs/hfs.h
index d0d1bf0..4dcc6be 100644
--- a/src/fs/hfs.h
+++ b/src/fs/hfs.h
@@ -40,40 +40,40 @@ public:
     hfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-    virtual bool check(Report& report, const QString& deviceNode) const override;
-    virtual bool create(Report& report, const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
 
-    virtual qint64 maxCapacity() const override;
-    virtual qint64 maxLabelLength() const override;
-    virtual SupportTool supportToolName() const override;
-    virtual bool supportToolFound() const override;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/hfsplus.h b/src/fs/hfsplus.h
index a36fcce..189e664 100644
--- a/src/fs/hfsplus.h
+++ b/src/fs/hfsplus.h
@@ -40,33 +40,33 @@ public:
     hfsplus(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-    virtual bool check(Report& report, const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
 
-    virtual qint64 maxCapacity() const override;
-    virtual qint64 maxLabelLength() const override;
-    virtual SupportTool supportToolName() const override;
-    virtual bool supportToolFound() const override;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/hpfs.h b/src/fs/hpfs.h
index 8c2ce6e..c357f20 100644
--- a/src/fs/hpfs.h
+++ b/src/fs/hpfs.h
@@ -40,45 +40,45 @@ public:
     hpfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-    virtual qint64 maxCapacity() const override;
-    virtual bool supportToolFound() const override {
+    qint64 maxCapacity() const override;
+    bool supportToolFound() const override {
         return true;
     }
 
diff --git a/src/fs/jfs.h b/src/fs/jfs.h
index 33eaa3b..054c4a2 100644
--- a/src/fs/jfs.h
+++ b/src/fs/jfs.h
@@ -40,47 +40,47 @@ public:
     jfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-    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;
+    qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
 
-    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;
+    qint64 minCapacity() const override;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/linuxswap.h b/src/fs/linuxswap.h
index e216531..7da7da1 100644
--- a/src/fs/linuxswap.h
+++ b/src/fs/linuxswap.h
@@ -40,52 +40,52 @@ public:
     linuxswap(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() 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 copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const override;
-    virtual bool updateUUID(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
+    bool copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const override;
+    bool updateUUID(Report& report, const QString& deviceNode) const override;
 
-    virtual bool canMount(const QString& deviceNode, const QString& mountPoint) const override;
-    virtual bool mount(Report& report, const QString& deviceNode, const QString& mountPoint) override;
-    virtual bool unmount(Report& report, const QString& deviceNode) override;
+    bool canMount(const QString& deviceNode, const QString& mountPoint) const override;
+    bool mount(Report& report, const QString& deviceNode, const QString& mountPoint) override;
+    bool unmount(Report& report, const QString& deviceNode) override;
 
-    virtual QString mountTitle() const override;
-    virtual QString unmountTitle() const override;
+    QString mountTitle() const override;
+    QString unmountTitle() const override;
 
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-    virtual qint64 maxLabelLength() const override;
-    virtual SupportTool supportToolName() const override;
-    virtual bool supportToolFound() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_Create;
diff --git a/src/fs/luks.h b/src/fs/luks.h
index 9c80f54..cbba23f 100644
--- a/src/fs/luks.h
+++ b/src/fs/luks.h
@@ -45,54 +45,54 @@ public:
 
 public:
     void init() override;
-    virtual qint64 readUsedCapacity(const QString& deviceNode) const override;
+    qint64 readUsedCapacity(const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         if (!m_isCryptOpen)
             return cmdSupportNone;
         if (m_Grow && m_innerFs)
             return m_innerFs->supportGrow();
         return cmdSupportNone;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         if (!m_isCryptOpen)
             return cmdSupportNone;
         if (m_Shrink && m_innerFs)
             return m_innerFs->supportShrink();
         return cmdSupportNone;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         if (!m_isCryptOpen)
             return cmdSupportNone;
         if (m_Check && m_innerFs)
             return m_innerFs->supportCheck();
         return cmdSupportNone;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
@@ -100,26 +100,26 @@ public:
         m_logicalSectorSize = logicalSectorSize;
     }
 
-    virtual bool check(Report& report, const QString& deviceNode) const override;
-    virtual bool create(Report &report, const QString &deviceNode) 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;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report &report, const QString &deviceNode) const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
+    QString readUUID(const QString& deviceNode) const override;
+    bool updateUUID(Report& report, const QString& deviceNode) const override;
+    bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+    QString readLabel(const QString& deviceNode) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
 
-    virtual QString mountTitle() const override;
-    virtual QString unmountTitle() const override;
+    QString mountTitle() const override;
+    QString unmountTitle() const override;
     QString cryptOpenTitle() const;
     QString cryptCloseTitle() const;
 
     void setPassphrase(const QString&);
     QString passphrase() const;
 
-    virtual bool canMount(const QString&, const QString&) const override;
-    virtual bool canUnmount(const QString&) const override;
+    bool canMount(const QString&, const QString&) const override;
+    bool canUnmount(const QString&) const override;
     bool isMounted() const;
     void setMounted(bool mounted);
 
@@ -134,10 +134,10 @@ public:
     void loadInnerFileSystem(const QString& mapperNode);
     void createInnerFileSystem(Type type);
 
-    virtual bool mount(Report& report, const QString& deviceNode, const QString& mountPoint) override;
-    virtual bool unmount(Report& report, const QString& deviceNode) override;
+    bool mount(Report& report, const QString& deviceNode, const QString& mountPoint) override;
+    bool unmount(Report& report, const QString& deviceNode) override;
 
-    virtual FileSystem::Type type() const override;
+    FileSystem::Type type() const override;
 
     QString suggestedMapperName(const QString& deviceNode) const;
 
diff --git a/src/fs/lvm2_pv.h b/src/fs/lvm2_pv.h
index b7f40b8..398fce5 100644
--- a/src/fs/lvm2_pv.h
+++ b/src/fs/lvm2_pv.h
@@ -41,56 +41,56 @@ public:
     lvm2_pv(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-//          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;
+//          qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    bool remove(Report& report, const QString& deviceNode) const override;
+//          bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+//          bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
+    bool updateUUID(Report& report, const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-    virtual qint64 maxCapacity() const override;
-    virtual SupportTool supportToolName() const override;
-    virtual bool supportToolFound() const override;
+    qint64 maxCapacity() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/nilfs2.h b/src/fs/nilfs2.h
index d421aa9..77a1d0d 100644
--- a/src/fs/nilfs2.h
+++ b/src/fs/nilfs2.h
@@ -41,58 +41,58 @@ public:
     nilfs2(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-//          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;
+//          qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
+    bool updateUUID(Report& report, const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-    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;
+    qint64 minCapacity() const override;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/ntfs.h b/src/fs/ntfs.h
index 812c91b..20668be 100644
--- a/src/fs/ntfs.h
+++ b/src/fs/ntfs.h
@@ -40,59 +40,59 @@ public:
     ntfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-    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;
+    qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    bool copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const override;
+    bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
+    bool updateUUID(Report& report, const QString& deviceNode) const override;
+    bool updateBootSector(Report& report, const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-    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;
+    qint64 minCapacity() const override;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/ocfs2.h b/src/fs/ocfs2.h
index b14df8f..5a498db 100644
--- a/src/fs/ocfs2.h
+++ b/src/fs/ocfs2.h
@@ -40,56 +40,56 @@ public:
     ocfs2(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-    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;
+    qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
+    bool updateUUID(Report& report, const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-    virtual qint64 minCapacity() const override;
-    virtual qint64 maxCapacity() const override;
-    virtual SupportTool supportToolName() const override;
-    virtual bool supportToolFound() const override;
+    qint64 minCapacity() const override;
+    qint64 maxCapacity() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/reiser4.h b/src/fs/reiser4.h
index 6de5511..67ba365 100644
--- a/src/fs/reiser4.h
+++ b/src/fs/reiser4.h
@@ -40,38 +40,38 @@ public:
     reiser4(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-    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;
+    qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
 
-    virtual qint64 maxCapacity() const override;
-    virtual qint64 maxLabelLength() const override;
-    virtual SupportTool supportToolName() const override;
-    virtual bool supportToolFound() const override;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/reiserfs.h b/src/fs/reiserfs.h
index 58d1d11..e67fc06 100644
--- a/src/fs/reiserfs.h
+++ b/src/fs/reiserfs.h
@@ -42,57 +42,57 @@ public:
     reiserfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-    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;
+    qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
+    bool updateUUID(Report& report, const QString& deviceNode) const override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-    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;
+    qint64 minCapacity() const override;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/ufs.h b/src/fs/ufs.h
index af454af..e73073e 100644
--- a/src/fs/ufs.h
+++ b/src/fs/ufs.h
@@ -38,17 +38,17 @@ public:
     ufs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
 
-    virtual bool supportToolFound() const override {
+    bool supportToolFound() const override {
         return true;
     }
 
diff --git a/src/fs/unformatted.h b/src/fs/unformatted.h
index 061e3da..98931da 100644
--- a/src/fs/unformatted.h
+++ b/src/fs/unformatted.h
@@ -40,13 +40,13 @@ public:
     unformatted(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual bool create(Report&, const QString&) const override;
+    bool create(Report&, const QString&) const override;
 
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
 
-    virtual bool supportToolFound() const override {
+    bool supportToolFound() const override {
         return true;
     }
 
diff --git a/src/fs/unknown.h b/src/fs/unknown.h
index 3b3ede5..743ae92 100644
--- a/src/fs/unknown.h
+++ b/src/fs/unknown.h
@@ -36,7 +36,7 @@ public:
     unknown(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual bool supportToolFound() const override {
+    bool supportToolFound() const override {
         return true;
     }
 };
diff --git a/src/fs/xfs.h b/src/fs/xfs.h
index 94fd5b9..4648d2e 100644
--- a/src/fs/xfs.h
+++ b/src/fs/xfs.h
@@ -40,48 +40,48 @@ public:
     xfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-    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;
+    qint64 readUsedCapacity(const QString& deviceNode) const override;
+    bool check(Report& report, const QString& deviceNode) const override;
+    bool create(Report& report, const QString& deviceNode) const override;
+    bool copy(Report& report, const QString&, const QString&) const override;
+    bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
 
-    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;
+    qint64 minCapacity() const override;
+    qint64 maxCapacity() const override;
+    qint64 maxLabelLength() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/fs/zfs.h b/src/fs/zfs.h
index e812d8c..73e443e 100644
--- a/src/fs/zfs.h
+++ b/src/fs/zfs.h
@@ -41,52 +41,52 @@ public:
     zfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
 
 public:
-    virtual void init() override;
+    void init() override;
 
-    virtual bool remove(Report& report, const QString& deviceNode) const override;
-    virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
+    bool remove(Report& report, const QString& deviceNode) const override;
+    bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
 
-    virtual CommandSupportType supportGetUsed() const override {
+    CommandSupportType supportGetUsed() const override {
         return m_GetUsed;
     }
-    virtual CommandSupportType supportGetLabel() const override {
+    CommandSupportType supportGetLabel() const override {
         return m_GetLabel;
     }
-    virtual CommandSupportType supportCreate() const override {
+    CommandSupportType supportCreate() const override {
         return m_Create;
     }
-    virtual CommandSupportType supportGrow() const override {
+    CommandSupportType supportGrow() const override {
         return m_Grow;
     }
-    virtual CommandSupportType supportShrink() const override {
+    CommandSupportType supportShrink() const override {
         return m_Shrink;
     }
-    virtual CommandSupportType supportMove() const override {
+    CommandSupportType supportMove() const override {
         return m_Move;
     }
-    virtual CommandSupportType supportCheck() const override {
+    CommandSupportType supportCheck() const override {
         return m_Check;
     }
-    virtual CommandSupportType supportCopy() const override {
+    CommandSupportType supportCopy() const override {
         return m_Copy;
     }
-    virtual CommandSupportType supportBackup() const override {
+    CommandSupportType supportBackup() const override {
         return m_Backup;
     }
-    virtual CommandSupportType supportSetLabel() const override {
+    CommandSupportType supportSetLabel() const override {
         return m_SetLabel;
     }
-    virtual CommandSupportType supportUpdateUUID() const override {
+    CommandSupportType supportUpdateUUID() const override {
         return m_UpdateUUID;
     }
-    virtual CommandSupportType supportGetUUID() const override {
+    CommandSupportType supportGetUUID() const override {
         return m_GetUUID;
     }
 
-    virtual qint64 minCapacity() const override;
-    virtual qint64 maxCapacity() const override;
-    virtual SupportTool supportToolName() const override;
-    virtual bool supportToolFound() const override;
+    qint64 minCapacity() const override;
+    qint64 maxCapacity() const override;
+    SupportTool supportToolName() const override;
+    bool supportToolFound() const override;
 
 public:
     static CommandSupportType m_GetUsed;
diff --git a/src/jobs/backupfilesystemjob.h b/src/jobs/backupfilesystemjob.h
index 3ab4e18..4285065 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) override;
-    virtual qint32 numSteps() const override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    qint32 numSteps() const override;
+    QString description() const override;
 
 protected:
     Partition& sourcePartition() {
diff --git a/src/jobs/checkfilesystemjob.h b/src/jobs/checkfilesystemjob.h
index 2f82282..ad40693 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) override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    QString description() const override;
 
 protected:
     Partition& partition() {
diff --git a/src/jobs/copyfilesystemjob.h b/src/jobs/copyfilesystemjob.h
index 18ecfd8..f67f5e8 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) override;
-    virtual qint32 numSteps() const override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    qint32 numSteps() const override;
+    QString description() const override;
 
 protected:
     Partition& targetPartition() {
diff --git a/src/jobs/createfilesystemjob.h b/src/jobs/createfilesystemjob.h
index b8573bb..4303602 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) override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    QString description() const override;
 
 protected:
     Partition& partition() {
diff --git a/src/jobs/createpartitionjob.h b/src/jobs/createpartitionjob.h
index 077a0bf..7d81ed9 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) override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    QString description() const override;
 
 protected:
     Partition& partition() {
diff --git a/src/jobs/createpartitiontablejob.h b/src/jobs/createpartitiontablejob.h
index 67e1857..462b3ec 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) override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    QString description() const override;
 
 protected:
     Device& device() {
diff --git a/src/jobs/deletefilesystemjob.h b/src/jobs/deletefilesystemjob.h
index db305a4..41e3afe 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) override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    QString description() const override;
 
 protected:
     Partition& partition() {
diff --git a/src/jobs/deletepartitionjob.h b/src/jobs/deletepartitionjob.h
index fa55ce4..754c234 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) override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    QString description() const override;
 
 protected:
     Partition& partition() {
diff --git a/src/jobs/movefilesystemjob.h b/src/jobs/movefilesystemjob.h
index 44b4b44..6eb6ac5 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) override;
-    virtual qint32 numSteps() const override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    qint32 numSteps() const override;
+    QString description() const override;
 
 protected:
     Partition& partition() {
diff --git a/src/jobs/resizefilesystemjob.h b/src/jobs/resizefilesystemjob.h
index 56d6865..1afd628 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) override;
-    virtual qint32 numSteps() const override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    qint32 numSteps() const override;
+    QString description() const override;
 
 protected:
     bool resizeFileSystemBackend(Report& report);
diff --git a/src/jobs/restorefilesystemjob.h b/src/jobs/restorefilesystemjob.h
index fecca52..f004a44 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) override;
-    virtual qint32 numSteps() const override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    qint32 numSteps() const override;
+    QString description() const override;
 
 protected:
     Partition& targetPartition() {
diff --git a/src/jobs/setfilesystemlabeljob.h b/src/jobs/setfilesystemlabeljob.h
index 49573a4..008f8f5 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) override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    QString description() const override;
 
 protected:
     Partition& partition() {
diff --git a/src/jobs/setpartflagsjob.h b/src/jobs/setpartflagsjob.h
index 51ca4a4..0106313 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) override;
-    virtual qint32 numSteps() const override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    qint32 numSteps() const override;
+    QString description() const override;
 
 protected:
     Device& device() {
diff --git a/src/jobs/setpartgeometryjob.h b/src/jobs/setpartgeometryjob.h
index d413083..05d30b7 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) override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    QString description() const override;
 
 protected:
     Partition& partition() {
diff --git a/src/jobs/shredfilesystemjob.h b/src/jobs/shredfilesystemjob.h
index 785a416..c28c792 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) override;
-    virtual qint32 numSteps() const override;
-    virtual QString description() const override;
+    bool run(Report& parent) override;
+    qint32 numSteps() const override;
+    QString description() const override;
 
 protected:
     Partition& partition() {
diff --git a/src/ops/backupoperation.h b/src/ops/backupoperation.h
index 73dc0d2..1e6fd4d 100644
--- a/src/ops/backupoperation.h
+++ b/src/ops/backupoperation.h
@@ -49,10 +49,10 @@ public:
     void preview() override {}
     void undo() override {}
 
-    virtual bool targets(const Device&) const override {
+    bool targets(const Device&) const override {
         return false;
     }
-    virtual bool targets(const Partition&) const override{
+    bool targets(const Partition&) const override{
         return false;
     }
 
diff --git a/src/ops/checkoperation.h b/src/ops/checkoperation.h
index 747b3a8..4a3117e 100644
--- a/src/ops/checkoperation.h
+++ b/src/ops/checkoperation.h
@@ -52,8 +52,8 @@ public:
     void preview() override {}
     void undo() override {}
 
-    virtual bool targets(const Device& d) const override;
-    virtual bool targets(const Partition& p) const override;
+    bool targets(const Device& d) const override;
+    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 05b01a8..db9f842 100644
--- a/src/ops/copyoperation.h
+++ b/src/ops/copyoperation.h
@@ -66,8 +66,8 @@ public:
     void preview() override;
     void undo() override;
 
-    virtual bool targets(const Device& d) const override;
-    virtual bool targets(const Partition& p) const override;
+    bool targets(const Device& d) const override;
+    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 a7bb43e..4fbbc7d 100644
--- a/src/ops/createfilesystemoperation.h
+++ b/src/ops/createfilesystemoperation.h
@@ -61,8 +61,8 @@ public:
     void undo() override;
     bool execute(Report& parent) override;
 
-    virtual bool targets(const Device& d) const override;
-    virtual bool targets(const Partition& p) const override;
+    bool targets(const Device& d) const override;
+    bool targets(const Partition& p) const override;
 
 protected:
     Device& targetDevice() {
diff --git a/src/ops/createpartitiontableoperation.h b/src/ops/createpartitiontableoperation.h
index 74d57cf..56f1a94 100644
--- a/src/ops/createpartitiontableoperation.h
+++ b/src/ops/createpartitiontableoperation.h
@@ -57,8 +57,8 @@ public:
     void undo() override;
     bool execute(Report& parent) override;
 
-    virtual bool targets(const Device& d) const override;
-    virtual bool targets(const Partition&) const  override{
+    bool targets(const Device& d) const override;
+    bool targets(const Partition&) const  override{
         return false;
     }
 
diff --git a/src/ops/deleteoperation.h b/src/ops/deleteoperation.h
index 40a2f6f..e36129d 100644
--- a/src/ops/deleteoperation.h
+++ b/src/ops/deleteoperation.h
@@ -66,8 +66,8 @@ public:
         return m_ShredAction;
     }
 
-    virtual bool targets(const Device& d) const override;
-    virtual bool targets(const Partition& p) const override;
+    bool targets(const Device& d) const override;
+    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 b098f2f..6db1207 100644
--- a/src/ops/newoperation.h
+++ b/src/ops/newoperation.h
@@ -60,8 +60,8 @@ public:
     void preview() override;
     void undo() override;
 
-    virtual bool targets(const Device& d) const override;
-    virtual bool targets(const Partition& p) const override;
+    bool targets(const Device& d) const override;
+    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 2971a95..77e29e8 100644
--- a/src/ops/resizeoperation.h
+++ b/src/ops/resizeoperation.h
@@ -83,8 +83,8 @@ public:
     void preview() override;
     void undo() override;
 
-    virtual bool targets(const Device& d) const override;
-    virtual bool targets(const Partition& p) const override;
+    bool targets(const Device& d) const override;
+    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 a578acb..ef45b22 100644
--- a/src/ops/restoreoperation.h
+++ b/src/ops/restoreoperation.h
@@ -65,8 +65,8 @@ public:
 
     void preview() override;
 
-    virtual bool targets(const Device& d) const override;
-    virtual bool targets(const Partition& p) const override;
+    bool targets(const Device& d) const override;
+    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 a6ac3d0..f03a032 100644
--- a/src/ops/setfilesystemlabeloperation.h
+++ b/src/ops/setfilesystemlabeloperation.h
@@ -55,8 +55,8 @@ public:
     void preview() override;
     void undo() override;
 
-    virtual bool targets(const Device& d) const override;
-    virtual bool targets(const Partition& p) const override;
+    bool targets(const Device& d) const override;
+    bool targets(const Partition& p) const override;
 
 protected:
     Partition& labeledPartition() {
diff --git a/src/ops/setpartflagsoperation.h b/src/ops/setpartflagsoperation.h
index bed9f30..db0387a 100644
--- a/src/ops/setpartflagsoperation.h
+++ b/src/ops/setpartflagsoperation.h
@@ -58,8 +58,8 @@ public:
     void preview() override;
     void undo() override;
 
-    virtual bool targets(const Device& d) const override;
-    virtual bool targets(const Partition& p) const override;
+    bool targets(const Device& d) const override;
+    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 9b374cc..3cd1520 100644
--- a/src/plugins/dummy/dummybackend.h
+++ b/src/plugins/dummy/dummybackend.h
@@ -42,14 +42,14 @@ private:
     DummyBackend(QObject* parent, const QList<QVariant>& args);
 
 public:
-    virtual void initFSSupport() override;
+    void initFSSupport() override;
 
-    virtual QList<Device*> scanDevices(bool excludeReadOnly = false) override;
-    virtual CoreBackendDevice* openDevice(const QString& device_node) override;
-    virtual CoreBackendDevice* openDeviceExclusive(const QString& device_node) override;
-    virtual bool closeDevice(CoreBackendDevice* core_device) override;
-    virtual Device* scanDevice(const QString& device_node) override;
-    virtual FileSystem::Type detectFileSystem(const QString& deviceNode) override;
+    QList<Device*> scanDevices(bool excludeReadOnly = false) override;
+    CoreBackendDevice* openDevice(const QString& device_node) override;
+    CoreBackendDevice* openDeviceExclusive(const QString& device_node) override;
+    bool closeDevice(CoreBackendDevice* core_device) override;
+    Device* scanDevice(const QString& device_node) override;
+    FileSystem::Type detectFileSystem(const QString& deviceNode) override;
 };
 
 #endif
diff --git a/src/plugins/dummy/dummydevice.h b/src/plugins/dummy/dummydevice.h
index 51a3d38..16cecae 100644
--- a/src/plugins/dummy/dummydevice.h
+++ b/src/plugins/dummy/dummydevice.h
@@ -37,16 +37,16 @@ public:
     ~DummyDevice();
 
 public:
-    virtual bool open() override;
-    virtual bool openExclusive() override;
-    virtual bool close() override;
+    bool open() override;
+    bool openExclusive() override;
+    bool close() override;
 
-    virtual CoreBackendPartitionTable* openPartitionTable() override;
+    CoreBackendPartitionTable* openPartitionTable() override;
 
-    virtual bool createPartitionTable(Report& report, const PartitionTable& ptable) override;
+    bool createPartitionTable(Report& report, const PartitionTable& ptable) override;
 
-    virtual bool readSectors(void* buffer, qint64 offset, qint64 numSectors) override;
-    virtual bool writeSectors(void* buffer, qint64 offset, qint64 numSectors) override;
+    bool readSectors(void* buffer, qint64 offset, qint64 numSectors) override;
+    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 4cbbb06..bbcbe2c 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) override;
+    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 7cb4a1e..b2d8772 100644
--- a/src/plugins/dummy/dummypartitiontable.h
+++ b/src/plugins/dummy/dummypartitiontable.h
@@ -36,20 +36,20 @@ public:
     ~DummyPartitionTable();
 
 public:
-    virtual bool open() override;
+    bool open() override;
 
-    virtual bool commit(quint32 timeout = 10) override;
+    bool commit(quint32 timeout = 10) override;
 
-    virtual CoreBackendPartition* getExtendedPartition() override;
-    virtual CoreBackendPartition* getPartitionBySector(qint64 sector) override;
+    CoreBackendPartition* getExtendedPartition() override;
+    CoreBackendPartition* getPartitionBySector(qint64 sector) override;
 
-    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;
+    QString createPartition(Report& report, const Partition& partition) override;
+    bool deletePartition(Report& report, const Partition& partition) override;
+    bool updateGeometry(Report& report, const Partition& partition, qint64 sector_start, qint64 sector_end) override;
+    bool clobberFileSystem(Report& report, const Partition& partition) override;
+    bool resizeFileSystem(Report& report, const Partition& partition, qint64 newLength) override;
+    FileSystem::Type detectFileSystemBySector(Report& report, const Device& device, qint64 sector) override;
+    bool setPartitionSystemType(Report& report, const Partition& partition) override;
 };
 
 #endif
diff --git a/src/plugins/libparted/libpartedbackend.h b/src/plugins/libparted/libpartedbackend.h
index 97a4da8..a3268b4 100644
--- a/src/plugins/libparted/libpartedbackend.h
+++ b/src/plugins/libparted/libpartedbackend.h
@@ -59,14 +59,14 @@ private:
     LibPartedBackend(QObject* parent, const QList<QVariant>& args);
 
 public:
-    virtual void initFSSupport() override;
+    void initFSSupport() override;
 
-    virtual CoreBackendDevice* openDevice(const QString& device_node) override;
-    virtual CoreBackendDevice* openDeviceExclusive(const QString& device_node) override;
-    virtual bool closeDevice(CoreBackendDevice* core_device) override;
-    virtual Device* scanDevice(const QString& device_node) override;
-    virtual QList<Device*> scanDevices(bool excludeReadOnly = false) override;
-    virtual FileSystem::Type detectFileSystem(const QString& partitionPath) override;
+    CoreBackendDevice* openDevice(const QString& device_node) override;
+    CoreBackendDevice* openDeviceExclusive(const QString& device_node) override;
+    bool closeDevice(CoreBackendDevice* core_device) override;
+    Device* scanDevice(const QString& device_node) override;
+    QList<Device*> scanDevices(bool excludeReadOnly = false) override;
+    FileSystem::Type detectFileSystem(const QString& partitionPath) override;
 
     static QString lastPartedExceptionMessage();
 
diff --git a/src/plugins/libparted/libparteddevice.h b/src/plugins/libparted/libparteddevice.h
index 2a36315..022fed5 100644
--- a/src/plugins/libparted/libparteddevice.h
+++ b/src/plugins/libparted/libparteddevice.h
@@ -39,16 +39,16 @@ public:
     ~LibPartedDevice();
 
 public:
-    virtual bool open() override;
-    virtual bool openExclusive() override;
-    virtual bool close() override;
+    bool open() override;
+    bool openExclusive() override;
+    bool close() override;
 
-    virtual CoreBackendPartitionTable* openPartitionTable() override;
+    CoreBackendPartitionTable* openPartitionTable() override;
 
-    virtual bool createPartitionTable(Report& report, const PartitionTable& ptable) override;
+    bool createPartitionTable(Report& report, const PartitionTable& ptable) override;
 
-    virtual bool readSectors(void* buffer, qint64 offset, qint64 numSectors) override;
-    virtual bool writeSectors(void* buffer, qint64 offset, qint64 numSectors) override;
+    bool readSectors(void* buffer, qint64 offset, qint64 numSectors) override;
+    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 4bfed4a..0aef94a 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) override;
+    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 c2ad610..f0aaa41 100644
--- a/src/plugins/libparted/libpartedpartitiontable.h
+++ b/src/plugins/libparted/libpartedpartitiontable.h
@@ -38,21 +38,21 @@ public:
     ~LibPartedPartitionTable();
 
 public:
-    virtual bool open() override;
+    bool open() override;
 
-    virtual bool commit(quint32 timeout = 10) override;
+    bool commit(quint32 timeout = 10) override;
     static bool commit(PedDisk* pd, quint32 timeout = 10);
 
-    virtual CoreBackendPartition* getExtendedPartition() override;
-    virtual CoreBackendPartition* getPartitionBySector(qint64 sector) override;
+    CoreBackendPartition* getExtendedPartition() override;
+    CoreBackendPartition* getPartitionBySector(qint64 sector) override;
 
-    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;
+    QString createPartition(Report& report, const Partition& partition) override;
+    bool deletePartition(Report& report, const Partition& partition) override;
+    bool updateGeometry(Report& report, const Partition& partition, qint64 sector_start, qint64 sector_end) override;
+    bool clobberFileSystem(Report& report, const Partition& partition) override;
+    bool resizeFileSystem(Report& report, const Partition& partition, qint64 newLength) override;
+    FileSystem::Type detectFileSystemBySector(Report& report, const Device& device, qint64 sector) override;
+    bool setPartitionSystemType(Report& report, const Partition& partition) override;
 
 private:
     PedDevice* pedDevice() {