Revert "Remove redundant includes and refactor"

This reverts commit 4229b02fd2.

src/fs/apfs.h

@@ -22,6 +22,10 @@
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
+class QString;
+
 namespace FS
 {
 /** An APFS file system.

src/fs/bitlocker.h

@@ -22,6 +22,10 @@
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
+class QString;
+
 namespace FS
 {
 /** A Bitlocker encrypted file system.

src/fs/btrfs.cpp

@@ -23,6 +23,7 @@
 #include "util/report.h"
 
 #include <QRegularExpression>
+#include <QString>
 #include <QTemporaryDir>
 
 #include <KLocalizedString>

src/fs/btrfs.h

@@ -16,15 +16,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_BTRFS_H
+#if !defined(KPMCORE_BTRFS_H)
+
 #define KPMCORE_BTRFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A btrfs file system.

src/fs/exfat.cpp

@@ -21,6 +21,8 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
+#include <QString>
+
 namespace FS
 {
 FileSystem::CommandSupportType exfat::m_GetUsed = FileSystem::cmdSupportNone;

src/fs/exfat.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_EXFAT_H
+#if !defined(KPMCORE_EXFAT_H)
+
 #define KPMCORE_EXFAT_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** An exfat file system.

src/fs/ext2.cpp

@@ -22,6 +22,7 @@
 #include "util/capacity.h"
 
 #include <QRegularExpression>
+#include <QString>
 
 namespace FS
 {

src/fs/ext2.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_EXT2_H
+#if !defined(KPMCORE_EXT2_H)
+
 #define KPMCORE_EXT2_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** An ext2 file system.

src/fs/ext3.cpp

@@ -20,6 +20,8 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
+#include <QStringList>
+
 namespace FS
 {
 ext3::ext3(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) :

src/fs/ext3.h

@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_EXT3_H
+#if !defined(KPMCORE_EXT3_H)
 
 #define KPMCORE_EXT3_H
 
@@ -23,8 +23,12 @@
 
 #include "fs/ext2.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** An ext3 file system.

src/fs/ext4.cpp

@@ -20,6 +20,8 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
+#include <QStringList>
+
 namespace FS
 {
 ext4::ext4(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) :

src/fs/ext4.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_EXT4_H
+#if !defined(KPMCORE_EXT4_H)
+
 #define KPMCORE_EXT4_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/ext2.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** An ext4 file system.

src/fs/extended.h

@@ -15,13 +15,18 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_EXTENDED_H
+#if !defined(KPMCORE_EXTENDED_H)
+
 #define KPMCORE_EXTENDED_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
+class QString;
+
 namespace FS
 {
 /** An extended file system.

src/fs/f2fs.cpp

@@ -23,6 +23,7 @@
 
 #include <cmath>
 
+#include <QString>
 #include <QTemporaryDir>
 #include <QUuid>
 

src/fs/f2fs.h

@@ -22,8 +22,12 @@
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A f2fs file system.

src/fs/fat12.cpp

@@ -26,6 +26,8 @@
 
 #include <QRegularExpression>
 #include <QRegularExpressionValidator>
+#include <QString>
+#include <QStringList>
 
 #include <ctime>
 

src/fs/fat12.h

@@ -23,8 +23,12 @@
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A fat12 file system.

src/fs/fat16.cpp

@@ -24,6 +24,9 @@
 
 #include <KLocalizedString>
 
+#include <QString>
+#include <QStringList>
+
 #include <ctime>
 
 namespace FS

src/fs/fat16.h

@@ -23,6 +23,8 @@
 
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A fat16 file system.

src/fs/fat32.cpp

@@ -20,6 +20,8 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
+#include <QStringList>
+
 #include <ctime>
 
 namespace FS

src/fs/fat32.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_FAT32_H
+#if !defined(KPMCORE_FAT32_H)
+
 #define KPMCORE_FAT32_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/fat16.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A fat32 file system.

src/fs/filesystem.h

@@ -23,6 +23,8 @@
 #include "util/libpartitionmanagerexport.h"
 
 #include <QList>
+#include <QStringList>
+#include <QString>
 #include <QtGlobal>
 #include <QUrl>
 

src/fs/filesystem_p.h

@@ -20,6 +20,8 @@
 
 #include "fs/filesystem.h"
 
+#include <QString>
+
 class FileSystemPrivate {
 public:
     FileSystem::Type m_Type;

src/fs/filesystemfactory.h

@@ -23,6 +23,9 @@
 #include "util/libpartitionmanagerexport.h"
 
 #include <QMap>
+#include <QtGlobal>
+
+class QString;
 
 /** Factory to create instances of FileSystem.
     @author Volker Lanz <vl@fidra.de>

src/fs/hfs.cpp

@@ -21,6 +21,8 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
+#include <QStringList>
+
 namespace FS
 {
 FileSystem::CommandSupportType hfs::m_GetUsed = FileSystem::cmdSupportNone;

src/fs/hfs.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_HFS_H
+#if !defined(KPMCORE_HFS_H)
+
 #define KPMCORE_HFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** An hfs file system.

src/fs/hfsplus.cpp

@@ -21,6 +21,8 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
+#include <QStringList>
+
 namespace FS
 {
 FileSystem::CommandSupportType hfsplus::m_GetLabel = FileSystem::cmdSupportNone;

src/fs/hfsplus.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_HFSPLUS_H
+#if !defined(KPMCORE_HFSPLUS_H)
+
 #define KPMCORE_HFSPLUS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** An hfsplus file system.

src/fs/hpfs.cpp

@@ -19,6 +19,8 @@
 
 #include "util/capacity.h"
 
+#include <QString>
+
 namespace FS
 {
 FileSystem::CommandSupportType hpfs::m_GetUsed = FileSystem::cmdSupportNone;

src/fs/hpfs.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_HPFS_H
+#if !defined(KPMCORE_HPFS_H)
+
 #define KPMCORE_HPFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A hpfs file system.

src/fs/iso9660.h

@@ -15,7 +15,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#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.

src/fs/jfs.cpp

@@ -22,6 +22,7 @@
 #include "util/capacity.h"
 
 #include <QRegularExpression>
+#include <QStringList>
 #include <QTemporaryDir>
 
 #include <KLocalizedString>

src/fs/jfs.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_JFS_H
+#if !defined(KPMCORE_JFS_H)
+
 #define KPMCORE_JFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A JFS file system.

src/fs/linuxraidmember.h

@@ -24,6 +24,8 @@
 
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A linux_raid_member file system.

src/fs/linuxswap.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_LINUXSWAP_H
+#if !defined(KPMCORE_LINUXSWAP_H)
+
 #define KPMCORE_LINUXSWAP_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A linux swap pseudo file system.

src/fs/luks.cpp

@@ -37,6 +37,7 @@
 #include <QRegularExpression>
 #include <QPointer>
 #include <QStorageInfo>
+#include <QString>
 #include <QUuid>
 #include <QWidget>
 

src/fs/luks.h

@@ -24,8 +24,11 @@
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
 class QWidget;
 
 namespace FS

src/fs/luks2.h

@@ -15,13 +15,18 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_LUKS2_H
+#if !defined(KPMCORE_LUKS2_H)
+
 #define KPMCORE_LUKS2_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/luks.h"
 
+#include <QtGlobal>
+
+class QString;
+
 namespace FS
 {
 /** A LUKS2 crypto file system.

src/fs/lvm2_pv.cpp

@@ -22,6 +22,8 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
+#include <QString>
+
 #include <KLocalizedString>
 
 namespace FS

src/fs/lvm2_pv.h

@@ -16,7 +16,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#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 <QtGlobal>
+
 class Report;
+class QString;
 
 /** Stores information about LVM PV or potentially encrypted LVM PV
  * @author Andrius Štikonas <andrius@stikonas.eu>

src/fs/nilfs2.cpp

@@ -25,6 +25,7 @@
 #include <cmath>
 
 #include <QRegularExpression>
+#include <QString>
 #include <QTemporaryDir>
 #include <QUuid>
 

src/fs/nilfs2.h

@@ -16,15 +16,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_NILFS2_H
+#if !defined(KPMCORE_NILFS2_H)
+
 #define KPMCORE_NILFS2_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A nilfs2 file system.

src/fs/ntfs.cpp

@@ -26,6 +26,8 @@
 #include <KLocalizedString>
 
 #include <QRegularExpression>
+#include <QString>
+#include <QStringList>
 #include <QFile>
 
 #include <algorithm>

src/fs/ntfs.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_NTFS_H
+#if !defined(KPMCORE_NTFS_H)
+
 #define KPMCORE_NTFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** An NTFS file system.

src/fs/ocfs2.cpp

@@ -22,6 +22,7 @@
 #include "util/capacity.h"
 
 #include <QRegularExpression>
+#include <QString>
 
 namespace FS
 {

src/fs/ocfs2.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_OCFS2_H
+#if !defined(KPMCORE_OCFS2_H)
+
 #define KPMCORE_OCFS2_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A ocfs2 file system.

src/fs/reiser4.cpp

@@ -22,6 +22,7 @@
 #include "util/externalcommand.h"
 
 #include <QRegularExpression>
+#include <QStringList>
 
 namespace FS
 {

src/fs/reiser4.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_REISER4_H
+#if !defined(KPMCORE_REISER4_H)
+
 #define KPMCORE_REISER4_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A Reiser4 file system.

src/fs/reiserfs.cpp

@@ -22,6 +22,8 @@
 #include "util/capacity.h"
 
 #include <QRegularExpression>
+#include <QString>
+#include <QStringList>
 #include <QUuid>
 
 namespace FS

src/fs/reiserfs.h

@@ -15,7 +15,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#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 <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A ReiserFS file system.

src/fs/udf.cpp

@@ -25,6 +25,8 @@
 
 #include <QRegularExpression>
 #include <QRegularExpressionValidator>
+#include <QString>
+#include <QStringList>
 
 namespace FS
 {

src/fs/udf.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_UDF_H
+#if !defined(KPMCORE_UDF_H)
+
 #define KPMCORE_UDF_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A udf file system.

src/fs/ufs.h

@@ -15,13 +15,18 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_UFS_H
+#if !defined(KPMCORE_UFS_H)
+
 #define KPMCORE_UFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
+class QString;
+
 namespace FS
 {
 /** A UFS file system.

src/fs/unformatted.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_UNFORMATTED_H
+#if !defined(KPMCORE_UNFORMATTED_H)
+
 #define KPMCORE_UNFORMATTED_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A pseudo file system for unformatted partitions.

src/fs/unknown.h

@@ -22,6 +22,8 @@
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 namespace FS
 {
 /** A pseudo file system for partitions whose file system we cannot determine.

src/fs/xfs.cpp

@@ -23,6 +23,8 @@
 #include "util/report.h"
 
 #include <QRegularExpression>
+#include <QString>
+#include <QStringList>
 #include <QTemporaryDir>
 
 #include <KLocalizedString>

src/fs/xfs.h

@@ -15,15 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_XFS_H
+#if !defined(KPMCORE_XFS_H)
+
 #define KPMCORE_XFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** An XFS file system.

src/fs/zfs.cpp

@@ -22,6 +22,8 @@
 #include "util/capacity.h"
 #include "util/report.h"
 
+#include <QString>
+
 namespace FS
 {
 FileSystem::CommandSupportType zfs::m_GetUsed = FileSystem::cmdSupportNone;

src/fs/zfs.h

@@ -16,15 +16,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef KPMCORE_ZFS_H
+#if !defined(KPMCORE_ZFS_H)
+
 #define KPMCORE_ZFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
+#include <QtGlobal>
+
 class Report;
 
+class QString;
+
 namespace FS
 {
 /** A zfs file system.

src/util/externalcommand.cpp

@@ -36,6 +36,8 @@
 #include <QEventLoop>
 #include <QtGlobal>
 #include <QStandardPaths>
+#include <QString>
+#include <QStringList>
 #include <QTimer>
 #include <QThread>
 #include <QVariant>

src/util/externalcommand.h

@@ -23,6 +23,8 @@
 
 #include <QDebug>
 #include <QProcess>
+#include <QString>
+#include <QStringList>
 #include <QtGlobal>
 #include <QThread>
 #include <QVariant>

src/util/externalcommandhelper.cpp

@@ -22,6 +22,7 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QFile>
+#include <QString>
 #include <QTime>
 #include <QVariant>
 

src/util/externalcommandhelper.h

@@ -24,6 +24,7 @@
 #include <KAuth>
 
 #include <QEventLoop>
+#include <QString>
 #include <QProcess>
 
 using namespace KAuth;