From 84acbea6ac236e0486e4ac12ae7acc2d4bcd5aba Mon Sep 17 00:00:00 2001 From: Volker Lanz Date: Wed, 27 Jan 2010 12:48:42 +0000 Subject: [PATCH] rename FileSystem::SupportType to FileSystem::CommandSupportType svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1081014 --- src/fs/ext2.cpp | 24 ++++++++-------- src/fs/ext2.h | 48 ++++++++++++++++---------------- src/fs/extended.cpp | 8 +++--- src/fs/extended.h | 16 +++++------ src/fs/fat16.cpp | 24 ++++++++-------- src/fs/fat16.h | 48 ++++++++++++++++---------------- src/fs/filesystem.h | 30 ++++++++++---------- src/fs/hfs.cpp | 16 +++++------ src/fs/hfs.h | 32 ++++++++++----------- src/fs/hfsplus.cpp | 12 ++++---- src/fs/hfsplus.h | 24 ++++++++-------- src/fs/jfs.cpp | 18 ++++++------ src/fs/jfs.h | 36 ++++++++++++------------ src/fs/linuxswap.cpp | 16 +++++------ src/fs/linuxswap.h | 32 ++++++++++----------- src/fs/ntfs.cpp | 24 ++++++++-------- src/fs/ntfs.h | 48 ++++++++++++++++---------------- src/fs/reiser4.cpp | 14 +++++----- src/fs/reiser4.h | 28 +++++++++---------- src/fs/reiserfs.cpp | 24 ++++++++-------- src/fs/reiserfs.h | 48 ++++++++++++++++---------------- src/fs/ufs.cpp | 6 ++-- src/fs/ufs.h | 12 ++++---- src/fs/unformatted.cpp | 2 +- src/fs/unformatted.h | 4 +-- src/fs/xfs.cpp | 18 ++++++------ src/fs/xfs.h | 36 ++++++++++++------------ src/jobs/resizefilesystemjob.cpp | 2 +- 28 files changed, 325 insertions(+), 325 deletions(-) diff --git a/src/fs/ext2.cpp b/src/fs/ext2.cpp index e432560..5089009 100644 --- a/src/fs/ext2.cpp +++ b/src/fs/ext2.cpp @@ -27,18 +27,18 @@ namespace FS { - FileSystem::SupportType ext2::m_GetUsed = FileSystem::SupportNone; - FileSystem::SupportType ext2::m_GetLabel = FileSystem::SupportNone; - FileSystem::SupportType ext2::m_Create = FileSystem::SupportNone; - FileSystem::SupportType ext2::m_Grow = FileSystem::SupportNone; - FileSystem::SupportType ext2::m_Shrink = FileSystem::SupportNone; - FileSystem::SupportType ext2::m_Move = FileSystem::SupportNone; - FileSystem::SupportType ext2::m_Check = FileSystem::SupportNone; - FileSystem::SupportType ext2::m_Copy = FileSystem::SupportNone; - FileSystem::SupportType ext2::m_Backup = FileSystem::SupportNone; - FileSystem::SupportType ext2::m_SetLabel = FileSystem::SupportNone; - FileSystem::SupportType ext2::m_UpdateUUID = FileSystem::SupportNone; - FileSystem::SupportType ext2::m_GetUUID = FileSystem::SupportNone; + FileSystem::CommandSupportType ext2::m_GetUsed = FileSystem::SupportNone; + FileSystem::CommandSupportType ext2::m_GetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType ext2::m_Create = FileSystem::SupportNone; + FileSystem::CommandSupportType ext2::m_Grow = FileSystem::SupportNone; + FileSystem::CommandSupportType ext2::m_Shrink = FileSystem::SupportNone; + FileSystem::CommandSupportType ext2::m_Move = FileSystem::SupportNone; + FileSystem::CommandSupportType ext2::m_Check = FileSystem::SupportNone; + FileSystem::CommandSupportType ext2::m_Copy = FileSystem::SupportNone; + FileSystem::CommandSupportType ext2::m_Backup = FileSystem::SupportNone; + FileSystem::CommandSupportType ext2::m_SetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType ext2::m_UpdateUUID = FileSystem::SupportNone; + FileSystem::CommandSupportType ext2::m_GetUUID = FileSystem::SupportNone; ext2::ext2(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label, FileSystem::Type t) : FileSystem(firstsector, lastsector, sectorsused, label, t) diff --git a/src/fs/ext2.h b/src/fs/ext2.h index 7a68b4c..9714a9b 100644 --- a/src/fs/ext2.h +++ b/src/fs/ext2.h @@ -49,34 +49,34 @@ namespace FS virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); virtual bool updateUUID(Report& report, const QString& deviceNode) const; - virtual SupportType supportGetUsed() const { return m_GetUsed; } - virtual SupportType supportGetLabel() const { return m_GetLabel; } - virtual SupportType supportCreate() const { return m_Create; } - virtual SupportType supportGrow() const { return m_Grow; } - virtual SupportType supportShrink() const { return m_Shrink; } - virtual SupportType supportMove() const { return m_Move; } - virtual SupportType supportCheck() const { return m_Check; } - virtual SupportType supportCopy() const { return m_Copy; } - virtual SupportType supportBackup() const { return m_Backup; } - virtual SupportType supportSetLabel() const { return m_SetLabel; } - virtual SupportType supportUpdateUUID() const { return m_UpdateUUID; } - virtual SupportType supportGetUUID() const { return m_GetUUID; } + virtual CommandSupportType supportGetUsed() const { return m_GetUsed; } + virtual CommandSupportType supportGetLabel() const { return m_GetLabel; } + virtual CommandSupportType supportCreate() const { return m_Create; } + virtual CommandSupportType supportGrow() const { return m_Grow; } + virtual CommandSupportType supportShrink() const { return m_Shrink; } + virtual CommandSupportType supportMove() const { return m_Move; } + virtual CommandSupportType supportCheck() const { return m_Check; } + virtual CommandSupportType supportCopy() const { return m_Copy; } + virtual CommandSupportType supportBackup() const { return m_Backup; } + virtual CommandSupportType supportSetLabel() const { return m_SetLabel; } + virtual CommandSupportType supportUpdateUUID() const { return m_UpdateUUID; } + virtual CommandSupportType supportGetUUID() const { return m_GetUUID; } virtual qint64 maxCapacity() const; protected: - static SupportType m_GetUsed; - static SupportType m_GetLabel; - static SupportType m_Create; - static SupportType m_Grow; - static SupportType m_Shrink; - static SupportType m_Move; - static SupportType m_Check; - static SupportType m_Copy; - static SupportType m_Backup; - static SupportType m_SetLabel; - static SupportType m_UpdateUUID; - static SupportType m_GetUUID; + static CommandSupportType m_GetUsed; + static CommandSupportType m_GetLabel; + static CommandSupportType m_Create; + static CommandSupportType m_Grow; + static CommandSupportType m_Shrink; + static CommandSupportType m_Move; + static CommandSupportType m_Check; + static CommandSupportType m_Copy; + static CommandSupportType m_Backup; + static CommandSupportType m_SetLabel; + static CommandSupportType m_UpdateUUID; + static CommandSupportType m_GetUUID; }; } diff --git a/src/fs/extended.cpp b/src/fs/extended.cpp index 0709edf..bf35157 100644 --- a/src/fs/extended.cpp +++ b/src/fs/extended.cpp @@ -21,10 +21,10 @@ namespace FS { - FileSystem::SupportType extended::m_Create = FileSystem::SupportExternal; - FileSystem::SupportType extended::m_Grow = FileSystem::SupportInternal; - FileSystem::SupportType extended::m_Shrink = FileSystem::SupportInternal; - FileSystem::SupportType extended::m_Move = FileSystem::SupportInternal; + FileSystem::CommandSupportType extended::m_Create = FileSystem::SupportExternal; + FileSystem::CommandSupportType extended::m_Grow = FileSystem::SupportInternal; + FileSystem::CommandSupportType extended::m_Shrink = FileSystem::SupportInternal; + FileSystem::CommandSupportType extended::m_Move = FileSystem::SupportInternal; extended::extended(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Extended) diff --git a/src/fs/extended.h b/src/fs/extended.h index c9608c6..e79d698 100644 --- a/src/fs/extended.h +++ b/src/fs/extended.h @@ -47,16 +47,16 @@ namespace FS virtual bool create(Report&, const QString&) const; - virtual SupportType supportCreate() const { return m_Create; } - virtual SupportType supportGrow() const { return m_Grow; } - virtual SupportType supportShrink() const { return m_Shrink; } - virtual SupportType supportMove() const { return m_Move; } + virtual CommandSupportType supportCreate() const { return m_Create; } + virtual CommandSupportType supportGrow() const { return m_Grow; } + virtual CommandSupportType supportShrink() const { return m_Shrink; } + virtual CommandSupportType supportMove() const { return m_Move; } protected: - static SupportType m_Create; - static SupportType m_Grow; - static SupportType m_Shrink; - static SupportType m_Move; + static CommandSupportType m_Create; + static CommandSupportType m_Grow; + static CommandSupportType m_Shrink; + static CommandSupportType m_Move; }; } diff --git a/src/fs/fat16.cpp b/src/fs/fat16.cpp index fe22f80..454add8 100644 --- a/src/fs/fat16.cpp +++ b/src/fs/fat16.cpp @@ -36,18 +36,18 @@ namespace FS { - FileSystem::SupportType fat16::m_GetUsed = FileSystem::SupportNone; - FileSystem::SupportType fat16::m_GetLabel = FileSystem::SupportNone; - FileSystem::SupportType fat16::m_SetLabel = FileSystem::SupportNone; - FileSystem::SupportType fat16::m_Create = FileSystem::SupportNone; - FileSystem::SupportType fat16::m_Grow = FileSystem::SupportNone; - FileSystem::SupportType fat16::m_Shrink = FileSystem::SupportNone; - FileSystem::SupportType fat16::m_Move = FileSystem::SupportNone; - FileSystem::SupportType fat16::m_Check = FileSystem::SupportNone; - FileSystem::SupportType fat16::m_Copy = FileSystem::SupportNone; - FileSystem::SupportType fat16::m_Backup = FileSystem::SupportNone; - FileSystem::SupportType fat16::m_UpdateUUID = FileSystem::SupportNone; - FileSystem::SupportType fat16::m_GetUUID = FileSystem::SupportNone; + FileSystem::CommandSupportType fat16::m_GetUsed = FileSystem::SupportNone; + FileSystem::CommandSupportType fat16::m_GetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType fat16::m_SetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType fat16::m_Create = FileSystem::SupportNone; + FileSystem::CommandSupportType fat16::m_Grow = FileSystem::SupportNone; + FileSystem::CommandSupportType fat16::m_Shrink = FileSystem::SupportNone; + FileSystem::CommandSupportType fat16::m_Move = FileSystem::SupportNone; + FileSystem::CommandSupportType fat16::m_Check = FileSystem::SupportNone; + FileSystem::CommandSupportType fat16::m_Copy = FileSystem::SupportNone; + FileSystem::CommandSupportType fat16::m_Backup = FileSystem::SupportNone; + FileSystem::CommandSupportType fat16::m_UpdateUUID = FileSystem::SupportNone; + FileSystem::CommandSupportType fat16::m_GetUUID = FileSystem::SupportNone; fat16::fat16(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label, FileSystem::Type t) : FileSystem(firstsector, lastsector, sectorsused, label, t) diff --git a/src/fs/fat16.h b/src/fs/fat16.h index 62c25c6..05b3688 100644 --- a/src/fs/fat16.h +++ b/src/fs/fat16.h @@ -48,35 +48,35 @@ namespace FS virtual bool updateUUID(Report& report, const QString& deviceNode) const; virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); - virtual SupportType supportGetUsed() const { return m_GetUsed; } - virtual SupportType supportGetLabel() const { return m_GetLabel; } - virtual SupportType supportSetLabel() const { return m_SetLabel; } - virtual SupportType supportCreate() const { return m_Create; } - virtual SupportType supportGrow() const { return m_Grow; } - virtual SupportType supportShrink() const { return m_Shrink; } - virtual SupportType supportMove() const { return m_Move; } - virtual SupportType supportCheck() const { return m_Check; } - virtual SupportType supportCopy() const { return m_Copy; } - virtual SupportType supportBackup() const { return m_Backup; } - virtual SupportType supportUpdateUUID() const { return m_UpdateUUID; } - virtual SupportType supportGetUUID() const { return m_GetUUID; } + virtual CommandSupportType supportGetUsed() const { return m_GetUsed; } + virtual CommandSupportType supportGetLabel() const { return m_GetLabel; } + virtual CommandSupportType supportSetLabel() const { return m_SetLabel; } + virtual CommandSupportType supportCreate() const { return m_Create; } + virtual CommandSupportType supportGrow() const { return m_Grow; } + virtual CommandSupportType supportShrink() const { return m_Shrink; } + virtual CommandSupportType supportMove() const { return m_Move; } + virtual CommandSupportType supportCheck() const { return m_Check; } + virtual CommandSupportType supportCopy() const { return m_Copy; } + virtual CommandSupportType supportBackup() const { return m_Backup; } + virtual CommandSupportType supportUpdateUUID() const { return m_UpdateUUID; } + virtual CommandSupportType supportGetUUID() const { return m_GetUUID; } virtual qint64 minCapacity() const; virtual qint64 maxCapacity() const; protected: - static SupportType m_GetUsed; - static SupportType m_GetLabel; - static SupportType m_SetLabel; - static SupportType m_Create; - static SupportType m_Grow; - static SupportType m_Shrink; - static SupportType m_Move; - static SupportType m_Check; - static SupportType m_Copy; - static SupportType m_Backup; - static SupportType m_UpdateUUID; - static SupportType m_GetUUID; + static CommandSupportType m_GetUsed; + static CommandSupportType m_GetLabel; + static CommandSupportType m_SetLabel; + static CommandSupportType m_Create; + static CommandSupportType m_Grow; + static CommandSupportType m_Shrink; + static CommandSupportType m_Move; + static CommandSupportType m_Check; + static CommandSupportType m_Copy; + static CommandSupportType m_Backup; + static CommandSupportType m_UpdateUUID; + static CommandSupportType m_GetUUID; }; } diff --git a/src/fs/filesystem.h b/src/fs/filesystem.h index 46d4cc3..aa6369b 100644 --- a/src/fs/filesystem.h +++ b/src/fs/filesystem.h @@ -66,14 +66,14 @@ class FileSystem }; /** The type of support for a given FileSystem action */ - enum SupportType + enum CommandSupportType { SupportNone = 0, /**< no support */ SupportInternal = 1, /**< internal support */ SupportExternal = 2 /**< supported by some external command */ }; - Q_DECLARE_FLAGS(SupportTypes, SupportType) + Q_DECLARE_FLAGS(CommandSupportTypes, CommandSupportType) protected: FileSystem(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label, FileSystem::Type t); @@ -94,18 +94,18 @@ class FileSystem virtual QString readUUID(const QString& deviceNode) const; virtual bool updateBootSector(Report& report, const QString& deviceNode) const; - virtual SupportType supportGetUsed() const { return SupportNone; } /**< @return SupportType for getting used capacity */ - virtual SupportType supportGetLabel() const { return SupportNone; } /**< @return SupportType for reading label*/ - virtual SupportType supportCreate() const { return SupportNone; } /**< @return SupportType for creating */ - virtual SupportType supportGrow() const { return SupportNone; } /**< @return SupportType for growing */ - virtual SupportType supportShrink() const { return SupportNone; } /**< @return SupportType for shrinking */ - virtual SupportType supportMove() const { return SupportNone; } /**< @return SupportType for moving */ - virtual SupportType supportCheck() const { return SupportNone; } /**< @return SupportType for checking */ - virtual SupportType supportCopy() const { return SupportNone; } /**< @return SupportType for copying */ - virtual SupportType supportBackup() const { return SupportNone; } /**< @return SupportType for backing up */ - virtual SupportType supportSetLabel() const { return SupportNone; } /**< @return SupportType for setting label*/ - virtual SupportType supportUpdateUUID() const { return SupportNone; } /**< @return SupportType for updating the UUID */ - virtual SupportType supportGetUUID() const { return SupportNone; } /**< @return SupportType for reading the UUID */ + virtual CommandSupportType supportGetUsed() const { return SupportNone; } /**< @return CommandSupportType for getting used capacity */ + virtual CommandSupportType supportGetLabel() const { return SupportNone; } /**< @return CommandSupportType for reading label*/ + virtual CommandSupportType supportCreate() const { return SupportNone; } /**< @return CommandSupportType for creating */ + virtual CommandSupportType supportGrow() const { return SupportNone; } /**< @return CommandSupportType for growing */ + virtual CommandSupportType supportShrink() const { return SupportNone; } /**< @return CommandSupportType for shrinking */ + virtual CommandSupportType supportMove() const { return SupportNone; } /**< @return CommandSupportType for moving */ + virtual CommandSupportType supportCheck() const { return SupportNone; } /**< @return CommandSupportType for checking */ + virtual CommandSupportType supportCopy() const { return SupportNone; } /**< @return CommandSupportType for copying */ + virtual CommandSupportType supportBackup() const { return SupportNone; } /**< @return CommandSupportType for backing up */ + virtual CommandSupportType supportSetLabel() const { return SupportNone; } /**< @return CommandSupportType for setting label*/ + virtual CommandSupportType supportUpdateUUID() const { return SupportNone; } /**< @return CommandSupportType for updating the UUID */ + virtual CommandSupportType supportGetUUID() const { return SupportNone; } /**< @return CommandSupportType for reading the UUID */ virtual qint64 minCapacity() const; virtual qint64 maxCapacity() const; @@ -156,6 +156,6 @@ class FileSystem QString m_UUID; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(FileSystem::SupportTypes) +Q_DECLARE_OPERATORS_FOR_FLAGS(FileSystem::CommandSupportTypes) #endif diff --git a/src/fs/hfs.cpp b/src/fs/hfs.cpp index 67f9390..0fec135 100644 --- a/src/fs/hfs.cpp +++ b/src/fs/hfs.cpp @@ -27,14 +27,14 @@ namespace FS { - FileSystem::SupportType hfs::m_GetUsed = FileSystem::SupportNone; - FileSystem::SupportType hfs::m_GetLabel = FileSystem::SupportNone; - FileSystem::SupportType hfs::m_Create = FileSystem::SupportNone; - FileSystem::SupportType hfs::m_Shrink = FileSystem::SupportNone; - FileSystem::SupportType hfs::m_Move = FileSystem::SupportNone; - FileSystem::SupportType hfs::m_Check = FileSystem::SupportNone; - FileSystem::SupportType hfs::m_Copy = FileSystem::SupportNone; - FileSystem::SupportType hfs::m_Backup = FileSystem::SupportNone; + FileSystem::CommandSupportType hfs::m_GetUsed = FileSystem::SupportNone; + FileSystem::CommandSupportType hfs::m_GetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType hfs::m_Create = FileSystem::SupportNone; + FileSystem::CommandSupportType hfs::m_Shrink = FileSystem::SupportNone; + FileSystem::CommandSupportType hfs::m_Move = FileSystem::SupportNone; + FileSystem::CommandSupportType hfs::m_Check = FileSystem::SupportNone; + FileSystem::CommandSupportType hfs::m_Copy = FileSystem::SupportNone; + FileSystem::CommandSupportType hfs::m_Backup = FileSystem::SupportNone; hfs::hfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Hfs) diff --git a/src/fs/hfs.h b/src/fs/hfs.h index 148d958..07fc04a 100644 --- a/src/fs/hfs.h +++ b/src/fs/hfs.h @@ -45,26 +45,26 @@ namespace FS virtual bool check(Report& report, const QString& deviceNode) const; virtual bool create(Report& report, const QString& deviceNode) const; - virtual SupportType supportGetUsed() const { return m_GetUsed; } - virtual SupportType supportGetLabel() const { return m_GetLabel; } - virtual SupportType supportCreate() const { return m_Create; } - virtual SupportType supportShrink() const { return m_Shrink; } - virtual SupportType supportMove() const { return m_Move; } - virtual SupportType supportCheck() const { return m_Check; } - virtual SupportType supportCopy() const { return m_Copy; } - virtual SupportType supportBackup() const { return m_Backup; } + virtual CommandSupportType supportGetUsed() const { return m_GetUsed; } + virtual CommandSupportType supportGetLabel() const { return m_GetLabel; } + virtual CommandSupportType supportCreate() const { return m_Create; } + virtual CommandSupportType supportShrink() const { return m_Shrink; } + virtual CommandSupportType supportMove() const { return m_Move; } + virtual CommandSupportType supportCheck() const { return m_Check; } + virtual CommandSupportType supportCopy() const { return m_Copy; } + virtual CommandSupportType supportBackup() const { return m_Backup; } virtual qint64 maxCapacity() const; protected: - static SupportType m_GetUsed; - static SupportType m_GetLabel; - static SupportType m_Create; - static SupportType m_Shrink; - static SupportType m_Move; - static SupportType m_Check; - static SupportType m_Copy; - static SupportType m_Backup; + static CommandSupportType m_GetUsed; + static CommandSupportType m_GetLabel; + static CommandSupportType m_Create; + static CommandSupportType m_Shrink; + static CommandSupportType m_Move; + static CommandSupportType m_Check; + static CommandSupportType m_Copy; + static CommandSupportType m_Backup; }; } diff --git a/src/fs/hfsplus.cpp b/src/fs/hfsplus.cpp index b51a6dc..7e1363d 100644 --- a/src/fs/hfsplus.cpp +++ b/src/fs/hfsplus.cpp @@ -26,12 +26,12 @@ namespace FS { - FileSystem::SupportType hfsplus::m_GetUsed = FileSystem::SupportNone; - FileSystem::SupportType hfsplus::m_Shrink = FileSystem::SupportNone; - FileSystem::SupportType hfsplus::m_Move = FileSystem::SupportNone; - FileSystem::SupportType hfsplus::m_Check = FileSystem::SupportNone; - FileSystem::SupportType hfsplus::m_Copy = FileSystem::SupportNone; - FileSystem::SupportType hfsplus::m_Backup = FileSystem::SupportNone; + FileSystem::CommandSupportType hfsplus::m_GetUsed = FileSystem::SupportNone; + FileSystem::CommandSupportType hfsplus::m_Shrink = FileSystem::SupportNone; + FileSystem::CommandSupportType hfsplus::m_Move = FileSystem::SupportNone; + FileSystem::CommandSupportType hfsplus::m_Check = FileSystem::SupportNone; + FileSystem::CommandSupportType hfsplus::m_Copy = FileSystem::SupportNone; + FileSystem::CommandSupportType hfsplus::m_Backup = FileSystem::SupportNone; hfsplus::hfsplus(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::HfsPlus) diff --git a/src/fs/hfsplus.h b/src/fs/hfsplus.h index 8960129..b4c4312 100644 --- a/src/fs/hfsplus.h +++ b/src/fs/hfsplus.h @@ -44,22 +44,22 @@ namespace FS virtual bool check(Report& report, const QString& deviceNode) const; - virtual SupportType supportGetUsed() const { return m_GetUsed; } - virtual SupportType supportShrink() const { return m_Shrink; } - virtual SupportType supportMove() const { return m_Move; } - virtual SupportType supportCheck() const { return m_Check; } - virtual SupportType supportCopy() const { return m_Copy; } - virtual SupportType supportBackup() const { return m_Backup; } + virtual CommandSupportType supportGetUsed() const { return m_GetUsed; } + virtual CommandSupportType supportShrink() const { return m_Shrink; } + virtual CommandSupportType supportMove() const { return m_Move; } + virtual CommandSupportType supportCheck() const { return m_Check; } + virtual CommandSupportType supportCopy() const { return m_Copy; } + virtual CommandSupportType supportBackup() const { return m_Backup; } virtual qint64 maxCapacity() const; protected: - static SupportType m_GetUsed; - static SupportType m_Shrink; - static SupportType m_Move; - static SupportType m_Check; - static SupportType m_Copy; - static SupportType m_Backup; + static CommandSupportType m_GetUsed; + static CommandSupportType m_Shrink; + static CommandSupportType m_Move; + static CommandSupportType m_Check; + static CommandSupportType m_Copy; + static CommandSupportType m_Backup; }; } diff --git a/src/fs/jfs.cpp b/src/fs/jfs.cpp index 02a7282..f830d8e 100644 --- a/src/fs/jfs.cpp +++ b/src/fs/jfs.cpp @@ -33,15 +33,15 @@ namespace FS { - FileSystem::SupportType jfs::m_GetUsed = FileSystem::SupportNone; - FileSystem::SupportType jfs::m_GetLabel = FileSystem::SupportNone; - FileSystem::SupportType jfs::m_Create = FileSystem::SupportNone; - FileSystem::SupportType jfs::m_Grow = FileSystem::SupportNone; - FileSystem::SupportType jfs::m_Move = FileSystem::SupportNone; - FileSystem::SupportType jfs::m_Check = FileSystem::SupportNone; - FileSystem::SupportType jfs::m_Copy = FileSystem::SupportNone; - FileSystem::SupportType jfs::m_Backup = FileSystem::SupportNone; - FileSystem::SupportType jfs::m_SetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType jfs::m_GetUsed = FileSystem::SupportNone; + FileSystem::CommandSupportType jfs::m_GetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType jfs::m_Create = FileSystem::SupportNone; + FileSystem::CommandSupportType jfs::m_Grow = FileSystem::SupportNone; + FileSystem::CommandSupportType jfs::m_Move = FileSystem::SupportNone; + FileSystem::CommandSupportType jfs::m_Check = FileSystem::SupportNone; + FileSystem::CommandSupportType jfs::m_Copy = FileSystem::SupportNone; + FileSystem::CommandSupportType jfs::m_Backup = FileSystem::SupportNone; + FileSystem::CommandSupportType jfs::m_SetLabel = FileSystem::SupportNone; jfs::jfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Jfs) diff --git a/src/fs/jfs.h b/src/fs/jfs.h index e70eee5..e4b7f30 100644 --- a/src/fs/jfs.h +++ b/src/fs/jfs.h @@ -48,28 +48,28 @@ namespace FS virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); - virtual SupportType supportGetUsed() const { return m_GetUsed; } - virtual SupportType supportGetLabel() const { return m_GetLabel; } - virtual SupportType supportCreate() const { return m_Create; } - virtual SupportType supportGrow() const { return m_Grow; } - virtual SupportType supportMove() const { return m_Move; } - virtual SupportType supportCheck() const { return m_Check; } - virtual SupportType supportCopy() const { return m_Copy; } - virtual SupportType supportBackup() const { return m_Backup; } - virtual SupportType supportSetLabel() const { return m_SetLabel; } + virtual CommandSupportType supportGetUsed() const { return m_GetUsed; } + virtual CommandSupportType supportGetLabel() const { return m_GetLabel; } + virtual CommandSupportType supportCreate() const { return m_Create; } + virtual CommandSupportType supportGrow() const { return m_Grow; } + virtual CommandSupportType supportMove() const { return m_Move; } + virtual CommandSupportType supportCheck() const { return m_Check; } + virtual CommandSupportType supportCopy() const { return m_Copy; } + virtual CommandSupportType supportBackup() const { return m_Backup; } + virtual CommandSupportType supportSetLabel() const { return m_SetLabel; } virtual qint64 minCapacity() const; protected: - static SupportType m_GetUsed; - static SupportType m_GetLabel; - static SupportType m_Create; - static SupportType m_Grow; - static SupportType m_Move; - static SupportType m_Check; - static SupportType m_Copy; - static SupportType m_Backup; - static SupportType m_SetLabel; + static CommandSupportType m_GetUsed; + static CommandSupportType m_GetLabel; + static CommandSupportType m_Create; + static CommandSupportType m_Grow; + static CommandSupportType m_Move; + static CommandSupportType m_Check; + static CommandSupportType m_Copy; + static CommandSupportType m_Backup; + static CommandSupportType m_SetLabel; }; } diff --git a/src/fs/linuxswap.cpp b/src/fs/linuxswap.cpp index ea1e692..03e8d10 100644 --- a/src/fs/linuxswap.cpp +++ b/src/fs/linuxswap.cpp @@ -25,14 +25,14 @@ namespace FS { - FileSystem::SupportType linuxswap::m_Create = FileSystem::SupportNone; - FileSystem::SupportType linuxswap::m_Grow = FileSystem::SupportNone; - FileSystem::SupportType linuxswap::m_Shrink = FileSystem::SupportNone; - FileSystem::SupportType linuxswap::m_Move = FileSystem::SupportNone; - FileSystem::SupportType linuxswap::m_Copy = FileSystem::SupportNone; - FileSystem::SupportType linuxswap::m_GetLabel = FileSystem::SupportNone; - FileSystem::SupportType linuxswap::m_SetLabel = FileSystem::SupportNone; - FileSystem::SupportType linuxswap::m_GetUUID = FileSystem::SupportNone; + FileSystem::CommandSupportType linuxswap::m_Create = FileSystem::SupportNone; + FileSystem::CommandSupportType linuxswap::m_Grow = FileSystem::SupportNone; + FileSystem::CommandSupportType linuxswap::m_Shrink = FileSystem::SupportNone; + FileSystem::CommandSupportType linuxswap::m_Move = FileSystem::SupportNone; + FileSystem::CommandSupportType linuxswap::m_Copy = FileSystem::SupportNone; + FileSystem::CommandSupportType linuxswap::m_GetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType linuxswap::m_SetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType linuxswap::m_GetUUID = FileSystem::SupportNone; linuxswap::linuxswap(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::LinuxSwap) diff --git a/src/fs/linuxswap.h b/src/fs/linuxswap.h index 65ea226..d81745e 100644 --- a/src/fs/linuxswap.h +++ b/src/fs/linuxswap.h @@ -55,24 +55,24 @@ namespace FS virtual QString mountTitle() const; virtual QString unmountTitle() const; - virtual SupportType supportCreate() const { return m_Create; } - virtual SupportType supportGrow() const { return m_Grow; } - virtual SupportType supportShrink() const { return m_Shrink; } - virtual SupportType supportMove() const { return m_Move; } - virtual SupportType supportCopy() const { return m_Copy; } - virtual SupportType supportGetLabel() const { return m_GetLabel; } - virtual SupportType supportSetLabel() const { return m_SetLabel; } - virtual SupportType supportGetUUID() const { return m_GetUUID; } + virtual CommandSupportType supportCreate() const { return m_Create; } + virtual CommandSupportType supportGrow() const { return m_Grow; } + virtual CommandSupportType supportShrink() const { return m_Shrink; } + virtual CommandSupportType supportMove() const { return m_Move; } + virtual CommandSupportType supportCopy() const { return m_Copy; } + virtual CommandSupportType supportGetLabel() const { return m_GetLabel; } + virtual CommandSupportType supportSetLabel() const { return m_SetLabel; } + virtual CommandSupportType supportGetUUID() const { return m_GetUUID; } protected: - static SupportType m_Create; - static SupportType m_Grow; - static SupportType m_Shrink; - static SupportType m_Move; - static SupportType m_Copy; - static SupportType m_SetLabel; - static SupportType m_GetLabel; - static SupportType m_GetUUID; + static CommandSupportType m_Create; + static CommandSupportType m_Grow; + static CommandSupportType m_Shrink; + static CommandSupportType m_Move; + static CommandSupportType m_Copy; + static CommandSupportType m_SetLabel; + static CommandSupportType m_GetLabel; + static CommandSupportType m_GetUUID; }; } diff --git a/src/fs/ntfs.cpp b/src/fs/ntfs.cpp index 1aeb1ac..3b21339 100644 --- a/src/fs/ntfs.cpp +++ b/src/fs/ntfs.cpp @@ -37,18 +37,18 @@ namespace FS { - FileSystem::SupportType ntfs::m_GetUsed = FileSystem::SupportNone; - FileSystem::SupportType ntfs::m_GetLabel = FileSystem::SupportNone; - FileSystem::SupportType ntfs::m_Create = FileSystem::SupportNone; - FileSystem::SupportType ntfs::m_Grow = FileSystem::SupportNone; - FileSystem::SupportType ntfs::m_Shrink = FileSystem::SupportNone; - FileSystem::SupportType ntfs::m_Move = FileSystem::SupportNone; - FileSystem::SupportType ntfs::m_Check = FileSystem::SupportNone; - FileSystem::SupportType ntfs::m_Copy = FileSystem::SupportNone; - FileSystem::SupportType ntfs::m_Backup = FileSystem::SupportNone; - FileSystem::SupportType ntfs::m_SetLabel = FileSystem::SupportNone; - FileSystem::SupportType ntfs::m_UpdateUUID = FileSystem::SupportNone; - FileSystem::SupportType ntfs::m_GetUUID = FileSystem::SupportNone; + FileSystem::CommandSupportType ntfs::m_GetUsed = FileSystem::SupportNone; + FileSystem::CommandSupportType ntfs::m_GetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType ntfs::m_Create = FileSystem::SupportNone; + FileSystem::CommandSupportType ntfs::m_Grow = FileSystem::SupportNone; + FileSystem::CommandSupportType ntfs::m_Shrink = FileSystem::SupportNone; + FileSystem::CommandSupportType ntfs::m_Move = FileSystem::SupportNone; + FileSystem::CommandSupportType ntfs::m_Check = FileSystem::SupportNone; + FileSystem::CommandSupportType ntfs::m_Copy = FileSystem::SupportNone; + FileSystem::CommandSupportType ntfs::m_Backup = FileSystem::SupportNone; + FileSystem::CommandSupportType ntfs::m_SetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType ntfs::m_UpdateUUID = FileSystem::SupportNone; + FileSystem::CommandSupportType ntfs::m_GetUUID = FileSystem::SupportNone; ntfs::ntfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Ntfs) diff --git a/src/fs/ntfs.h b/src/fs/ntfs.h index 7ea1a9b..3f21291 100644 --- a/src/fs/ntfs.h +++ b/src/fs/ntfs.h @@ -51,34 +51,34 @@ namespace FS virtual bool updateUUID(Report& report, const QString& deviceNode) const; virtual bool updateBootSector(Report& report, const QString& deviceNode) const; - virtual SupportType supportGetUsed() const { return m_GetUsed; } - virtual SupportType supportGetLabel() const { return m_GetLabel; } - virtual SupportType supportCreate() const { return m_Create; } - virtual SupportType supportGrow() const { return m_Grow; } - virtual SupportType supportShrink() const { return m_Shrink; } - virtual SupportType supportMove() const { return m_Move; } - virtual SupportType supportCheck() const { return m_Check; } - virtual SupportType supportCopy() const { return m_Copy; } - virtual SupportType supportBackup() const { return m_Backup; } - virtual SupportType supportSetLabel() const { return m_SetLabel; } - virtual SupportType supportUpdateUUID() const { return m_UpdateUUID; } - virtual SupportType supportGetUUID() const { return m_GetUUID; } + virtual CommandSupportType supportGetUsed() const { return m_GetUsed; } + virtual CommandSupportType supportGetLabel() const { return m_GetLabel; } + virtual CommandSupportType supportCreate() const { return m_Create; } + virtual CommandSupportType supportGrow() const { return m_Grow; } + virtual CommandSupportType supportShrink() const { return m_Shrink; } + virtual CommandSupportType supportMove() const { return m_Move; } + virtual CommandSupportType supportCheck() const { return m_Check; } + virtual CommandSupportType supportCopy() const { return m_Copy; } + virtual CommandSupportType supportBackup() const { return m_Backup; } + virtual CommandSupportType supportSetLabel() const { return m_SetLabel; } + virtual CommandSupportType supportUpdateUUID() const { return m_UpdateUUID; } + virtual CommandSupportType supportGetUUID() const { return m_GetUUID; } virtual qint64 maxCapacity() const; protected: - static SupportType m_GetUsed; - static SupportType m_GetLabel; - static SupportType m_Create; - static SupportType m_Grow; - static SupportType m_Shrink; - static SupportType m_Move; - static SupportType m_Check; - static SupportType m_Copy; - static SupportType m_Backup; - static SupportType m_SetLabel; - static SupportType m_UpdateUUID; - static SupportType m_GetUUID; + static CommandSupportType m_GetUsed; + static CommandSupportType m_GetLabel; + static CommandSupportType m_Create; + static CommandSupportType m_Grow; + static CommandSupportType m_Shrink; + static CommandSupportType m_Move; + static CommandSupportType m_Check; + static CommandSupportType m_Copy; + static CommandSupportType m_Backup; + static CommandSupportType m_SetLabel; + static CommandSupportType m_UpdateUUID; + static CommandSupportType m_GetUUID; }; } diff --git a/src/fs/reiser4.cpp b/src/fs/reiser4.cpp index 40f166e..b3adb81 100644 --- a/src/fs/reiser4.cpp +++ b/src/fs/reiser4.cpp @@ -26,13 +26,13 @@ namespace FS { - FileSystem::SupportType reiser4::m_GetUsed = FileSystem::SupportNone; - FileSystem::SupportType reiser4::m_GetLabel = FileSystem::SupportNone; - FileSystem::SupportType reiser4::m_Create = FileSystem::SupportNone; - FileSystem::SupportType reiser4::m_Move = FileSystem::SupportNone; - FileSystem::SupportType reiser4::m_Check = FileSystem::SupportNone; - FileSystem::SupportType reiser4::m_Copy = FileSystem::SupportNone; - FileSystem::SupportType reiser4::m_Backup = FileSystem::SupportNone; + FileSystem::CommandSupportType reiser4::m_GetUsed = FileSystem::SupportNone; + FileSystem::CommandSupportType reiser4::m_GetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType reiser4::m_Create = FileSystem::SupportNone; + FileSystem::CommandSupportType reiser4::m_Move = FileSystem::SupportNone; + FileSystem::CommandSupportType reiser4::m_Check = FileSystem::SupportNone; + FileSystem::CommandSupportType reiser4::m_Copy = FileSystem::SupportNone; + FileSystem::CommandSupportType reiser4::m_Backup = FileSystem::SupportNone; reiser4::reiser4(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Reiser4) diff --git a/src/fs/reiser4.h b/src/fs/reiser4.h index b3bb0eb..aa519dd 100644 --- a/src/fs/reiser4.h +++ b/src/fs/reiser4.h @@ -46,22 +46,22 @@ namespace FS virtual bool check(Report& report, const QString& deviceNode) const; virtual bool create(Report& report, const QString& deviceNode) const; - virtual SupportType supportGetUsed() const { return m_GetUsed; } - virtual SupportType supportGetLabel() const { return m_GetLabel; } - virtual SupportType supportCreate() const { return m_Create; } - virtual SupportType supportMove() const { return m_Move; } - virtual SupportType supportCheck() const { return m_Check; } - virtual SupportType supportCopy() const { return m_Copy; } - virtual SupportType supportBackup() const { return m_Backup; } + virtual CommandSupportType supportGetUsed() const { return m_GetUsed; } + virtual CommandSupportType supportGetLabel() const { return m_GetLabel; } + virtual CommandSupportType supportCreate() const { return m_Create; } + virtual CommandSupportType supportMove() const { return m_Move; } + virtual CommandSupportType supportCheck() const { return m_Check; } + virtual CommandSupportType supportCopy() const { return m_Copy; } + virtual CommandSupportType supportBackup() const { return m_Backup; } protected: - static SupportType m_GetUsed; - static SupportType m_GetLabel; - static SupportType m_Create; - static SupportType m_Move; - static SupportType m_Check; - static SupportType m_Copy; - static SupportType m_Backup; + static CommandSupportType m_GetUsed; + static CommandSupportType m_GetLabel; + static CommandSupportType m_Create; + static CommandSupportType m_Move; + static CommandSupportType m_Check; + static CommandSupportType m_Copy; + static CommandSupportType m_Backup; }; } diff --git a/src/fs/reiserfs.cpp b/src/fs/reiserfs.cpp index 3238333..cea5edf 100644 --- a/src/fs/reiserfs.cpp +++ b/src/fs/reiserfs.cpp @@ -29,18 +29,18 @@ namespace FS { - FileSystem::SupportType reiserfs::m_GetUsed = FileSystem::SupportNone; - FileSystem::SupportType reiserfs::m_GetLabel = FileSystem::SupportNone; - FileSystem::SupportType reiserfs::m_Create = FileSystem::SupportNone; - FileSystem::SupportType reiserfs::m_Grow = FileSystem::SupportNone; - FileSystem::SupportType reiserfs::m_Shrink = FileSystem::SupportNone; - FileSystem::SupportType reiserfs::m_Move = FileSystem::SupportNone; - FileSystem::SupportType reiserfs::m_Check = FileSystem::SupportNone; - FileSystem::SupportType reiserfs::m_Copy = FileSystem::SupportNone; - FileSystem::SupportType reiserfs::m_Backup = FileSystem::SupportNone; - FileSystem::SupportType reiserfs::m_SetLabel = FileSystem::SupportNone; - FileSystem::SupportType reiserfs::m_UpdateUUID = FileSystem::SupportNone; - FileSystem::SupportType reiserfs::m_GetUUID = FileSystem::SupportNone; + FileSystem::CommandSupportType reiserfs::m_GetUsed = FileSystem::SupportNone; + FileSystem::CommandSupportType reiserfs::m_GetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType reiserfs::m_Create = FileSystem::SupportNone; + FileSystem::CommandSupportType reiserfs::m_Grow = FileSystem::SupportNone; + FileSystem::CommandSupportType reiserfs::m_Shrink = FileSystem::SupportNone; + FileSystem::CommandSupportType reiserfs::m_Move = FileSystem::SupportNone; + FileSystem::CommandSupportType reiserfs::m_Check = FileSystem::SupportNone; + FileSystem::CommandSupportType reiserfs::m_Copy = FileSystem::SupportNone; + FileSystem::CommandSupportType reiserfs::m_Backup = FileSystem::SupportNone; + FileSystem::CommandSupportType reiserfs::m_SetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType reiserfs::m_UpdateUUID = FileSystem::SupportNone; + FileSystem::CommandSupportType reiserfs::m_GetUUID = FileSystem::SupportNone; reiserfs::reiserfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::ReiserFS) diff --git a/src/fs/reiserfs.h b/src/fs/reiserfs.h index da71119..25c0582 100644 --- a/src/fs/reiserfs.h +++ b/src/fs/reiserfs.h @@ -51,35 +51,35 @@ namespace FS virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); virtual bool updateUUID(Report& report, const QString& deviceNode) const; - virtual SupportType supportGetUsed() const { return m_GetUsed; } - virtual SupportType supportGetLabel() const { return m_GetLabel; } - virtual SupportType supportCreate() const { return m_Create; } - virtual SupportType supportGrow() const { return m_Grow; } - virtual SupportType supportShrink() const { return m_Shrink; } - virtual SupportType supportMove() const { return m_Move; } - virtual SupportType supportCheck() const { return m_Check; } - virtual SupportType supportCopy() const { return m_Copy; } - virtual SupportType supportBackup() const { return m_Backup; } - virtual SupportType supportSetLabel() const { return m_SetLabel; } - virtual SupportType supportUpdateUUID() const { return m_UpdateUUID; } - virtual SupportType supportGetUUID() const { return m_GetUUID; } + virtual CommandSupportType supportGetUsed() const { return m_GetUsed; } + virtual CommandSupportType supportGetLabel() const { return m_GetLabel; } + virtual CommandSupportType supportCreate() const { return m_Create; } + virtual CommandSupportType supportGrow() const { return m_Grow; } + virtual CommandSupportType supportShrink() const { return m_Shrink; } + virtual CommandSupportType supportMove() const { return m_Move; } + virtual CommandSupportType supportCheck() const { return m_Check; } + virtual CommandSupportType supportCopy() const { return m_Copy; } + virtual CommandSupportType supportBackup() const { return m_Backup; } + virtual CommandSupportType supportSetLabel() const { return m_SetLabel; } + virtual CommandSupportType supportUpdateUUID() const { return m_UpdateUUID; } + virtual CommandSupportType supportGetUUID() const { return m_GetUUID; } virtual qint64 minCapacity() const; virtual qint64 maxCapacity() const; protected: - static SupportType m_GetUsed; - static SupportType m_GetLabel; - static SupportType m_Create; - static SupportType m_Grow; - static SupportType m_Shrink; - static SupportType m_Move; - static SupportType m_Check; - static SupportType m_Copy; - static SupportType m_Backup; - static SupportType m_SetLabel; - static SupportType m_UpdateUUID; - static SupportType m_GetUUID; + static CommandSupportType m_GetUsed; + static CommandSupportType m_GetLabel; + static CommandSupportType m_Create; + static CommandSupportType m_Grow; + static CommandSupportType m_Shrink; + static CommandSupportType m_Move; + static CommandSupportType m_Check; + static CommandSupportType m_Copy; + static CommandSupportType m_Backup; + static CommandSupportType m_SetLabel; + static CommandSupportType m_UpdateUUID; + static CommandSupportType m_GetUUID; }; } diff --git a/src/fs/ufs.cpp b/src/fs/ufs.cpp index 4b3a020..72312be 100644 --- a/src/fs/ufs.cpp +++ b/src/fs/ufs.cpp @@ -21,9 +21,9 @@ namespace FS { - FileSystem::SupportType ufs::m_Move = FileSystem::SupportInternal; - FileSystem::SupportType ufs::m_Copy = FileSystem::SupportInternal; - FileSystem::SupportType ufs::m_Backup = FileSystem::SupportInternal; + FileSystem::CommandSupportType ufs::m_Move = FileSystem::SupportInternal; + FileSystem::CommandSupportType ufs::m_Copy = FileSystem::SupportInternal; + FileSystem::CommandSupportType ufs::m_Backup = FileSystem::SupportInternal; ufs::ufs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Ufs) diff --git a/src/fs/ufs.h b/src/fs/ufs.h index 0f1be4c..5d53044 100644 --- a/src/fs/ufs.h +++ b/src/fs/ufs.h @@ -40,14 +40,14 @@ namespace FS public: static void init() {} - virtual SupportType supportMove() const { return m_Move; } - virtual SupportType supportCopy() const { return m_Copy; } - virtual SupportType supportBackup() const { return m_Backup; } + virtual CommandSupportType supportMove() const { return m_Move; } + virtual CommandSupportType supportCopy() const { return m_Copy; } + virtual CommandSupportType supportBackup() const { return m_Backup; } protected: - static SupportType m_Move; - static SupportType m_Copy; - static SupportType m_Backup; + static CommandSupportType m_Move; + static CommandSupportType m_Copy; + static CommandSupportType m_Backup; }; } diff --git a/src/fs/unformatted.cpp b/src/fs/unformatted.cpp index dd7f9dd..d58690d 100644 --- a/src/fs/unformatted.cpp +++ b/src/fs/unformatted.cpp @@ -21,7 +21,7 @@ namespace FS { - FileSystem::SupportType unformatted::m_Create = FileSystem::SupportExternal; + FileSystem::CommandSupportType unformatted::m_Create = FileSystem::SupportExternal; unformatted::unformatted(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Unformatted) diff --git a/src/fs/unformatted.h b/src/fs/unformatted.h index 306b5bf..dd0dcd7 100644 --- a/src/fs/unformatted.h +++ b/src/fs/unformatted.h @@ -44,10 +44,10 @@ namespace FS virtual bool create(Report&, const QString&) const; - virtual SupportType supportCreate() const { return m_Create; } + virtual CommandSupportType supportCreate() const { return m_Create; } protected: - static SupportType m_Create; + static CommandSupportType m_Create; }; } diff --git a/src/fs/xfs.cpp b/src/fs/xfs.cpp index 64fcccd..d95081f 100644 --- a/src/fs/xfs.cpp +++ b/src/fs/xfs.cpp @@ -34,15 +34,15 @@ namespace FS { - FileSystem::SupportType xfs::m_GetUsed = FileSystem::SupportNone; - FileSystem::SupportType xfs::m_GetLabel = FileSystem::SupportNone; - FileSystem::SupportType xfs::m_Create = FileSystem::SupportNone; - FileSystem::SupportType xfs::m_Grow = FileSystem::SupportNone; - FileSystem::SupportType xfs::m_Move = FileSystem::SupportNone; - FileSystem::SupportType xfs::m_Check = FileSystem::SupportNone; - FileSystem::SupportType xfs::m_Copy = FileSystem::SupportNone; - FileSystem::SupportType xfs::m_Backup = FileSystem::SupportNone; - FileSystem::SupportType xfs::m_SetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType xfs::m_GetUsed = FileSystem::SupportNone; + FileSystem::CommandSupportType xfs::m_GetLabel = FileSystem::SupportNone; + FileSystem::CommandSupportType xfs::m_Create = FileSystem::SupportNone; + FileSystem::CommandSupportType xfs::m_Grow = FileSystem::SupportNone; + FileSystem::CommandSupportType xfs::m_Move = FileSystem::SupportNone; + FileSystem::CommandSupportType xfs::m_Check = FileSystem::SupportNone; + FileSystem::CommandSupportType xfs::m_Copy = FileSystem::SupportNone; + FileSystem::CommandSupportType xfs::m_Backup = FileSystem::SupportNone; + FileSystem::CommandSupportType xfs::m_SetLabel = FileSystem::SupportNone; xfs::xfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Xfs) diff --git a/src/fs/xfs.h b/src/fs/xfs.h index 51cb4c4..43fcf98 100644 --- a/src/fs/xfs.h +++ b/src/fs/xfs.h @@ -49,28 +49,28 @@ namespace FS virtual bool resize(Report& report, const QString& deviceNode, qint64 length) const; virtual bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel); - virtual SupportType supportGetUsed() const { return m_GetUsed; } - virtual SupportType supportGetLabel() const { return m_GetLabel; } - virtual SupportType supportCreate() const { return m_Create; } - virtual SupportType supportGrow() const { return m_Grow; } - virtual SupportType supportMove() const { return m_Move; } - virtual SupportType supportCheck() const { return m_Check; } - virtual SupportType supportCopy() const { return m_Copy; } - virtual SupportType supportBackup() const { return m_Backup; } - virtual SupportType supportSetLabel() const { return m_SetLabel; } + virtual CommandSupportType supportGetUsed() const { return m_GetUsed; } + virtual CommandSupportType supportGetLabel() const { return m_GetLabel; } + virtual CommandSupportType supportCreate() const { return m_Create; } + virtual CommandSupportType supportGrow() const { return m_Grow; } + virtual CommandSupportType supportMove() const { return m_Move; } + virtual CommandSupportType supportCheck() const { return m_Check; } + virtual CommandSupportType supportCopy() const { return m_Copy; } + virtual CommandSupportType supportBackup() const { return m_Backup; } + virtual CommandSupportType supportSetLabel() const { return m_SetLabel; } virtual qint64 minCapacity() const; protected: - static SupportType m_GetUsed; - static SupportType m_GetLabel; - static SupportType m_Create; - static SupportType m_Grow; - static SupportType m_Move; - static SupportType m_Check; - static SupportType m_Copy; - static SupportType m_Backup; - static SupportType m_SetLabel; + static CommandSupportType m_GetUsed; + static CommandSupportType m_GetLabel; + static CommandSupportType m_Create; + static CommandSupportType m_Grow; + static CommandSupportType m_Move; + static CommandSupportType m_Check; + static CommandSupportType m_Copy; + static CommandSupportType m_Backup; + static CommandSupportType m_SetLabel; }; } diff --git a/src/jobs/resizefilesystemjob.cpp b/src/jobs/resizefilesystemjob.cpp index bb21ca7..82f3c4f 100644 --- a/src/jobs/resizefilesystemjob.cpp +++ b/src/jobs/resizefilesystemjob.cpp @@ -76,7 +76,7 @@ bool ResizeFileSystemJob::run(Report& parent) { report->line() << i18nc("@info/plain", "Resizing file system from %1 to %2 sectors.", partition().fileSystem().length(), newLength()); - FileSystem::SupportType support = (newLength() < partition().fileSystem().length()) ? partition().fileSystem().supportShrink() : partition().fileSystem().supportGrow(); + FileSystem::CommandSupportType support = (newLength() < partition().fileSystem().length()) ? partition().fileSystem().supportShrink() : partition().fileSystem().supportGrow(); switch(support) {