From d1a82f65d4e00f598c2b8860d5aeab2d6fd49c80 Mon Sep 17 00:00:00 2001 From: Shubham Jangra Date: Wed, 12 Jun 2019 22:11:11 +0530 Subject: [PATCH] Revert "Remove redundant includes and refactor" This reverts commit 4229b02fd2fea2b445621524ccf4e31d018feb2a. --- src/fs/apfs.h | 4 ++++ src/fs/bitlocker.h | 4 ++++ src/fs/btrfs.cpp | 1 + src/fs/btrfs.h | 7 ++++++- src/fs/exfat.cpp | 2 ++ src/fs/exfat.h | 7 ++++++- src/fs/ext2.cpp | 1 + src/fs/ext2.h | 7 ++++++- src/fs/ext3.cpp | 2 ++ src/fs/ext3.h | 6 +++++- src/fs/ext4.cpp | 2 ++ src/fs/ext4.h | 7 ++++++- src/fs/extended.h | 7 ++++++- src/fs/f2fs.cpp | 1 + src/fs/f2fs.h | 4 ++++ src/fs/fat12.cpp | 2 ++ src/fs/fat12.h | 4 ++++ src/fs/fat16.cpp | 3 +++ src/fs/fat16.h | 2 ++ src/fs/fat32.cpp | 2 ++ src/fs/fat32.h | 7 ++++++- src/fs/filesystem.h | 2 ++ src/fs/filesystem_p.h | 2 ++ src/fs/filesystemfactory.h | 3 +++ src/fs/hfs.cpp | 2 ++ src/fs/hfs.h | 7 ++++++- src/fs/hfsplus.cpp | 2 ++ src/fs/hfsplus.h | 7 ++++++- src/fs/hpfs.cpp | 2 ++ src/fs/hpfs.h | 7 ++++++- src/fs/iso9660.h | 5 ++++- src/fs/jfs.cpp | 1 + src/fs/jfs.h | 7 ++++++- src/fs/linuxraidmember.h | 2 ++ src/fs/linuxswap.h | 7 ++++++- src/fs/luks.cpp | 1 + src/fs/luks.h | 3 +++ src/fs/luks2.h | 7 ++++++- src/fs/lvm2_pv.cpp | 2 ++ src/fs/lvm2_pv.h | 6 +++++- src/fs/nilfs2.cpp | 1 + src/fs/nilfs2.h | 7 ++++++- src/fs/ntfs.cpp | 2 ++ src/fs/ntfs.h | 7 ++++++- src/fs/ocfs2.cpp | 1 + src/fs/ocfs2.h | 7 ++++++- src/fs/reiser4.cpp | 1 + src/fs/reiser4.h | 7 ++++++- src/fs/reiserfs.cpp | 2 ++ src/fs/reiserfs.h | 7 ++++++- src/fs/udf.cpp | 2 ++ src/fs/udf.h | 7 ++++++- src/fs/ufs.h | 7 ++++++- src/fs/unformatted.h | 7 ++++++- src/fs/unknown.h | 2 ++ src/fs/xfs.cpp | 2 ++ src/fs/xfs.h | 7 ++++++- src/fs/zfs.cpp | 2 ++ src/fs/zfs.h | 7 ++++++- src/util/externalcommand.cpp | 2 ++ src/util/externalcommand.h | 2 ++ src/util/externalcommandhelper.cpp | 1 + src/util/externalcommandhelper.h | 1 + 63 files changed, 223 insertions(+), 25 deletions(-) diff --git a/src/fs/apfs.h b/src/fs/apfs.h index 94710d4..2af3a40 100644 --- a/src/fs/apfs.h +++ b/src/fs/apfs.h @@ -22,6 +22,10 @@ #include "fs/filesystem.h" +#include + +class QString; + namespace FS { /** An APFS file system. diff --git a/src/fs/bitlocker.h b/src/fs/bitlocker.h index 36123d4..493eb4d 100644 --- a/src/fs/bitlocker.h +++ b/src/fs/bitlocker.h @@ -22,6 +22,10 @@ #include "fs/filesystem.h" +#include + +class QString; + namespace FS { /** A Bitlocker encrypted file system. diff --git a/src/fs/btrfs.cpp b/src/fs/btrfs.cpp index 1d84802..c7c1edb 100644 --- a/src/fs/btrfs.cpp +++ b/src/fs/btrfs.cpp @@ -23,6 +23,7 @@ #include "util/report.h" #include +#include #include #include diff --git a/src/fs/btrfs.h b/src/fs/btrfs.h index 2d7402d..694f8c8 100644 --- a/src/fs/btrfs.h +++ b/src/fs/btrfs.h @@ -16,15 +16,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_BTRFS_H +#if !defined(KPMCORE_BTRFS_H) + #define KPMCORE_BTRFS_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** A btrfs file system. diff --git a/src/fs/exfat.cpp b/src/fs/exfat.cpp index 2880c3e..3173450 100644 --- a/src/fs/exfat.cpp +++ b/src/fs/exfat.cpp @@ -21,6 +21,8 @@ #include "util/externalcommand.h" #include "util/capacity.h" +#include + namespace FS { FileSystem::CommandSupportType exfat::m_GetUsed = FileSystem::cmdSupportNone; diff --git a/src/fs/exfat.h b/src/fs/exfat.h index 07238ea..55940b0 100644 --- a/src/fs/exfat.h +++ b/src/fs/exfat.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_EXFAT_H +#if !defined(KPMCORE_EXFAT_H) + #define KPMCORE_EXFAT_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** An exfat file system. diff --git a/src/fs/ext2.cpp b/src/fs/ext2.cpp index 431c14c..fce9274 100644 --- a/src/fs/ext2.cpp +++ b/src/fs/ext2.cpp @@ -22,6 +22,7 @@ #include "util/capacity.h" #include +#include namespace FS { diff --git a/src/fs/ext2.h b/src/fs/ext2.h index 3ab2ac8..ec2ca59 100644 --- a/src/fs/ext2.h +++ b/src/fs/ext2.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_EXT2_H +#if !defined(KPMCORE_EXT2_H) + #define KPMCORE_EXT2_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** An ext2 file system. diff --git a/src/fs/ext3.cpp b/src/fs/ext3.cpp index 07d3342..7fa67c9 100644 --- a/src/fs/ext3.cpp +++ b/src/fs/ext3.cpp @@ -20,6 +20,8 @@ #include "util/externalcommand.h" #include "util/capacity.h" +#include + namespace FS { ext3::ext3(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : diff --git a/src/fs/ext3.h b/src/fs/ext3.h index 1eb5b2b..23ac4df 100644 --- a/src/fs/ext3.h +++ b/src/fs/ext3.h @@ -15,7 +15,7 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_EXT3_H +#if !defined(KPMCORE_EXT3_H) #define KPMCORE_EXT3_H @@ -23,8 +23,12 @@ #include "fs/ext2.h" +#include + class Report; +class QString; + namespace FS { /** An ext3 file system. diff --git a/src/fs/ext4.cpp b/src/fs/ext4.cpp index 0c98520..0fa3811 100644 --- a/src/fs/ext4.cpp +++ b/src/fs/ext4.cpp @@ -20,6 +20,8 @@ #include "util/externalcommand.h" #include "util/capacity.h" +#include + namespace FS { ext4::ext4(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : diff --git a/src/fs/ext4.h b/src/fs/ext4.h index 7badd71..8050413 100644 --- a/src/fs/ext4.h +++ b/src/fs/ext4.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_EXT4_H +#if !defined(KPMCORE_EXT4_H) + #define KPMCORE_EXT4_H #include "util/libpartitionmanagerexport.h" #include "fs/ext2.h" +#include + class Report; +class QString; + namespace FS { /** An ext4 file system. diff --git a/src/fs/extended.h b/src/fs/extended.h index f5a426b..ef00a7c 100644 --- a/src/fs/extended.h +++ b/src/fs/extended.h @@ -15,13 +15,18 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_EXTENDED_H +#if !defined(KPMCORE_EXTENDED_H) + #define KPMCORE_EXTENDED_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + +class QString; + namespace FS { /** An extended file system. diff --git a/src/fs/f2fs.cpp b/src/fs/f2fs.cpp index 0d132f6..f8c62cb 100644 --- a/src/fs/f2fs.cpp +++ b/src/fs/f2fs.cpp @@ -23,6 +23,7 @@ #include +#include #include #include diff --git a/src/fs/f2fs.h b/src/fs/f2fs.h index 8577791..4d2d92b 100644 --- a/src/fs/f2fs.h +++ b/src/fs/f2fs.h @@ -22,8 +22,12 @@ #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** A f2fs file system. diff --git a/src/fs/fat12.cpp b/src/fs/fat12.cpp index 977babb..b4917fe 100644 --- a/src/fs/fat12.cpp +++ b/src/fs/fat12.cpp @@ -26,6 +26,8 @@ #include #include +#include +#include #include diff --git a/src/fs/fat12.h b/src/fs/fat12.h index a42f6a7..5a02895 100644 --- a/src/fs/fat12.h +++ b/src/fs/fat12.h @@ -23,8 +23,12 @@ #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** A fat12 file system. diff --git a/src/fs/fat16.cpp b/src/fs/fat16.cpp index 946bac0..69962de 100644 --- a/src/fs/fat16.cpp +++ b/src/fs/fat16.cpp @@ -24,6 +24,9 @@ #include +#include +#include + #include namespace FS diff --git a/src/fs/fat16.h b/src/fs/fat16.h index 686805e..ea988a5 100644 --- a/src/fs/fat16.h +++ b/src/fs/fat16.h @@ -23,6 +23,8 @@ class Report; +class QString; + namespace FS { /** A fat16 file system. diff --git a/src/fs/fat32.cpp b/src/fs/fat32.cpp index 0c915f7..2bb6b34 100644 --- a/src/fs/fat32.cpp +++ b/src/fs/fat32.cpp @@ -20,6 +20,8 @@ #include "util/externalcommand.h" #include "util/capacity.h" +#include + #include namespace FS diff --git a/src/fs/fat32.h b/src/fs/fat32.h index e5bf351..a356bf7 100644 --- a/src/fs/fat32.h +++ b/src/fs/fat32.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_FAT32_H +#if !defined(KPMCORE_FAT32_H) + #define KPMCORE_FAT32_H #include "util/libpartitionmanagerexport.h" #include "fs/fat16.h" +#include + class Report; +class QString; + namespace FS { /** A fat32 file system. diff --git a/src/fs/filesystem.h b/src/fs/filesystem.h index c7001f1..052a391 100644 --- a/src/fs/filesystem.h +++ b/src/fs/filesystem.h @@ -23,6 +23,8 @@ #include "util/libpartitionmanagerexport.h" #include +#include +#include #include #include diff --git a/src/fs/filesystem_p.h b/src/fs/filesystem_p.h index 3c8b8cf..ed410ba 100644 --- a/src/fs/filesystem_p.h +++ b/src/fs/filesystem_p.h @@ -20,6 +20,8 @@ #include "fs/filesystem.h" +#include + class FileSystemPrivate { public: FileSystem::Type m_Type; diff --git a/src/fs/filesystemfactory.h b/src/fs/filesystemfactory.h index 5d4ce18..6679bbc 100644 --- a/src/fs/filesystemfactory.h +++ b/src/fs/filesystemfactory.h @@ -23,6 +23,9 @@ #include "util/libpartitionmanagerexport.h" #include +#include + +class QString; /** Factory to create instances of FileSystem. @author Volker Lanz diff --git a/src/fs/hfs.cpp b/src/fs/hfs.cpp index 96e2d5a..15677fc 100644 --- a/src/fs/hfs.cpp +++ b/src/fs/hfs.cpp @@ -21,6 +21,8 @@ #include "util/externalcommand.h" #include "util/capacity.h" +#include + namespace FS { FileSystem::CommandSupportType hfs::m_GetUsed = FileSystem::cmdSupportNone; diff --git a/src/fs/hfs.h b/src/fs/hfs.h index 8650aeb..780dc72 100644 --- a/src/fs/hfs.h +++ b/src/fs/hfs.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_HFS_H +#if !defined(KPMCORE_HFS_H) + #define KPMCORE_HFS_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** An hfs file system. diff --git a/src/fs/hfsplus.cpp b/src/fs/hfsplus.cpp index f70f1e2..81341ff 100644 --- a/src/fs/hfsplus.cpp +++ b/src/fs/hfsplus.cpp @@ -21,6 +21,8 @@ #include "util/externalcommand.h" #include "util/capacity.h" +#include + namespace FS { FileSystem::CommandSupportType hfsplus::m_GetLabel = FileSystem::cmdSupportNone; diff --git a/src/fs/hfsplus.h b/src/fs/hfsplus.h index 82379c3..8f3e2d4 100644 --- a/src/fs/hfsplus.h +++ b/src/fs/hfsplus.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_HFSPLUS_H +#if !defined(KPMCORE_HFSPLUS_H) + #define KPMCORE_HFSPLUS_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** An hfsplus file system. diff --git a/src/fs/hpfs.cpp b/src/fs/hpfs.cpp index 3a8ec81..55c41a1 100644 --- a/src/fs/hpfs.cpp +++ b/src/fs/hpfs.cpp @@ -19,6 +19,8 @@ #include "util/capacity.h" +#include + namespace FS { FileSystem::CommandSupportType hpfs::m_GetUsed = FileSystem::cmdSupportNone; diff --git a/src/fs/hpfs.h b/src/fs/hpfs.h index 3269c71..7bbb9ba 100644 --- a/src/fs/hpfs.h +++ b/src/fs/hpfs.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_HPFS_H +#if !defined(KPMCORE_HPFS_H) + #define KPMCORE_HPFS_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** A hpfs file system. diff --git a/src/fs/iso9660.h b/src/fs/iso9660.h index 3c57c1e..f6b2192 100644 --- a/src/fs/iso9660.h +++ b/src/fs/iso9660.h @@ -15,7 +15,8 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_ISO9660_H +#if !defined(KPMCORE_ISO9660_H) + #define KPMCORE_ISO9660_H #include "util/libpartitionmanagerexport.h" @@ -24,6 +25,8 @@ class Report; +class QString; + namespace FS { /** A iso9660 file system. diff --git a/src/fs/jfs.cpp b/src/fs/jfs.cpp index 05eb2e5..dfb90a0 100644 --- a/src/fs/jfs.cpp +++ b/src/fs/jfs.cpp @@ -22,6 +22,7 @@ #include "util/capacity.h" #include +#include #include #include diff --git a/src/fs/jfs.h b/src/fs/jfs.h index f49e7aa..c67ab27 100644 --- a/src/fs/jfs.h +++ b/src/fs/jfs.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_JFS_H +#if !defined(KPMCORE_JFS_H) + #define KPMCORE_JFS_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** A JFS file system. diff --git a/src/fs/linuxraidmember.h b/src/fs/linuxraidmember.h index 5985354..aa71cdd 100644 --- a/src/fs/linuxraidmember.h +++ b/src/fs/linuxraidmember.h @@ -24,6 +24,8 @@ class Report; +class QString; + namespace FS { /** A linux_raid_member file system. diff --git a/src/fs/linuxswap.h b/src/fs/linuxswap.h index adc7da6..d36392b 100644 --- a/src/fs/linuxswap.h +++ b/src/fs/linuxswap.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_LINUXSWAP_H +#if !defined(KPMCORE_LINUXSWAP_H) + #define KPMCORE_LINUXSWAP_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** A linux swap pseudo file system. diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp index de67b23..6215554 100644 --- a/src/fs/luks.cpp +++ b/src/fs/luks.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include diff --git a/src/fs/luks.h b/src/fs/luks.h index 2ead990..7dddba1 100644 --- a/src/fs/luks.h +++ b/src/fs/luks.h @@ -24,8 +24,11 @@ #include "fs/filesystem.h" +#include + class Report; +class QString; class QWidget; namespace FS diff --git a/src/fs/luks2.h b/src/fs/luks2.h index 71df99d..cb014f8 100644 --- a/src/fs/luks2.h +++ b/src/fs/luks2.h @@ -15,13 +15,18 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_LUKS2_H +#if !defined(KPMCORE_LUKS2_H) + #define KPMCORE_LUKS2_H #include "util/libpartitionmanagerexport.h" #include "fs/luks.h" +#include + +class QString; + namespace FS { /** A LUKS2 crypto file system. diff --git a/src/fs/lvm2_pv.cpp b/src/fs/lvm2_pv.cpp index e5e7477..6a3a4c7 100644 --- a/src/fs/lvm2_pv.cpp +++ b/src/fs/lvm2_pv.cpp @@ -22,6 +22,8 @@ #include "util/externalcommand.h" #include "util/capacity.h" +#include + #include namespace FS diff --git a/src/fs/lvm2_pv.h b/src/fs/lvm2_pv.h index 50066e5..15bbd92 100644 --- a/src/fs/lvm2_pv.h +++ b/src/fs/lvm2_pv.h @@ -16,7 +16,8 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_LVM2_PV_H +#if !defined(KPMCORE_LVM2_PV_H) + #define KPMCORE_LVM2_PV_H #include "util/libpartitionmanagerexport.h" @@ -24,7 +25,10 @@ #include "core/partition.h" #include "fs/filesystem.h" +#include + class Report; +class QString; /** Stores information about LVM PV or potentially encrypted LVM PV * @author Andrius Štikonas diff --git a/src/fs/nilfs2.cpp b/src/fs/nilfs2.cpp index 3c53b3f..5fd15a1 100644 --- a/src/fs/nilfs2.cpp +++ b/src/fs/nilfs2.cpp @@ -25,6 +25,7 @@ #include #include +#include #include #include diff --git a/src/fs/nilfs2.h b/src/fs/nilfs2.h index dfe0108..9432208 100644 --- a/src/fs/nilfs2.h +++ b/src/fs/nilfs2.h @@ -16,15 +16,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_NILFS2_H +#if !defined(KPMCORE_NILFS2_H) + #define KPMCORE_NILFS2_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** A nilfs2 file system. diff --git a/src/fs/ntfs.cpp b/src/fs/ntfs.cpp index 47dc39b..8639383 100644 --- a/src/fs/ntfs.cpp +++ b/src/fs/ntfs.cpp @@ -26,6 +26,8 @@ #include #include +#include +#include #include #include diff --git a/src/fs/ntfs.h b/src/fs/ntfs.h index 09feb94..c1d409e 100644 --- a/src/fs/ntfs.h +++ b/src/fs/ntfs.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_NTFS_H +#if !defined(KPMCORE_NTFS_H) + #define KPMCORE_NTFS_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** An NTFS file system. diff --git a/src/fs/ocfs2.cpp b/src/fs/ocfs2.cpp index 6647d20..af8eaaa 100644 --- a/src/fs/ocfs2.cpp +++ b/src/fs/ocfs2.cpp @@ -22,6 +22,7 @@ #include "util/capacity.h" #include +#include namespace FS { diff --git a/src/fs/ocfs2.h b/src/fs/ocfs2.h index 44b0ebd..1a86172 100644 --- a/src/fs/ocfs2.h +++ b/src/fs/ocfs2.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_OCFS2_H +#if !defined(KPMCORE_OCFS2_H) + #define KPMCORE_OCFS2_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** A ocfs2 file system. diff --git a/src/fs/reiser4.cpp b/src/fs/reiser4.cpp index c367411..38e1d1e 100644 --- a/src/fs/reiser4.cpp +++ b/src/fs/reiser4.cpp @@ -22,6 +22,7 @@ #include "util/externalcommand.h" #include +#include namespace FS { diff --git a/src/fs/reiser4.h b/src/fs/reiser4.h index c35ffce..34f4a13 100644 --- a/src/fs/reiser4.h +++ b/src/fs/reiser4.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_REISER4_H +#if !defined(KPMCORE_REISER4_H) + #define KPMCORE_REISER4_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** A Reiser4 file system. diff --git a/src/fs/reiserfs.cpp b/src/fs/reiserfs.cpp index 553196d..5bfeb06 100644 --- a/src/fs/reiserfs.cpp +++ b/src/fs/reiserfs.cpp @@ -22,6 +22,8 @@ #include "util/capacity.h" #include +#include +#include #include namespace FS diff --git a/src/fs/reiserfs.h b/src/fs/reiserfs.h index 219f430..598c4d2 100644 --- a/src/fs/reiserfs.h +++ b/src/fs/reiserfs.h @@ -15,7 +15,8 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_REISERFS_H +#if !defined(KPMCORE_REISERFS_H) + #define KPMCORE_REISERFS_H #include "util/libpartitionmanagerexport.h" @@ -24,8 +25,12 @@ #include "util/capacity.h" +#include + class Report; +class QString; + namespace FS { /** A ReiserFS file system. diff --git a/src/fs/udf.cpp b/src/fs/udf.cpp index 90d90bb..b0d28a9 100644 --- a/src/fs/udf.cpp +++ b/src/fs/udf.cpp @@ -25,6 +25,8 @@ #include #include +#include +#include namespace FS { diff --git a/src/fs/udf.h b/src/fs/udf.h index 511982f..f49df36 100644 --- a/src/fs/udf.h +++ b/src/fs/udf.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_UDF_H +#if !defined(KPMCORE_UDF_H) + #define KPMCORE_UDF_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** A udf file system. diff --git a/src/fs/ufs.h b/src/fs/ufs.h index 4d057d2..2c67f92 100644 --- a/src/fs/ufs.h +++ b/src/fs/ufs.h @@ -15,13 +15,18 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_UFS_H +#if !defined(KPMCORE_UFS_H) + #define KPMCORE_UFS_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + +class QString; + namespace FS { /** A UFS file system. diff --git a/src/fs/unformatted.h b/src/fs/unformatted.h index 2d1234c..8c66407 100644 --- a/src/fs/unformatted.h +++ b/src/fs/unformatted.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_UNFORMATTED_H +#if !defined(KPMCORE_UNFORMATTED_H) + #define KPMCORE_UNFORMATTED_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** A pseudo file system for unformatted partitions. diff --git a/src/fs/unknown.h b/src/fs/unknown.h index bb5cff6..cf87ca4 100644 --- a/src/fs/unknown.h +++ b/src/fs/unknown.h @@ -22,6 +22,8 @@ #include "fs/filesystem.h" +#include + namespace FS { /** A pseudo file system for partitions whose file system we cannot determine. diff --git a/src/fs/xfs.cpp b/src/fs/xfs.cpp index 0e20295..25d2ef3 100644 --- a/src/fs/xfs.cpp +++ b/src/fs/xfs.cpp @@ -23,6 +23,8 @@ #include "util/report.h" #include +#include +#include #include #include diff --git a/src/fs/xfs.h b/src/fs/xfs.h index b9e489f..3199c93 100644 --- a/src/fs/xfs.h +++ b/src/fs/xfs.h @@ -15,15 +15,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_XFS_H +#if !defined(KPMCORE_XFS_H) + #define KPMCORE_XFS_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** An XFS file system. diff --git a/src/fs/zfs.cpp b/src/fs/zfs.cpp index 0455bb7..a3cb201 100644 --- a/src/fs/zfs.cpp +++ b/src/fs/zfs.cpp @@ -22,6 +22,8 @@ #include "util/capacity.h" #include "util/report.h" +#include + namespace FS { FileSystem::CommandSupportType zfs::m_GetUsed = FileSystem::cmdSupportNone; diff --git a/src/fs/zfs.h b/src/fs/zfs.h index 9996614..c87f971 100644 --- a/src/fs/zfs.h +++ b/src/fs/zfs.h @@ -16,15 +16,20 @@ * along with this program. If not, see .* *************************************************************************/ -#ifndef KPMCORE_ZFS_H +#if !defined(KPMCORE_ZFS_H) + #define KPMCORE_ZFS_H #include "util/libpartitionmanagerexport.h" #include "fs/filesystem.h" +#include + class Report; +class QString; + namespace FS { /** A zfs file system. diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp index e73a10d..5ed64c1 100644 --- a/src/util/externalcommand.cpp +++ b/src/util/externalcommand.cpp @@ -36,6 +36,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/src/util/externalcommand.h b/src/util/externalcommand.h index 4a5d980..c36c42e 100644 --- a/src/util/externalcommand.h +++ b/src/util/externalcommand.h @@ -23,6 +23,8 @@ #include #include +#include +#include #include #include #include diff --git a/src/util/externalcommandhelper.cpp b/src/util/externalcommandhelper.cpp index 845738c..9e96966 100644 --- a/src/util/externalcommandhelper.cpp +++ b/src/util/externalcommandhelper.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/src/util/externalcommandhelper.h b/src/util/externalcommandhelper.h index ef7539b..6d7029b 100644 --- a/src/util/externalcommandhelper.h +++ b/src/util/externalcommandhelper.h @@ -24,6 +24,7 @@ #include #include +#include #include using namespace KAuth;