From 6c433c264cd737695e6207efdc1c1baf543b028e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 11 Sep 2017 12:19:49 +0100 Subject: [PATCH] Port FileSystem::luks away from KDiskFreeSpaceInfo. --- src/fs/luks.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp index 5170f7e..0796487 100644 --- a/src/fs/luks.cpp +++ b/src/fs/luks.cpp @@ -36,10 +36,10 @@ #include #include #include +#include #include #include -#include #include #include @@ -337,7 +337,7 @@ void luks::loadInnerFileSystem(const QString& mapperNode) setLabel(m_innerFs->readLabel(mapperNode)); setUUID(m_innerFs->readUUID(mapperNode)); if (m_innerFs->supportGetUsed() == FileSystem::cmdSupportFileSystem) - setSectorsUsed(std::ceil((m_innerFs->readUsedCapacity(mapperNode) + payloadOffset()) / static_cast(sectorSize()) )); + setSectorsUsed(std::ceil((m_innerFs->readUsedCapacity(mapperNode) + payloadOffset()) / static_cast(sectorSize()) )); m_innerFs->scan(mapperNode); } @@ -393,9 +393,9 @@ bool luks::mount(Report& report, const QString& deviceNode, const QString& mount { m_isMounted = true; - const KDiskFreeSpaceInfo freeSpaceInfo = KDiskFreeSpaceInfo::freeSpaceInfo(mountPoint); - if (freeSpaceInfo.isValid() && !mountPoint.isEmpty()) - setSectorsUsed((freeSpaceInfo.used() + payloadOffset()) / sectorSize()); + const QStorageInfo storageInfo = QStorageInfo(mountPoint); + if (storageInfo.isValid() && !mountPoint.isEmpty()) + setSectorsUsed( (storageInfo.bytesTotal() - storageInfo.bytesFree() + payloadOffset()) / sectorSize()); return true; }