andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Make FileSystem::init virtual instead of static.

This commit is contained in:
Andrius Štikonas 2016-05-17 16:33:52 +01:00
parent e64e536797
commit 927a6421fe
29 changed files with 22 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fs/btrfs.h
View File

@ -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;

2
src/fs/exfat.h
View File

@ -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;

2
src/fs/ext2.h
View File

@ -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;

1
src/fs/ext3.h
View File

@ -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;
};

1
src/fs/ext4.h
View File

@ -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;
};

1
src/fs/extended.h
View File

@ -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;

2
src/fs/f2fs.h
View File

@ -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;

2
src/fs/fat16.h
View File

@ -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;

2
src/fs/fat32.h
View File

@ -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;

1
src/fs/filesystem.h
View File

@ -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;

29
src/fs/filesystemfactory.cpp
View File

@ -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();
}

2
src/fs/hfs.h
View File

@ -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;

2
src/fs/hfsplus.h
View File

@ -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;

4
src/fs/hpfs.cpp
View File

@ -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);

2
src/fs/hpfs.h
View File

@ -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;
}

2
src/fs/jfs.h
View File

@ -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;

2
src/fs/linuxswap.h
View File

@ -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;

2
src/fs/luks.h
View File

@ -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 {

2
src/fs/lvm2_pv.h
View File

@ -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;

2
src/fs/nilfs2.h
View File

@ -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;

2
src/fs/ntfs.h
View File

@ -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;

2
src/fs/ocfs2.h
View File

@ -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;

2
src/fs/reiser4.h
View File

@ -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;

2
src/fs/reiserfs.h
View File

@ -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;

2
src/fs/ufs.h
View File

@ -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;
}

2
src/fs/unformatted.h
View File

@ -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 {

1
src/fs/unknown.h
View File

@ -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;
}

2
src/fs/xfs.h
View File

@ -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;

2
src/fs/zfs.h
View File

@ -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;