From 3f2e5b0b692775166cdd82368f0d49d8fac73886 Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Wed, 15 Sep 2021 23:32:48 +0100
Subject: [PATCH] Remove barely-used aggregate headers

---
 src/blackcore/context/contextallempties.h      | 18 ------------------
 src/blackcore/context/contextallimpl.h         | 10 ----------
 src/blackcore/context/contextallinterfaces.h   | 10 ----------
 src/blackcore/context/contextallproxies.h      | 10 ----------
 src/blackgui/pch/pch.h                         |  6 +++++-
 .../context/testcontext/testcontext.cpp        |  6 +++++-
 6 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 src/blackcore/context/contextallempties.h
 delete mode 100644 src/blackcore/context/contextallimpl.h
 delete mode 100644 src/blackcore/context/contextallinterfaces.h
 delete mode 100644 src/blackcore/context/contextallproxies.h

diff --git a/src/blackcore/context/contextallempties.h b/src/blackcore/context/contextallempties.h
deleted file mode 100644
index d10205df0..000000000
--- a/src/blackcore/context/contextallempties.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright (C) 2013
- * swift Project Community / Contributors
- *
- * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
- * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated,
- * or distributed except according to the terms contained in the LICENSE file.
- */
-
-#ifndef BLACKCORE_CONTEXT_CONTEXT_ALL_EMPTIES_H
-#define BLACKCORE_CONTEXT_CONTEXT_ALL_EMPTIES_H
-
-#include "contextapplicationempty.h"
-#include "contextaudioempty.h"
-#include "contextnetworkempty.h"
-#include "contextownaircraftempty.h"
-#include "contextsimulatorempty.h"
-
-#endif // guard
diff --git a/src/blackcore/context/contextallimpl.h b/src/blackcore/context/contextallimpl.h
deleted file mode 100644
index 2c233c444..000000000
--- a/src/blackcore/context/contextallimpl.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef BLACKCORE_CONTEXT_CONTEXT_ALL_IMPL_H
-#define BLACKCORE_CONTEXT_CONTEXT_ALL_IMPL_H
-
-#include "contextapplicationimpl.h"
-#include "contextaudioimpl.h"
-#include "contextnetworkimpl.h"
-#include "contextownaircraftimpl.h"
-#include "contextsimulatorimpl.h"
-
-#endif // guard
diff --git a/src/blackcore/context/contextallinterfaces.h b/src/blackcore/context/contextallinterfaces.h
deleted file mode 100644
index 6d72801ad..000000000
--- a/src/blackcore/context/contextallinterfaces.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef BLACKCORE_CONTEXT_CONTEXT_ALL_ITERFACES_H
-#define BLACKCORE_CONTEXT_CONTEXT_ALL_ITERFACES_H
-
-#include "contextapplication.h"
-#include "contextaudio.h"
-#include "contextnetwork.h"
-#include "contextownaircraft.h"
-#include "contextsimulator.h"
-
-#endif // guard
diff --git a/src/blackcore/context/contextallproxies.h b/src/blackcore/context/contextallproxies.h
deleted file mode 100644
index cee4781d9..000000000
--- a/src/blackcore/context/contextallproxies.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef BLACKCORE_CONTEXT_CONTEXT_ALL_PROXIES_H
-#define BLACKCORE_CONTEXT_CONTEXT_ALL_PROXIES_H
-
-#include "contextapplicationproxy.h"
-#include "contextaudioproxy.h"
-#include "contextnetworkproxy.h"
-#include "contextownaircraftproxy.h"
-#include "contextsimulatorproxy.h"
-
-#endif // guard
diff --git a/src/blackgui/pch/pch.h b/src/blackgui/pch/pch.h
index 405965561..2bb69e17f 100644
--- a/src/blackgui/pch/pch.h
+++ b/src/blackgui/pch/pch.h
@@ -24,7 +24,11 @@
 
 #ifdef __cplusplus
 
-#include "blackcore/context/contextallinterfaces.h"
+#include "blackcore/context/contextapplication.h"
+#include "blackcore/context/contextaudio.h"
+#include "blackcore/context/contextnetwork.h"
+#include "blackcore/context/contextownaircraft.h"
+#include "blackcore/context/contextsimulator.h"
 
 #include <QAbstractButton>
 #include <QAbstractItemModel>
diff --git a/tests/blackcore/context/testcontext/testcontext.cpp b/tests/blackcore/context/testcontext/testcontext.cpp
index f75a6af3c..01a514771 100644
--- a/tests/blackcore/context/testcontext/testcontext.cpp
+++ b/tests/blackcore/context/testcontext/testcontext.cpp
@@ -10,7 +10,11 @@
 //! \file
 //! \ingroup testblackcore
 
-#include "blackcore/context/contextallproxies.h"
+#include "blackcore/context/contextapplicationproxy.h"
+#include "blackcore/context/contextaudioproxy.h"
+#include "blackcore/context/contextnetworkproxy.h"
+#include "blackcore/context/contextownaircraftproxy.h"
+#include "blackcore/context/contextsimulatorproxy.h"
 #include "blackcore/application.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackmisc/dbusutils.h"