diff --git a/src/fs/btrfs.h b/src/fs/btrfs.h index 93c6b18..ea3223c 100644 --- a/src/fs/btrfs.h +++ b/src/fs/btrfs.h @@ -41,7 +41,7 @@ public: btrfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/exfat.h b/src/fs/exfat.h index 70ae9b2..5448114 100644 --- a/src/fs/exfat.h +++ b/src/fs/exfat.h @@ -40,7 +40,7 @@ public: exfat(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; // virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/ext2.h b/src/fs/ext2.h index 6f2426a..15cb7d1 100644 --- a/src/fs/ext2.h +++ b/src/fs/ext2.h @@ -40,7 +40,7 @@ public: ext2(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label, FileSystem::Type t = FileSystem::Ext2); public: - static void init(); + virtual void init() override; virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/ext3.h b/src/fs/ext3.h index 3ebb02b..44b7580 100644 --- a/src/fs/ext3.h +++ b/src/fs/ext3.h @@ -43,7 +43,6 @@ public: ext3(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init() {} virtual bool create(Report& report, const QString& deviceNode) const override; virtual qint64 maxCapacity() const override; }; diff --git a/src/fs/ext4.h b/src/fs/ext4.h index 3e12809..29d03e2 100644 --- a/src/fs/ext4.h +++ b/src/fs/ext4.h @@ -43,7 +43,6 @@ public: ext4(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init() {} virtual bool create(Report& report, const QString& deviceNode) const override; virtual qint64 maxCapacity() const override; }; diff --git a/src/fs/extended.h b/src/fs/extended.h index 1a70340..ace9a1e 100644 --- a/src/fs/extended.h +++ b/src/fs/extended.h @@ -43,7 +43,6 @@ public: extended(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init() {} virtual bool create(Report&, const QString&) const override; diff --git a/src/fs/f2fs.h b/src/fs/f2fs.h index 8c2feb4..420d777 100644 --- a/src/fs/f2fs.h +++ b/src/fs/f2fs.h @@ -40,7 +40,7 @@ public: f2fs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; // virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/fat16.h b/src/fs/fat16.h index cc7fbc5..6930abe 100644 --- a/src/fs/fat16.h +++ b/src/fs/fat16.h @@ -40,7 +40,7 @@ public: fat16(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label, FileSystem::Type t = FileSystem::Fat16); public: - static void init(); + virtual void init() override; virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/fat32.h b/src/fs/fat32.h index aac7b12..6b0ec57 100644 --- a/src/fs/fat32.h +++ b/src/fs/fat32.h @@ -43,8 +43,6 @@ public: fat32(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init() {} - virtual bool create(Report& report, const QString& deviceNode) const override; virtual bool updateUUID(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/filesystem.h b/src/fs/filesystem.h index c46ac8e..70956ad 100644 --- a/src/fs/filesystem.h +++ b/src/fs/filesystem.h @@ -107,6 +107,7 @@ public: virtual ~FileSystem() {} public: + virtual void init() {}; virtual qint64 readUsedCapacity(const QString& deviceNode) const; virtual QString readLabel(const QString& deviceNode) const; virtual bool create(Report& report, const QString& deviceNode) const; diff --git a/src/fs/filesystemfactory.cpp b/src/fs/filesystemfactory.cpp index 5d538d6..53caace 100644 --- a/src/fs/filesystemfactory.cpp +++ b/src/fs/filesystemfactory.cpp @@ -84,32 +84,9 @@ void FileSystemFactory::init() m_FileSystems.insert(FileSystem::Xfs, new FS::xfs(-1, -1, -1, QString())); m_FileSystems.insert(FileSystem::Zfs, new FS::zfs(-1, -1, -1, QString())); - FS::btrfs::init(); - FS::exfat::init(); - FS::ext2::init(); - FS::ext3::init(); - FS::ext4::init(); - FS::extended::init(); - FS::f2fs::init(); - FS::fat16::init(); - FS::fat32::init(); - FS::hfs::init(); - FS::hfsplus::init(); - FS::hpfs::init(); - FS::jfs::init(); - FS::linuxswap::init(); -// FS::luks::init(); - FS::lvm2_pv::init(); - FS::nilfs2::init(); - FS::ntfs::init(); - FS::ocfs2::init(); - FS::reiserfs::init(); - FS::reiser4::init(); - FS::ufs::init(); - FS::unformatted::init(); - FS::unknown::init(); - FS::xfs::init(); - FS::zfs::init(); + foreach(FileSystem * fs, FileSystemFactory::map()) { + fs->init(); + } CoreBackendManager::self()->backend()->initFSSupport(); } diff --git a/src/fs/hfs.h b/src/fs/hfs.h index 35a9a7c..d0d1bf0 100644 --- a/src/fs/hfs.h +++ b/src/fs/hfs.h @@ -40,7 +40,7 @@ public: hfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; virtual bool check(Report& report, const QString& deviceNode) const override; virtual bool create(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/hfsplus.h b/src/fs/hfsplus.h index 3c23fd6..a36fcce 100644 --- a/src/fs/hfsplus.h +++ b/src/fs/hfsplus.h @@ -40,7 +40,7 @@ public: hfsplus(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/hpfs.cpp b/src/fs/hpfs.cpp index a42b9f2..cfb2386 100644 --- a/src/fs/hpfs.cpp +++ b/src/fs/hpfs.cpp @@ -41,10 +41,6 @@ hpfs::hpfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QStr { } -void hpfs::init() -{ -} - qint64 hpfs::maxCapacity() const { return 2 * Capacity::unitFactor(Capacity::Byte, Capacity::TiB); diff --git a/src/fs/hpfs.h b/src/fs/hpfs.h index 0ed004f..8c2ce6e 100644 --- a/src/fs/hpfs.h +++ b/src/fs/hpfs.h @@ -40,8 +40,6 @@ public: hpfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); - virtual CommandSupportType supportGetUsed() const override { return m_GetUsed; } diff --git a/src/fs/jfs.h b/src/fs/jfs.h index 024f1eb..33eaa3b 100644 --- a/src/fs/jfs.h +++ b/src/fs/jfs.h @@ -40,7 +40,7 @@ public: jfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/linuxswap.h b/src/fs/linuxswap.h index d5512dc..e216531 100644 --- a/src/fs/linuxswap.h +++ b/src/fs/linuxswap.h @@ -40,7 +40,7 @@ public: linuxswap(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual 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; diff --git a/src/fs/luks.h b/src/fs/luks.h index b98f397..24960b0 100644 --- a/src/fs/luks.h +++ b/src/fs/luks.h @@ -44,7 +44,7 @@ public: virtual ~luks(); public: - void init(); + virtual void init() override; virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual CommandSupportType supportGetUsed() const override { diff --git a/src/fs/lvm2_pv.h b/src/fs/lvm2_pv.h index 4dcba37..b7f40b8 100644 --- a/src/fs/lvm2_pv.h +++ b/src/fs/lvm2_pv.h @@ -41,7 +41,7 @@ public: lvm2_pv(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; // virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/nilfs2.h b/src/fs/nilfs2.h index 44eb6d1..d421aa9 100644 --- a/src/fs/nilfs2.h +++ b/src/fs/nilfs2.h @@ -41,7 +41,7 @@ public: nilfs2(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; // virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/ntfs.h b/src/fs/ntfs.h index b8089cb..812c91b 100644 --- a/src/fs/ntfs.h +++ b/src/fs/ntfs.h @@ -40,7 +40,7 @@ public: ntfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/ocfs2.h b/src/fs/ocfs2.h index a9817b3..b14df8f 100644 --- a/src/fs/ocfs2.h +++ b/src/fs/ocfs2.h @@ -40,7 +40,7 @@ public: ocfs2(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/reiser4.h b/src/fs/reiser4.h index 6d85351..6de5511 100644 --- a/src/fs/reiser4.h +++ b/src/fs/reiser4.h @@ -40,7 +40,7 @@ public: reiser4(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/reiserfs.h b/src/fs/reiserfs.h index f1edefe..58d1d11 100644 --- a/src/fs/reiserfs.h +++ b/src/fs/reiserfs.h @@ -42,7 +42,7 @@ public: reiserfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/ufs.h b/src/fs/ufs.h index dadee83..af454af 100644 --- a/src/fs/ufs.h +++ b/src/fs/ufs.h @@ -38,8 +38,6 @@ public: ufs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init() {} - virtual CommandSupportType supportMove() const override { return m_Move; } diff --git a/src/fs/unformatted.h b/src/fs/unformatted.h index 167e9b2..061e3da 100644 --- a/src/fs/unformatted.h +++ b/src/fs/unformatted.h @@ -40,8 +40,6 @@ public: unformatted(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init() {} - virtual bool create(Report&, const QString&) const override; virtual CommandSupportType supportCreate() const override { diff --git a/src/fs/unknown.h b/src/fs/unknown.h index 85a2b27..3b3ede5 100644 --- a/src/fs/unknown.h +++ b/src/fs/unknown.h @@ -36,7 +36,6 @@ public: unknown(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init() {} virtual bool supportToolFound() const override { return true; } diff --git a/src/fs/xfs.h b/src/fs/xfs.h index fe1f37e..94fd5b9 100644 --- a/src/fs/xfs.h +++ b/src/fs/xfs.h @@ -40,7 +40,7 @@ public: xfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual void init() override; virtual qint64 readUsedCapacity(const QString& deviceNode) const override; virtual bool check(Report& report, const QString& deviceNode) const override; diff --git a/src/fs/zfs.h b/src/fs/zfs.h index 5deb538..e812d8c 100644 --- a/src/fs/zfs.h +++ b/src/fs/zfs.h @@ -41,7 +41,7 @@ public: zfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); public: - static void init(); + virtual 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;