refactor: Clean up includes

cmake/pch_config.cmake

@@ -6,56 +6,39 @@
 # For example "core" uses the same PCH as "misc" but with additional headers included.
 
 set(SWIFT_MISC_PCH
-    <QAudioDevice>
     [["misc/collection.h"]]
-    [["misc/containerbase.h"]]
     [["misc/dbus.h"]]
     [["misc/dictionary.h"]]
-    [["misc/iterator.h"]]
     [["misc/json.h"]]
     [["misc/metaclass.h"]]
-    [["misc/range.h"]]
     [["misc/sequence.h"]]
     [["misc/valueobject.h"]]
     [["misc/verify.h"]]
-    [["misc/worker.h"]]
 
     <QByteArray>
-    <QChar>
-    <QCoreApplication>
     <QDBusArgument>
     <QDBusMetaType>
-    <QDate>
     <QDateTime>
-    <QDebug>
     <QDir>
     <QFile>
-    <QFlag>
     <QFlags>
-    <QFutureWatcher>
-    <QGlobalStatic>
     <QHash>
-    <QIODevice>
     <QIcon>
     <QJsonArray>
     <QJsonObject>
     <QJsonValue>
     <QJsonValueRef>
-    <QLatin1Char>
     <QLatin1String>
     <QList>
     <QLoggingCategory>
     <QMap>
     <QMessageLogContext>
-    <QMetaMethod>
     <QMetaObject>
     <QMetaType>
     <QMutex>
-    <QMutexLocker>
     <QObject>
     <QPair>
     <QPixmap>
-    <QReadLocker>
     <QReadWriteLock>
     <QScopedPointer>
     <QSet>
@@ -68,37 +51,23 @@ set(SWIFT_MISC_PCH
     <QTime>
     <QTimer>
     <QVariant>
-    <QVariantList>
     <QVector>
-    <QWeakPointer>
-    <QWriteLocker>
     <QtGlobal>
 
     <algorithm>
-    <array>
-    <cctype>
     <cmath>
-    <cstddef>
-    <cstdio>
-    <cstdlib>
-    <cstring>
     <exception>
     <functional>
     <future>
     <initializer_list>
-    <iostream>
     <iterator>
     <map>
     <memory>
-    <numeric>
-    <random>
     <set>
-    <stdexcept>
     <string>
     <tuple>
     <type_traits>
     <typeindex>
-    <unordered_map>
     <utility>
     <vector>
 )

src/core/actionbind.h

@@ -6,8 +6,6 @@
 #ifndef SWIFT_CORE_ACTIONBIND_H
 #define SWIFT_CORE_ACTIONBIND_H
 
-#include <QPixmap>
-
 #include "core/application.h"
 #include "core/swiftcoreexport.h"
 

src/core/aircraftmatcher.cpp

@@ -12,11 +12,11 @@
 
 #include "core/application.h"
 #include "core/webdataservices.h"
+#include "core/webdataservicesms.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/aviation/callsign.h"
 #include "misc/aviation/livery.h"
-#include "misc/directoryutils.h"
 #include "misc/fileutils.h"
 #include "misc/logcategories.h"
 #include "misc/logmessage.h"

src/core/aircraftmatcher.h

@@ -6,14 +6,10 @@
 #ifndef SWIFT_CORE_AIRCRAFTMATCHER_H
 #define SWIFT_CORE_AIRCRAFTMATCHER_H
 
-#include <QFlags>
 #include <QObject>
-#include <QPair>
-#include <QSet>
 #include <QString>
 
 #include "core/swiftcoreexport.h"
-#include "core/webdataservicesms.h"
 #include "misc/simulation/aircraftmatchersetup.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/aircraftmodelsetprovider.h"
@@ -21,9 +17,6 @@
 #include "misc/simulation/matchinglog.h"
 #include "misc/simulation/matchingscriptmisc.h"
 #include "misc/simulation/matchingstatistics.h"
-#include "misc/statusmessage.h"
-#include "misc/valueobject.h"
-#include "misc/variant.h"
 
 namespace swift::misc
 {

src/core/airspaceanalyzer.h

@@ -10,9 +10,7 @@
 #include <chrono>
 
 #include <QHash>
-#include <QObject>
 #include <QReadWriteLock>
-#include <QTimer>
 #include <QtGlobal>
 
 #include "core/fsd/fsdclient.h"

src/core/airspacemonitor.cpp

@@ -3,14 +3,9 @@
 
 #include "core/airspacemonitor.h"
 
-#include <QCoreApplication>
 #include <QDateTime>
-#include <QEventLoop>
-#include <QReadLocker>
-#include <QThread>
 #include <QTime>
 #include <QVariant>
-#include <QWriteLocker>
 #include <Qt>
 
 #include "config/buildconfig.h"

src/core/airspacemonitor.h

@@ -6,15 +6,11 @@
 #ifndef SWIFT_CORE_AIRSPACE_MONITOR_H
 #define SWIFT_CORE_AIRSPACE_MONITOR_H
 
-#include <functional>
-
 #include <QHash>
 #include <QJsonObject>
-#include <QList>
 #include <QMetaObject>
 #include <QObject>
 #include <QQueue>
-#include <QReadWriteLock>
 #include <QString>
 #include <QTimer>
 #include <QtGlobal>

src/core/application.h

@@ -29,9 +29,7 @@
 #include "core/swiftcoreexport.h"
 #include "core/webreaderflags.h"
 #include "misc/applicationinfolist.h"
-#include "misc/crashinfo.h"
 #include "misc/db/updateinfo.h"
-#include "misc/digestsignal.h"
 #include "misc/identifiable.h"
 #include "misc/network/networkutils.h"
 #include "misc/network/url.h"

src/core/application/applicationsettings.h

@@ -8,7 +8,6 @@
 
 #include <QStringList>
 
-#include "config/buildconfig.h"
 #include "misc/input/actionhotkeylist.h"
 #include "misc/settingscache.h"
 #include "misc/simulation/simulatorplugininfo.h"

src/core/application/updatesettings.h

@@ -8,7 +8,6 @@
 
 #include <QStringList>
 
-#include "config/buildconfig.h"
 #include "core/application.h"
 #include "misc/platform.h"
 #include "misc/settingscache.h"

src/core/context/context.h

@@ -6,10 +6,8 @@
 #ifndef SWIFT_CORE_CONTEXT_CONTEXT_H
 #define SWIFT_CORE_CONTEXT_CONTEXT_H
 
-#include <QDateTime>
 #include <QObject>
 #include <QString>
-#include <QStringBuilder>
 #include <QtGlobal>
 
 #include "core/corefacade.h"

src/core/context/contextapplication.h

@@ -7,11 +7,8 @@
 #define SWIFT_CORE_CONTEXT_CONTEXTAPPLICATION_H
 
 #include <QDBusArgument>
-#include <QHash>
 #include <QList>
 #include <QMetaType>
-#include <QObject>
-#include <QPair>
 #include <QString>
 #include <QStringList>
 #include <QtGlobal>
@@ -22,7 +19,6 @@
 #include "misc/dictionary.h"
 #include "misc/identifier.h"
 #include "misc/identifierlist.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/statusmessage.h"
 #include "misc/valuecache.h"
 

src/core/context/contextaudio.h

@@ -7,7 +7,6 @@
 #define SWIFT_CORE_CONTEXT_CONTEXTAUDIO_H
 
 #include <QCommandLineOption>
-#include <QObject>
 #include <QString>
 
 #include "core/actionbind.h"

src/core/context/contextaudioimpl.h

@@ -6,13 +6,7 @@
 #ifndef SWIFT_CORE_CONTEXT_CONTEXTAUDIO_IMPL_H
 #define SWIFT_CORE_CONTEXT_CONTEXTAUDIO_IMPL_H
 
-#include <memory>
-
-#include <QHash>
-#include <QList>
 #include <QMap>
-#include <QObject>
-#include <QSharedPointer>
 #include <QString>
 
 #include "core/context/contextaudio.h"

src/core/context/contextaudioproxy.h

@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_CONTEXT_CONTEXTVOICE_PROXY_H
 #define SWIFT_CORE_CONTEXT_CONTEXTVOICE_PROXY_H
 
-#include <QObject>
 #include <QString>
 
 #include "core/context/contextaudio.h"
@@ -16,7 +15,6 @@
 #include "misc/audio/notificationsounds.h"
 #include "misc/aviation/callsignset.h"
 #include "misc/aviation/comsystem.h"
-#include "misc/aviation/selcal.h"
 #include "misc/identifier.h"
 #include "misc/network/userlist.h"
 

src/core/context/contextnetworkproxy.h

@@ -6,8 +6,6 @@
 #ifndef SWIFT_CORE_CONTEXT_CONTEXTNETWORK_PROXY_H
 #define SWIFT_CORE_CONTEXT_CONTEXTNETWORK_PROXY_H
 
-#include <stdbool.h>
-
 #include <QObject>
 #include <QString>
 

src/core/context/contextownaircraftempty.h

@@ -8,7 +8,6 @@
 
 #include "core/context/contextownaircraft.h"
 #include "core/swiftcoreexport.h"
-#include "misc/logmessage.h"
 
 // clazy:excludeall=const-signal-or-slot
 

src/core/context/contextownaircraftimpl.h

@@ -17,7 +17,6 @@
 #include "core/context/contextownaircraft.h"
 #include "core/corefacadeconfig.h"
 #include "core/swiftcoreexport.h"
-#include "core/vatsim/vatsimsettings.h"
 #include "misc/aviation/aircraftparts.h"
 #include "misc/aviation/aircraftsituationlist.h"
 #include "misc/aviation/airlineicaocode.h"

src/core/context/contextownaircraftproxy.h

@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_CONTEXT_OWNAIRCRAFT_PROXY_H
 #define SWIFT_CORE_CONTEXT_OWNAIRCRAFT_PROXY_H
 
-#include <QObject>
 #include <QString>
 
 #include "core/context/contextownaircraft.h"

src/core/context/contextsimulator.h

@@ -9,7 +9,6 @@
 #include <QObject>
 #include <QString>
 
-#include "config/buildconfig.h"
 #include "core/context/context.h"
 #include "core/corefacade.h"
 #include "core/corefacadeconfig.h"
@@ -17,7 +16,6 @@
 #include "core/swiftcoreexport.h"
 #include "misc/aviation/airportlist.h"
 #include "misc/geo/elevationplane.h"
-#include "misc/identifier.h"
 #include "misc/pixmap.h"
 #include "misc/pq/length.h"
 #include "misc/pq/time.h"

src/core/context/contextsimulatorimpl.cpp

@@ -5,7 +5,6 @@
 
 #include <QMetaObject>
 #include <QPointer>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QThread>
 #include <Qt>

src/core/context/contextsimulatorimpl.h

@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H
 #define SWIFT_CORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H
 
-#include <QObject>
 #include <QPair>
 #include <QPointer>
 #include <QString>

src/core/context/contextsimulatorproxy.h

@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_CONTEXTSIMULATOR_PROXY_H
 #define SWIFT_CORE_CONTEXTSIMULATOR_PROXY_H
 
-#include <QObject>
 #include <QString>
 
 #include "core/context/contextsimulator.h"

src/core/corefacade.h

@@ -14,7 +14,6 @@
 #include "core/corefacadeconfig.h"
 #include "core/data/launchersetup.h"
 #include "core/swiftcoreexport.h"
-#include "core/vatsim/vatsimsettings.h"
 #include "misc/identifier.h"
 #include "misc/settingscache.h"
 

src/core/data/authenticateduser.h

@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_DATA_AUTHENTICATEDUSER_H
 #define SWIFT_CORE_DATA_AUTHENTICATEDUSER_H
 
-#include "core/swiftcoreexport.h"
 #include "misc/datacache.h"
 #include "misc/network/authenticateduser.h"
 

src/core/data/dbcaches.h

@@ -6,9 +6,6 @@
 #ifndef SWIFT_CORE_DATA_DBCACHES
 #define SWIFT_CORE_DATA_DBCACHES
 
-#include <QDateTime>
-#include <QObject>
-
 #include "misc/aviation/aircraftcategorylist.h"
 #include "misc/aviation/aircrafticaocodelist.h"
 #include "misc/aviation/airlineicaocodelist.h"

src/core/data/networksetup.h

@@ -6,14 +6,12 @@
 #ifndef SWIFT_CORE_DATA_NETWORKSETUP_H
 #define SWIFT_CORE_DATA_NETWORKSETUP_H
 
-#include <QMetaType>
 #include <QObject>
 #include <QString>
 
 #include "core/data/vatsimsetup.h"
 #include "core/swiftcoreexport.h"
 #include "core/vatsim/vatsimsettings.h"
-#include "misc/metaclass.h"
 #include "misc/network/data/lastserver.h"
 #include "misc/network/serverlist.h"
 #include "misc/network/settings/serversettings.h"

src/core/db/databaseauthentication.h

@@ -12,7 +12,6 @@
 #include "core/data/authenticateduser.h"
 #include "core/swiftcoreexport.h"
 #include "misc/datacache.h"
-#include "misc/logcategories.h"
 #include "misc/statusmessagelist.h"
 
 class QNetworkReply;

src/core/db/databasereader.h

@@ -21,7 +21,6 @@
 #include "misc/db/dbinfolist.h"
 #include "misc/network/url.h"
 #include "misc/pq/time.h"
-#include "misc/sequence.h"
 #include "misc/statusmessage.h"
 #include "misc/valueobject.h"
 

src/core/db/databasereaderconfig.h

@@ -9,9 +9,7 @@
 #include <QDateTime>
 #include <QJsonArray>
 #include <QObject>
-#include <QReadWriteLock>
 #include <QString>
-#include <QTimer>
 #include <QtGlobal>
 
 #include "core/swiftcoreexport.h"

src/core/db/icaodatareader.h

@@ -9,7 +9,6 @@
 #include <atomic>
 
 #include <QObject>
-#include <QReadWriteLock>
 #include <QString>
 
 #include "core/data/dbcaches.h"

src/core/db/modeldatareader.h

@@ -9,7 +9,6 @@
 #include <QDateTime>
 #include <QList>
 #include <QObject>
-#include <QReadWriteLock>
 #include <QSet>
 #include <QString>
 #include <QStringList>

src/core/fsd/fsdclient.cpp

@@ -4,8 +4,8 @@
 #include "core/fsd/fsdclient.h"
 
 #include <QHostAddress>
+#include <QMetaEnum>
 #include <QNetworkReply>
-#include <QStringBuilder>
 #include <QStringView>
 
 #include "config/buildconfig.h"

src/core/inputmanager.cpp

@@ -7,9 +7,7 @@
 
 #include <QtGlobal>
 
-#include "misc/dictionary.h"
 #include "misc/input/actionhotkey.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/range.h"
 #include "misc/sequence.h"
 

src/core/inputmanager.h

@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_INPUTMANAGER_H
 #define SWIFT_CORE_INPUTMANAGER_H
 
-#include <algorithm>
 #include <functional>
 #include <memory>
 

src/core/pluginmanagersimulator.cpp

@@ -5,12 +5,10 @@
 
 #include <QJsonObject>
 #include <QJsonValue>
-#include <QStringBuilder>
 #include <QtGlobal>
 
 #include "core/application.h"
 #include "core/simulator.h"
-#include "misc/directoryutils.h"
 #include "misc/logmessage.h"
 #include "misc/swiftdirectories.h"
 

src/core/pluginmanagersimulator.h

@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_PLUGIN_MANAGER_SIMULATOR_H
 #define SWIFT_CORE_PLUGIN_MANAGER_SIMULATOR_H
 
-#include <QHash>
 #include <QMap>
 #include <QObject>
 #include <QString>
@@ -16,7 +15,6 @@
 #include "misc/sequence.h"
 #include "misc/simulation/simulatorplugininfo.h"
 #include "misc/simulation/simulatorplugininfolist.h"
-#include "misc/variant.h"
 
 namespace swift::core
 {

src/core/setupreader.h

@@ -8,11 +8,6 @@
 
 #include <atomic>
 
-#include <QCommandLineOption>
-#include <QCoreApplication>
-#include <QJsonObject>
-#include <QList>
-#include <QNetworkReply>
 #include <QObject>
 #include <QString>
 

src/core/vatsim/vatsimdatafilereader.h

@@ -21,7 +21,6 @@
 #include "misc/aviation/flightplan.h"
 #include "misc/datacache.h"
 #include "misc/network/entityflags.h"
-#include "misc/network/serverlist.h"
 #include "misc/network/userlist.h"
 #include "misc/network/voicecapabilities.h"
 #include "misc/simulation/simulatedaircraftlist.h"

src/core/vatsim/vatsimserverfilereader.h

@@ -6,24 +6,17 @@
 #ifndef SWIFT_CORE_VATSIM_VATSIMSERVERFILEREADER_H
 #define SWIFT_CORE_VATSIM_VATSIMSERVERFILEREADER_H
 
-#include <QMap>
 #include <QObject>
 #include <QString>
-#include <QStringList>
 
 #include "core/data/vatsimsetup.h"
 #include "core/swiftcoreexport.h"
 #include "core/threadedreader.h"
 #include "misc/aviation/aircrafticaocode.h"
-#include "misc/aviation/airlineicaocode.h"
-#include "misc/aviation/atcstationlist.h"
-#include "misc/aviation/callsignset.h"
 #include "misc/aviation/flightplan.h"
 #include "misc/datacache.h"
 #include "misc/network/entityflags.h"
 #include "misc/network/serverlist.h"
-#include "misc/network/userlist.h"
-#include "misc/network/voicecapabilities.h"
 #include "misc/simulation/simulatedaircraftlist.h"
 
 class QNetworkReply;

src/core/vatsim/vatsimsettings.h

@@ -8,7 +8,6 @@
 
 #include "core/swiftcoreexport.h"
 #include "misc/directoryutils.h"
-#include "misc/fileutils.h"
 #include "misc/network/serverlist.h"
 #include "misc/pq/time.h"
 #include "misc/settingscache.h"

src/gui/components/infobarstatuscomponent.h

@@ -14,6 +14,7 @@
 #include "core/actionbind.h"
 #include "gui/swiftguiexport.h"
 #include "misc/audio/audiodeviceinfo.h"
+#include "misc/digestsignal.h"
 #include "misc/input/actionhotkeydefs.h"
 #include "misc/network/connectionstatus.h"
 

src/misc/atomicfile.h

@@ -6,11 +6,8 @@
 #ifndef SWIFT_MISC_ATOMICFILE_H
 #define SWIFT_MISC_ATOMICFILE_H
 
-#include <exception>
-
 #include <QFile>
 #include <QFileDevice>
-#include <QIODevice>
 #include <QString>
 
 #include "misc/swiftmiscexport.h"

src/misc/audio/audioutils.cpp

@@ -3,6 +3,7 @@
 
 #include "misc/audio/audioutils.h"
 
+#include <QAudioDevice>
 #include <QMediaDevices>
 #include <QProcess>
 

src/misc/containerbase.h

@@ -11,6 +11,7 @@
 #include <QStringList>
 
 #include "misc/json.h"
+#include "misc/jsonexception.h"
 #include "misc/mixin/mixindbus.h"
 #include "misc/mixin/mixinjson.h"
 #include "misc/mixin/mixinmetatype.h"

src/misc/datacache.h

@@ -25,7 +25,6 @@
 #include <QString>
 #include <QStringList>
 #include <QUuid>
-#include <QtDebug>
 #include <QtGlobal>
 
 #include "misc/identifier.h"

src/misc/db/artifactlist.h

@@ -6,7 +6,6 @@
 #ifndef SWIFT_MISC_DB_ARTIFACTLIST_H
 #define SWIFT_MISC_DB_ARTIFACTLIST_H
 
-#include <QSet>
 #include <QString>
 
 #include "misc/collection.h"

src/misc/dbus.h

@@ -8,13 +8,10 @@
 
 #include <string>
 #include <type_traits>
-#include <utility>
 
 #include <QDBusArgument>
 #include <QFlags>
 
-#include "misc/swiftmiscexport.h"
-
 /*!
  * Non member non-friend streaming for std::string
  */

src/misc/dictionary.h

@@ -17,24 +17,19 @@
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QJsonValueRef>
-#include <QList>
 #include <QMap>
 #include <QString>
-#include <QtDebug>
 #include <QtGlobal>
 
 #include "misc/containerbase.h"
-#include "misc/inheritancetraits.h"
 #include "misc/iterator.h"
-#include "misc/metaclass.h"
+#include "misc/jsonexception.h"
 #include "misc/mixin/mixindatastream.h"
 #include "misc/mixin/mixindbus.h"
-#include "misc/mixin/mixinhash.h"
 #include "misc/mixin/mixinjson.h"
 #include "misc/mixin/mixinstring.h"
 #include "misc/predicates.h"
 #include "misc/range.h"
-#include "misc/swiftmiscexport.h"
 #include "misc/typetraits.h"
 
 namespace swift::misc

src/misc/directoryutils.h

@@ -6,10 +6,8 @@
 #ifndef SWIFT_MISC_DIRECTORYUTILS_H
 #define SWIFT_MISC_DIRECTORYUTILS_H
 
-#include <QDateTime>
 #include <QDir>
 #include <QFileInfoList>
-#include <QMap>
 #include <QSet>
 #include <QString>
 

src/misc/eventloop.h

@@ -11,8 +11,6 @@
 #include <QPointer>
 #include <QTimer>
 
-#include "misc/swiftmiscexport.h"
-
 namespace swift::misc
 {
     /*!

src/misc/fileutils.h

@@ -14,7 +14,6 @@
 #include <QLockFile>
 #include <QString>
 #include <QStringList>
-#include <QUrl>
 #include <Qt>
 
 #include "misc/swiftmiscexport.h"

src/misc/genericdbusinterface.h

@@ -7,7 +7,6 @@
 #define SWIFT_MISC_GENERICDBUSINTERFACE_H
 
 #include <QDBusAbstractInterface>
-#include <QDBusError>
 #include <QDBusPendingCall>
 #include <QDBusPendingReply>
 #include <QMetaMethod>

src/misc/icon.h

@@ -6,14 +6,11 @@
 #ifndef SWIFT_MISC_ICON_H
 #define SWIFT_MISC_ICON_H
 
-#include <tuple>
-
 #include <QIcon>
 #include <QMetaType>
 #include <QPixmap>
 #include <QString>
 
-#include "misc/dbus.h"
 #include "misc/icons.h"
 #include "misc/metaclass.h"
 #include "misc/mixin/mixincompare.h"

src/misc/iconlist.h

@@ -6,8 +6,6 @@
 #ifndef SWIFT_MISC_ICONLIST_H
 #define SWIFT_MISC_ICONLIST_H
 
-#include <tuple>
-
 #include <QJsonObject>
 #include <QMetaType>
 #include <QString>
@@ -16,7 +14,6 @@
 #include "misc/collection.h"
 #include "misc/icon.h"
 #include "misc/icons.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/sequence.h"
 #include "misc/swiftmiscexport.h"
 

src/misc/integersequence.h

@@ -7,8 +7,6 @@
 #define SWIFT_MISC_INTEGERSEQUENCE_H
 
 #include <cstddef>
-#include <tuple>
-#include <type_traits>
 
 namespace swift::misc::private_ns
 {

src/misc/invoke.h

@@ -9,8 +9,6 @@
 #include <tuple>
 
 #include <QMetaObject>
-#include <QThread>
-#include <QTimer>
 #include <QtGlobal>
 
 #include "misc/integersequence.h"

src/misc/iterator.h

@@ -9,7 +9,6 @@
 #include <algorithm>
 #include <iterator>
 #include <type_traits>
-#include <typeindex>
 #include <utility>
 
 #include "misc/optional.h"

src/misc/json.cpp

@@ -8,6 +8,7 @@
 #include <QStringList>
 
 #include "misc/imageutils.h"
+#include "misc/jsonexception.h"
 #include "misc/stringutils.h"
 
 using namespace swift::misc;

src/misc/json.h

@@ -19,8 +19,6 @@
 #include <QtGlobal>
 
 #include "misc/fileutils.h"
-#include "misc/inheritancetraits.h"
-#include "misc/jsonexception.h"
 #include "misc/metaclass.h"
 #include "misc/swiftmiscexport.h"
 

src/misc/lockfree.h

@@ -6,22 +6,15 @@
 #ifndef SWIFT_MISC_LOCKFREE_H
 #define SWIFT_MISC_LOCKFREE_H
 
-#include <stddef.h>
-
 #include <memory>
 #include <tuple>
 #include <type_traits>
 #include <utility>
 
-#include <QMetaType>
-#include <QMutex>
-#include <QMutexLocker>
 #include <QString>
 #include <QThread>
 #include <QtGlobal>
 
-#include "misc/swiftmiscexport.h"
-
 // http://www.drdobbs.com/lock-free-data-structures/184401865
 // http://en.cppreference.com/w/cpp/memory/shared_ptr/atomic
 

src/misc/logcategories.h

@@ -6,7 +6,6 @@
 #ifndef SWIFT_MISC_LOGCATEGORIES_H
 #define SWIFT_MISC_LOGCATEGORIES_H
 
-#include <QList>
 #include <QString>
 
 #include "misc/swiftmiscexport.h"

src/misc/logcategory.h

@@ -10,7 +10,6 @@
 #include <QMetaType>
 #include <QString>
 
-#include "misc/logcategories.h"
 #include "misc/metaclass.h"
 #include "misc/swiftmiscexport.h"
 #include "misc/valueobject.h"

src/misc/logcategorylist.h

@@ -15,12 +15,11 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QThreadStorage>
 #include <QtGlobal>
 
 #include "misc/collection.h"
+#include "misc/logcategories.h"
 #include "misc/logcategory.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/sequence.h"
 #include "misc/swiftmiscexport.h"
 #include "misc/typetraits.h"

src/misc/logmessage.cpp

@@ -5,6 +5,8 @@
 
 #include "misc/logmessage.h"
 
+#include <QLoggingCategory>
+
 namespace swift::misc
 {
 

src/misc/logmessage.h

@@ -6,13 +6,8 @@
 
 //! \file
 
-#include <type_traits>
-
 #include <QDebug>
-#include <QList>
-#include <QLoggingCategory>
 
-#include "misc/integersequence.h"
 #include "misc/statusmessage.h"
 #include "misc/statusmessagelist.h"
 #include "misc/swiftmiscexport.h"

src/misc/mapbuilder.h

@@ -15,7 +15,6 @@
 #include <QMap>
 
 #include "misc/range.h"
-#include "misc/swiftmiscexport.h"
 
 namespace swift::misc
 {

src/misc/metadatautils.h

@@ -6,8 +6,6 @@
 #ifndef SWIFT_MISC_METADATAUTILS_H
 #define SWIFT_MISC_METADATAUTILS_H
 
-#include <stddef.h>
-
 #include <QString>
 
 #include "misc/swiftmiscexport.h"

src/misc/mixin/mixindbus.h

@@ -10,6 +10,7 @@
 
 #include <QDBusArgument>
 
+#include "misc/dbus.h"
 #include "misc/inheritancetraits.h"
 #include "misc/metaclass.h"
 #include "misc/typetraits.h"

src/misc/mixin/mixinjson.h

@@ -6,20 +6,18 @@
 #ifndef SWIFT_MISC_MIXIN_MIXINJSON_H
 #define SWIFT_MISC_MIXIN_MIXINJSON_H
 
-#include <type_traits>
 #include <utility>
 
-#include <QByteArray>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QJsonValueRef>
-#include <QStringList>
 #include <QtGlobal>
 
 #include "misc/inheritancetraits.h"
 #include "misc/json.h"
+#include "misc/jsonexception.h"
 
 namespace swift::misc
 {

src/misc/optional.h

@@ -10,8 +10,6 @@
 
 #include <QtGlobal>
 
-#include "misc/typetraits.h"
-
 namespace swift::misc
 {
 

src/misc/orderablelist.h

@@ -8,8 +8,6 @@
 
 #include <QList>
 
-#include "misc/swiftmiscexport.h"
-
 namespace swift::misc
 {
     class IOrderable;

src/misc/platform.h

@@ -6,7 +6,6 @@
 #ifndef SWIFT_MISC_PLATFORM_H
 #define SWIFT_MISC_PLATFORM_H
 
-#include <QMetaEnum>
 #include <QString>
 
 #include "misc/metaclass.h"

src/misc/platformset.h

@@ -6,8 +6,6 @@
 #ifndef SWIFT_MISC_PLATFORMSET_H
 #define SWIFT_MISC_PLATFORMSET_H
 
-#include <tuple>
-
 #include <QMetaType>
 
 #include "misc/collection.h"

src/misc/predicates.h

@@ -6,8 +6,8 @@
 #ifndef SWIFT_MISC_PREDICATES_H
 #define SWIFT_MISC_PREDICATES_H
 
-#include <algorithm>
 #include <functional>
+#include <tuple>
 
 #include "misc/algorithm.h"
 

src/misc/propertyindexvariantmap.h

@@ -14,16 +14,12 @@
 #include <QMetaType>
 #include <QString>
 #include <QVariant>
-#include <QtDebug>
 #include <QtGlobal>
 
-#include "misc/inheritancetraits.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/mixin/mixindbus.h"
 #include "misc/mixin/mixinindex.h"
 #include "misc/mixin/mixinmetatype.h"
 #include "misc/mixin/mixinstring.h"
-#include "misc/predicates.h"
 #include "misc/propertyindex.h"
 #include "misc/propertyindexlist.h"
 #include "misc/swiftmiscexport.h"

src/misc/range.h

@@ -7,7 +7,6 @@
 #define SWIFT_MISC_RANGE_H
 
 #include <algorithm>
-#include <initializer_list>
 #include <iterator>
 #include <type_traits>
 
@@ -17,7 +16,6 @@
 #include "misc/algorithm.h"
 #include "misc/iterator.h"
 #include "misc/predicates.h"
-#include "misc/swiftmiscexport.h"
 #include "misc/typetraits.h"
 
 namespace swift::misc

src/misc/rgbcolor.h

@@ -6,8 +6,6 @@
 #ifndef SWIFT_MISC_RGBCOLOR_H
 #define SWIFT_MISC_RGBCOLOR_H
 
-#include <tuple>
-
 #include <QColor>
 #include <QMetaType>
 #include <QPixmap>

src/misc/setbuilder.h

@@ -14,9 +14,6 @@
 #include <QList>
 #include <QSet>
 #include <QStringList>
-#include <QVector>
-
-#include "misc/swiftmiscexport.h"
 
 namespace swift::misc
 {

src/misc/settingscache.h

@@ -9,7 +9,6 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QtDebug>
 
 #include "misc/statusmessage.h"
 #include "misc/swiftmiscexport.h"

src/misc/sharedstate/datalinkdbus.h

@@ -7,6 +7,7 @@
 #define SWIFT_MISC_SHAREDSTATE_DATALINKDBUS_H
 
 #include <QSharedPointer>
+#include <QTimer>
 
 #include "misc/identifier.h"
 #include "misc/sharedstate/datalink.h"

src/misc/simulation/fscommon/aircraftcfgparser.h

@@ -6,8 +6,6 @@
 #ifndef SWIFT_MISC_SIMULATION_FSCOMMON_AIRCRAFTCFGPARSER_H
 #define SWIFT_MISC_SIMULATION_FSCOMMON_AIRCRAFTCFGPARSER_H
 
-#include <memory>
-
 #include <QObject>
 #include <QPointer>
 #include <QString>

src/misc/simulation/fscommon/fscommonutil.h

@@ -11,7 +11,6 @@
 #include <QSet>
 #include <QStringList>
 
-#include "misc/logcategories.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/swiftmiscexport.h"
 

src/misc/simulation/fscommon/fsdirectories.cpp

@@ -11,7 +11,6 @@
 #include <QPair>
 #include <QSettings>
 #include <QStandardPaths>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QTextStream>
 #include <QVariant>
@@ -21,7 +20,6 @@
 #include "misc/fileutils.h"
 #include "misc/logmessage.h"
 #include "misc/stringutils.h"
-#include "misc/swiftdirectories.h"
 
 using namespace swift::config;
 

src/misc/simulation/fscommon/fsdirectories.h

@@ -6,12 +6,9 @@
 #ifndef SWIFT_MISC_SIMULATION_FSDIRECTORIES_H
 #define SWIFT_MISC_SIMULATION_FSDIRECTORIES_H
 
-#include <atomic>
-
 #include <QSet>
 #include <QStringList>
 
-#include "misc/logcategories.h"
 #include "misc/swiftmiscexport.h"
 
 namespace swift::misc::simulation::fscommon

src/misc/simulation/fscommon/vpilotmodelruleset.cpp

@@ -8,7 +8,6 @@
 #include <QList>
 #include <QSet>
 #include <QStringList>
-#include <Qt>
 
 #include "misc/range.h"
 #include "misc/simulation/aircraftmodel.h"

src/misc/simulation/fscommon/vpilotmodelruleset.h

@@ -11,7 +11,6 @@
 #include <QStringList>
 
 #include "misc/collection.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/sequence.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/fscommon/vpilotmodelrule.h"

src/misc/simulation/fscommon/vpilotrulesreader.cpp

@@ -13,7 +13,6 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QFileInfoList>
-#include <QFlags>
 #include <QIODevice>
 #include <QReadLocker>
 #include <QStandardPaths>

src/misc/simulation/fsx/simconnectutilities.cpp

@@ -3,16 +3,10 @@
 
 #include "misc/simulation/fsx/simconnectutilities.h"
 
-#include <QCoreApplication>
-#include <QFile>
 #include <QFlags>
-#include <QIODevice>
 #include <QLatin1String>
 #include <QMetaEnum>
 #include <QMetaObject>
-#include <QStandardPaths>
-#include <QStringBuilder>
-#include <QTextStream>
 
 #include "misc/stringutils.h"
 

src/misc/simulation/fsx/simconnectutilities.h

@@ -9,7 +9,6 @@
 #include <QMetaType>
 #include <QObject>
 #include <QSettings>
-#include <QSharedPointer>
 #include <QString>
 
 #include "misc/aviation/aircraftlights.h"

src/misc/simulation/interpolation/interpolationlogger.cpp

@@ -8,13 +8,11 @@
 
 #include "config/buildconfig.h"
 #include "misc/aviation/callsign.h"
-#include "misc/aviation/heading.h"
 #include "misc/directoryutils.h"
 #include "misc/geo/kmlutils.h"
 #include "misc/logmessage.h"
 #include "misc/pq/angle.h"
 #include "misc/pq/length.h"
-#include "misc/pq/speed.h"
 #include "misc/pq/units.h"
 #include "misc/stringutils.h"
 #include "misc/swiftdirectories.h"

src/misc/simulation/interpolation/interpolationlogger.h

@@ -13,7 +13,6 @@
 #include "misc/aviation/aircraftpartslist.h"
 #include "misc/aviation/aircraftsituationchange.h"
 #include "misc/aviation/aircraftsituationlist.h"
-#include "misc/logcategories.h"
 #include "misc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "misc/simulation/remoteaircraftprovider.h"
 

src/misc/simulation/interpolation/interpolationrenderingsetup.cpp

@@ -3,8 +3,6 @@
 
 #include "misc/simulation/interpolation/interpolationrenderingsetup.h"
 
-#include <QStringBuilder>
-
 #include "config/buildconfig.h"
 #include "misc/network/client.h"
 #include "misc/propertyindexvariantmap.h" // needed for mixin::Index::apply

src/misc/simulation/interpolation/interpolationstatus.cpp

@@ -3,6 +3,8 @@
 
 #include "misc/simulation/interpolation/interpolationstatus.h"
 
+#include "misc/aviation/aircraftsituation.h"
+
 using namespace swift::misc::aviation;
 
 namespace swift::misc::simulation

src/misc/simulation/interpolation/interpolationstatus.h

@@ -8,9 +8,13 @@
 
 #include <QString>
 
-#include "misc/aviation/aircraftsituation.h"
 #include "misc/swiftmiscexport.h"
 
+namespace swift::misc::aviation
+{
+    class CAircraftSituation;
+}
+
 namespace swift::misc::simulation
 {
     //! Status of interpolation

src/misc/simulation/interpolation/interpolator.h

@@ -15,7 +15,6 @@
 #include "misc/aviation/aircraftsituation.h"
 #include "misc/aviation/aircraftsituationchange.h"
 #include "misc/aviation/callsign.h"
-#include "misc/logcategories.h"
 #include "misc/simulation/aircraftmodel.h"
 #include "misc/simulation/interpolation/interpolant.h"
 #include "misc/simulation/interpolation/interpolationlogger.h"

src/misc/simulation/interpolation/interpolatorpbh.h

@@ -6,11 +6,15 @@
 #ifndef SWIFT_MISC_SIMULATION_INTERPOLATION_INTERPOLATORPBH_H
 #define SWIFT_MISC_SIMULATION_INTERPOLATION_INTERPOLATORPBH_H
 
-#include "misc/aviation/aircraftsituation.h"
 #include "misc/aviation/heading.h"
 #include "misc/pq/angle.h"
 #include "misc/pq/speed.h"
 
+namespace swift::misc::aviation
+{
+    class CAircraftSituation;
+}
+
 namespace swift::misc::simulation
 {
     //! Base class for Pitch-Bank-Heading interpolators

src/misc/slot.h

@@ -13,6 +13,7 @@
 
 #include <QObject>
 #include <QPointer>
+#include <QTimer>
 #include <QtGlobal>
 
 #include "misc/invoke.h"

src/misc/stringutils.h

@@ -8,13 +8,9 @@
 
 #include <algorithm>
 #include <atomic>
-#include <iosfwd>
-#include <string>
 
 #include <QByteArray>
-#include <QDataStream>
 #include <QDateTime>
-#include <QDebug>
 #include <QFlags>
 #include <QList>
 #include <QMap>
@@ -23,7 +19,6 @@
 #include <QString>
 #include <QStringRef>
 #include <QStringView>
-#include <QTextStream>
 #include <QtGlobal>
 
 #include "misc/range.h"

src/misc/swiftdirectories.h

@@ -6,11 +6,7 @@
 #ifndef SWIFT_MISC_SWIFTDIRECTORIES_H
 #define SWIFT_MISC_SWIFTDIRECTORIES_H
 
-#include <QDateTime>
-#include <QDir>
 #include <QFileInfoList>
-#include <QMap>
-#include <QSet>
 #include <QString>
 
 #include "misc/swiftmiscexport.h"