From 4a08fdbb92fbdd1dd5ec13bfb99ceca6fd2fb407 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 1 Nov 2020 00:20:17 +0100
Subject: [PATCH] [partition] Reduce warnings from KPMCore

- make KPMHelper.h an "everything include" and suppress warnings
  from it, then use it in the tests.
---
 src/libcalamares/partition/KPMHelper.h             | 7 +++++++
 src/modules/partition/tests/CreateLayoutsTests.cpp | 4 ----
 src/modules/partition/tests/CreateLayoutsTests.h   | 3 ++-
 src/modules/partition/tests/PartitionJobTests.h    | 7 +------
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/libcalamares/partition/KPMHelper.h b/src/libcalamares/partition/KPMHelper.h
index 900c973a2..f6007b119 100644
--- a/src/libcalamares/partition/KPMHelper.h
+++ b/src/libcalamares/partition/KPMHelper.h
@@ -24,9 +24,16 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 #pragma clang diagnostic ignored "-Wsuggest-destructor-override"
+#pragma clang diagnostic ignored "-Winconsistent-missing-destructor-override"
 #endif
 
 #include <backend/corebackend.h>
+#include <core/device.h>
+#include <core/lvmdevice.h>
+#include <core/partition.h>
+#include <core/partitionrole.h>
+#include <core/partitiontable.h>
+#include <fs/filesystem.h>
 #include <fs/filesystemfactory.h>
 
 #ifdef __clang__
diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp
index 6a56eee99..fb991fc82 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.cpp
+++ b/src/modules/partition/tests/CreateLayoutsTests.cpp
@@ -15,10 +15,6 @@
 #include "partition/KPMManager.h"
 #include "utils/Logger.h"
 
-#include <core/lvmdevice.h>
-#include <core/partition.h>
-#include <fs/filesystemfactory.h>
-
 #include <memory>
 
 #include <QtTest/QtTest>
diff --git a/src/modules/partition/tests/CreateLayoutsTests.h b/src/modules/partition/tests/CreateLayoutsTests.h
index 2ecc7b634..5953b06a7 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.h
+++ b/src/modules/partition/tests/CreateLayoutsTests.h
@@ -10,8 +10,9 @@
 #ifndef CLEARMOUNTSJOBTESTS_H
 #define CLEARMOUNTSJOBTESTS_H
 
+#include "partition/KPMHelper.h"
+
 #include <QObject>
-#include <core/device.h>
 
 class CreateLayoutsTests : public QObject
 {
diff --git a/src/modules/partition/tests/PartitionJobTests.h b/src/modules/partition/tests/PartitionJobTests.h
index c2c01088f..9e4455ddc 100644
--- a/src/modules/partition/tests/PartitionJobTests.h
+++ b/src/modules/partition/tests/PartitionJobTests.h
@@ -12,12 +12,7 @@
 
 #include "JobQueue.h"
 
-// CalaPM
-#include <core/device.h>
-#include <core/partition.h>
-#include <core/partitionrole.h>
-#include <core/partitiontable.h>
-#include <fs/filesystem.h>
+#include "partition/KPMHelper.h"
 
 // Qt
 #include <QObject>