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

Move luks init code to constructor.

This commit is contained in:
Andrius Štikonas 2016-05-17 19:05:17 +01:00
parent 142ff07938
commit a610e24686
3 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/fs/luks.cpp
View File

@ -46,28 +46,7 @@ luks::luks(qint64 firstsector,
, m_isCryptOpen(false)
, m_isMounted(false)
{
m_GetUsed = FileSystem::cmdSupportNone;
m_GetLabel = FileSystem::cmdSupportNone;
m_Create = FileSystem::cmdSupportNone;
m_Grow = FileSystem::cmdSupportNone;
m_Shrink = FileSystem::cmdSupportNone;
m_Move = FileSystem::cmdSupportNone;
m_Check = FileSystem::cmdSupportNone;
m_Copy = FileSystem::cmdSupportNone;
m_Backup = FileSystem::cmdSupportNone;
m_SetLabel = FileSystem::cmdSupportNone;
m_UpdateUUID = FileSystem::cmdSupportNone;
m_GetUUID = FileSystem::cmdSupportNone;
}
luks::~luks()
{
delete m_innerFs;
}
void luks::init()
{
// m_Create = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone;
// m_Create = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone;
m_SetLabel = cmdSupportNone;
m_GetLabel = cmdSupportFileSystem;
m_UpdateUUID = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone;
@ -81,6 +60,11 @@ void luks::init()
m_GetUUID = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone;
}
luks::~luks()
{
delete m_innerFs;
}
bool luks::supportToolFound() const
{
m_cryptsetupFound = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone;

1
src/fs/luks.h
View File

@ -44,7 +44,6 @@ public:
virtual ~luks();
public:
void init() override;
qint64 readUsedCapacity(const QString& deviceNode) const override;
CommandSupportType supportGetUsed() const override {

1
src/plugins/libparted/libpartedbackend.cpp
View File

@ -361,7 +361,6 @@ void LibPartedBackend::scanDevicePartitions(Device& d, PedDisk* pedDisk)
if (type == FileSystem::Luks) {
r |= PartitionRole::Luks;
FS::luks* luksFs = dynamic_cast<FS::luks*>(fs);
luksFs->init();
QString mapperNode = FS::luks::mapperName(node);
bool isCryptOpen = !mapperNode.isEmpty();
luksFs->setCryptOpen(isCryptOpen);