From a610e246861b1f474175c88d7559b6d800b630a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Tue, 17 May 2016 19:05:17 +0100
Subject: [PATCH] Move luks init code to constructor.

---
 src/fs/luks.cpp                            | 28 +++++-----------------
 src/fs/luks.h                              |  1 -
 src/plugins/libparted/libpartedbackend.cpp |  1 -
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp
index e947f86..95d1c7a 100644
--- a/src/fs/luks.cpp
+++ b/src/fs/luks.cpp
@@ -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;
diff --git a/src/fs/luks.h b/src/fs/luks.h
index cbba23f..f9a4832 100644
--- a/src/fs/luks.h
+++ b/src/fs/luks.h
@@ -44,7 +44,6 @@ public:
     virtual ~luks();
 
 public:
-    void init() override;
     qint64 readUsedCapacity(const QString& deviceNode) const override;
 
     CommandSupportType supportGetUsed() const override {
diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp
index da34ab9..eae3865 100644
--- a/src/plugins/libparted/libpartedbackend.cpp
+++ b/src/plugins/libparted/libpartedbackend.cpp
@@ -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);