refactor: Move interpolation-related files to new subdirectory

cppcheck.supp

@@ -9,7 +9,7 @@
 // [error id]
 
 // Issues introduced by refactoring - expected to be fixed
-knownConditionTrueFalse:src/blackmisc/simulation/interpolator.cpp
+knownConditionTrueFalse:src/blackmisc/simulation/interpolation/interpolator.cpp
 knownConditionTrueFalse:src/blackmisc/aviation/aircraftsituationchange.cpp
 
 // Ignore noExplicitConstructor for now.

src/blackcore/context/contextsimulator.h

@@ -20,7 +20,7 @@
 #include "blackmisc/simulation/simulatorplugininfolist.h"
 #include "blackmisc/simulation/simulatorinternals.h"
 #include "blackmisc/simulation/matchingstatistics.h"
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "blackmisc/aviation/airportlist.h"
 #include "blackmisc/geo/elevationplane.h"
 #include "blackmisc/pq/length.h"

src/blackcore/context/contextsimulatorimpl.h

@@ -20,7 +20,7 @@
 #include "blackmisc/simulation/aircraftmodelsetprovider.h"
 #include "blackmisc/simulation/backgroundvalidation.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
-#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
 #include "blackmisc/simulation/remoteaircraftprovider.h"
 #include "blackmisc/simulation/simulatorplugininfolist.h"
 #include "blackmisc/simulation/simulatorinternals.h"

src/blackcore/simulator.h

@@ -12,13 +12,13 @@
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "blackmisc/simulation/simulatorinternals.h"
-#include "blackmisc/simulation/interpolatormulti.h"
+#include "blackmisc/simulation/interpolation/interpolatormulti.h"
 #include "blackmisc/simulation/ownaircraftprovider.h"
 #include "blackmisc/simulation/remoteaircraftprovider.h"
 #include "blackmisc/simulation/simulationenvironmentprovider.h"
-#include "blackmisc/simulation/interpolationsetupprovider.h"
+#include "blackmisc/simulation/interpolation/interpolationsetupprovider.h"
 #include "blackmisc/simulation/autopublishdata.h"
 #include "blackmisc/aviation/airportlist.h"
 #include "blackmisc/aviation/callsignset.h"

src/blackgui/components/internalscomponent.cpp

@@ -10,8 +10,8 @@
 #include "blackcore/context/contextnetwork.h"
 #include "blackcore/context/contextownaircraft.h"
 #include "blackcore/context/contextsimulator.h"
-#include "blackmisc/simulation/interpolationlogger.h"
+#include "blackmisc/simulation/interpolation/interpolationlogger.h"
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/network/client.h"
 #include "blackmisc/network/textmessage.h"

src/blackgui/components/interpolationlogdisplay.h

@@ -9,7 +9,7 @@
 #include "blackgui/overlaymessagesframe.h"
 #include "blackgui/blackguiexport.h"
 #include "blackcore/simulator.h"
-#include "blackmisc/simulation/interpolationlogger.h"
+#include "blackmisc/simulation/interpolation/interpolationlogger.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/logcategories.h"

src/blackgui/components/interpolationsetupcomponent.cpp

@@ -6,7 +6,7 @@
 #include "blackgui/views/interpolationsetupview.h"
 #include "blackgui/guiapplication.h"
 #include "blackcore/context/contextsimulator.h"
-#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
 #include "blackmisc/statusmessage.h"
 #include <QPointer>
 

src/blackgui/components/interpolationsetupcomponent.h

@@ -6,7 +6,7 @@
 #ifndef BLACKGUI_COMPONENTS_INTERPOLATIONSETUPCOMPONENT_H
 #define BLACKGUI_COMPONENTS_INTERPOLATIONSETUPCOMPONENT_H
 
-#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
 #include "blackgui/overlaymessagesframe.h"
 #include <QFrame>
 #include <QScopedPointer>

src/blackgui/editors/interpolationsetupform.h

@@ -7,7 +7,7 @@
 #define BLACKGUI_EDITORS_INTERPOLATIONSETUPFORM_H
 
 #include "blackgui/editors/form.h"
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/statusmessagelist.h"
 

src/blackgui/models/allmodelcontainers.h

@@ -6,7 +6,7 @@
 
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/distributorlist.h"
-#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackmisc/simulation/matchingstatistics.h"
 #include "blackmisc/aviation/aircrafticaocodelist.h"

src/blackgui/models/interpolationsetupmodel.h

@@ -6,7 +6,7 @@
 #ifndef BLACKGUI_MODELS_INTERPOLATIONSETUPMODEL_H
 #define BLACKGUI_MODELS_INTERPOLATIONSETUPMODEL_H
 
-#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
 #include "blackgui/models/listmodelcallsignobjects.h"
 #include "blackgui/blackguiexport.h"
 #include <QString>

src/blackmisc/CMakeLists.txt

@@ -534,26 +534,26 @@ add_library(misc SHARED
         simulation/fscommon/vpilotmodelruleset.h
         simulation/aircraftmodel.cpp
         simulation/distributor.cpp
-        simulation/interpolatorspline.h
+        simulation/interpolation/interpolatorspline.h
         simulation/distributorlist.cpp
         simulation/registermetadatasimulation.cpp
-        simulation/interpolatormulti.h
+        simulation/interpolation/interpolatormulti.h
-        simulation/interpolationsetupprovider.h
+        simulation/interpolation/interpolationsetupprovider.h
         simulation/aircraftmodellist.h
-        simulation/interpolationsetupprovider.cpp
+        simulation/interpolation/interpolationsetupprovider.cpp
-        simulation/interpolationstatus.cpp
+        simulation/interpolation/interpolationstatus.cpp
-        simulation/interpolationstatus.h
+        simulation/interpolation/interpolationstatus.h
-        simulation/interpolatorlinear.h
+        simulation/interpolation/interpolatorlinear.h
         simulation/backgroundvalidation.cpp
         simulation/airspaceaircraftsnapshot.cpp
         simulation/autopublishdata.h
-        simulation/interpolationrenderingsetup.h
+        simulation/interpolation/interpolationrenderingsetup.h
-        simulation/interpolationresult.cpp
+        simulation/interpolation/interpolationresult.cpp
-        simulation/interpolationresult.h
+        simulation/interpolation/interpolationresult.h
         simulation/matchingscriptmisc.h
-        simulation/interpolationsetuplist.cpp
+        simulation/interpolation/interpolationsetuplist.cpp
         simulation/remoteaircraftprovider.h
-        simulation/interpolant.h
+        simulation/interpolation/interpolant.h
         simulation/ownaircraftprovider.cpp
         simulation/backgroundvalidation.h
         simulation/xplane/xswiftbusconfigwriter.cpp
@@ -567,23 +567,23 @@ add_library(misc SHARED
         simulation/xplane/xswiftbusconfigwriter.h
         simulation/matchingutils.h
         simulation/registermetadatasimulation.h
-        simulation/interpolatorlinearpbh.h
+        simulation/interpolation/interpolatorlinearpbh.h
         simulation/fsx/simconnectutilities.h
         simulation/fsx/simconnectutilities.cpp
         simulation/fsx/fsx.h
         simulation/aircraftmodelinterfaces.h
-        simulation/interpolationlogger.h
+        simulation/interpolation/interpolationlogger.h
-        simulation/interpolatormulti.cpp
+        simulation/interpolation/interpolatormulti.cpp
         simulation/remoteaircraftprovider.cpp
         simulation/modelconverterx.cpp
         simulation/simulatorinfolist.h
         simulation/simulationenvironmentprovider.cpp
-        simulation/interpolator.h
+        simulation/interpolation/interpolator.h
-        simulation/interpolatorspline.cpp
+        simulation/interpolation/interpolatorspline.cpp
         simulation/aircraftmodelloaderprovider.cpp
         simulation/simulatorplugininfolist.h
         simulation/remoteaircraftproviderdummy.cpp
-        simulation/interpolationlogger.cpp
+        simulation/interpolation/interpolationlogger.cpp
         simulation/matchingscript.h
         simulation/categorymatcher.h
         simulation/flightgear/flightgearutil.h
@@ -594,20 +594,20 @@ add_library(misc SHARED
         simulation/simulatedaircraft.cpp
         simulation/aircraftmodellist.cpp
         simulation/aircraftmodel.h
-        simulation/interpolatorlinear.cpp
+        simulation/interpolation/interpolatorlinear.cpp
         simulation/data/lastmodel.h
         simulation/data/modelcaches.h
         simulation/data/modelcaches.cpp
         simulation/airspaceaircraftsnapshot.h
-        simulation/interpolatorfunctions.h
+        simulation/interpolation/interpolatorfunctions.h
         simulation/ownaircraftprovider.h
         simulation/distributorlistpreferences.cpp
-        simulation/interpolatorlinearpbh.cpp
+        simulation/interpolation/interpolatorlinearpbh.cpp
         simulation/reverselookup.h
         simulation/autopublishdata.cpp
         simulation/simulationenvironmentprovider.h
         simulation/simulatorplugininfo.h
-        simulation/interpolationrenderingsetup.cpp
+        simulation/interpolation/interpolationrenderingsetup.cpp
         simulation/simulatorinfo.cpp
         simulation/matchingstatistics.cpp
         simulation/ownaircraftproviderdummy.cpp
@@ -623,7 +623,7 @@ add_library(misc SHARED
         simulation/simulatorinternals.h
         simulation/distributorlist.h
         simulation/aircraftmodelutils.h
-        simulation/interpolator.cpp
+        simulation/interpolation/interpolator.cpp
         simulation/matchingstatistics.h
         simulation/modelconverterx.h
         simulation/settings/modelsettings.cpp
@@ -647,8 +647,8 @@ add_library(misc SHARED
         simulation/aircraftmodelutils.cpp
         simulation/simulatedaircraftlist.cpp
         simulation/matchingstatisticsentry.h
-        simulation/interpolationsetuplist.h
+        simulation/interpolation/interpolationsetuplist.h
-        simulation/interpolatorpbh.h
+        simulation/interpolation/interpolatorpbh.h
 
         # Test
         test/testdata.cpp

src/blackmisc/simulation/interpolation/interpolant.h

@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLANT_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLANT_H
-#define BLACKMISC_SIMULATION_INTERPOLANT_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLANT_H
 
-#include "blackmisc/simulation/interpolatorlinearpbh.h"
+#include "blackmisc/simulation/interpolation/interpolatorlinearpbh.h"
 
 namespace BlackMisc::Simulation
 {

src/blackmisc/simulation/interpolation/interpolationlogger.cpp

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackmisc/simulation/interpolationlogger.h"
+#include "blackmisc/simulation/interpolation/interpolationlogger.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/heading.h"
 #include "blackmisc/geo/kmlutils.h"

src/blackmisc/simulation/interpolation/interpolationlogger.h

@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATIONLOGGER_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONLOGGER_H
-#define BLACKMISC_SIMULATION_INTERPOLATIONLOGGER_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONLOGGER_H
 
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "blackmisc/simulation/remoteaircraftprovider.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
 #include "blackmisc/aviation/aircraftpartslist.h"

src/blackmisc/simulation/interpolation/interpolationrenderingsetup.cpp

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "blackmisc/network/client.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/verify.h"

src/blackmisc/simulation/interpolation/interpolationrenderingsetup.h

@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATIONRENDERINGSETUP_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONRENDERINGSETUP_H
-#define BLACKMISC_SIMULATION_INTERPOLATIONRENDERINGSETUP_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONRENDERINGSETUP_H
 
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/pq/length.h"

src/blackmisc/simulation/interpolation/interpolationresult.cpp

@@ -1,7 +1,7 @@
 //  SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors
 //  SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackmisc/simulation/interpolationresult.h"
+#include "blackmisc/simulation/interpolation/interpolationresult.h"
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/simulation/interpolation/interpolationresult.h

@@ -3,15 +3,15 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATIONRESULT_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONRESULT_H
-#define BLACKMISC_SIMULATION_INTERPOLATIONRESULT_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONRESULT_H
 
 #include "blackmisc/blackmiscexport.h"
 
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/aviation/aircraftparts.h"
 
-#include "blackmisc/simulation/interpolationstatus.h"
+#include "blackmisc/simulation/interpolation/interpolationstatus.h"
 #include "blackmisc/simulation/partsstatus.h"
 
 namespace BlackMisc::Simulation
@@ -68,4 +68,4 @@ namespace BlackMisc::Simulation
 
 }
 
-#endif // BLACKMISC_SIMULATION_INTERPOLATIONRESULT_H
+#endif // BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONRESULT_H

src/blackmisc/simulation/interpolation/interpolationsetuplist.cpp

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
 
 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Simulation, CInterpolationAndRenderingSetupPerCallsign, CInterpolationSetupList)
 

src/blackmisc/simulation/interpolation/interpolationsetuplist.h

@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATIONSETUPLIST_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSETUPLIST_H
-#define BLACKMISC_SIMULATION_INTERPOLATIONSETUPLIST_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSETUPLIST_H
 
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "blackmisc/aviation/callsignobjectlist.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"

src/blackmisc/simulation/interpolation/interpolationsetupprovider.cpp

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackmisc/simulation/interpolationsetupprovider.h"
+#include "blackmisc/simulation/interpolation/interpolationsetupprovider.h"
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/simulation/interpolation/interpolationsetupprovider.h

@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATIONSETUPPROVIDER_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSETUPPROVIDER_H
-#define BLACKMISC_SIMULATION_INTERPOLATIONSETUPPROVIDER_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSETUPPROVIDER_H
 
-#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
-#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
 #include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/provider.h"
 #include <QMap>

src/blackmisc/simulation/interpolation/interpolationstatus.cpp

@@ -1,7 +1,7 @@
 //  SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors
 //  SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackmisc/simulation/interpolationstatus.h"
+#include "blackmisc/simulation/interpolation/interpolationstatus.h"
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/simulation/interpolation/interpolationstatus.h

@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATIONSTATUS_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSTATUS_H
-#define BLACKMISC_SIMULATION_INTERPOLATIONSTATUS_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSTATUS_H
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/aviation/aircraftsituation.h"
@@ -59,4 +59,4 @@ namespace BlackMisc::Simulation
     };
 }
 
-#endif // BLACKMISC_SIMULATION_INTERPOLATIONSTATUS_H
+#endif // BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSTATUS_H

src/blackmisc/simulation/interpolation/interpolator.cpp

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackmisc/simulation/interpolator.h"
+#include "blackmisc/simulation/interpolation/interpolator.h"
 #include "blackconfig/buildconfig.h"
-#include "blackmisc/simulation/interpolationlogger.h"
+#include "blackmisc/simulation/interpolation/interpolationlogger.h"
-#include "blackmisc/simulation/interpolatorlinear.h"
+#include "blackmisc/simulation/interpolation/interpolatorlinear.h"
-#include "blackmisc/simulation/interpolatorspline.h"
+#include "blackmisc/simulation/interpolation/interpolatorspline.h"
 #include "blackmisc/aviation/aircraftsituationchange.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/network/fsdsetup.h"

src/blackmisc/simulation/interpolation/interpolator.h

@@ -3,18 +3,18 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATOR_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATOR_H
-#define BLACKMISC_SIMULATION_INTERPOLATOR_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATOR_H
 
-#include "blackmisc/simulation/interpolationresult.h"
+#include "blackmisc/simulation/interpolation/interpolationresult.h"
-#include "blackmisc/simulation/interpolationstatus.h"
+#include "blackmisc/simulation/interpolation/interpolationstatus.h"
 #include "blackmisc/simulation/partsstatus.h"
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "blackmisc/simulation/remoteaircraftprovider.h"
-#include "blackmisc/simulation/interpolationsetupprovider.h"
+#include "blackmisc/simulation/interpolation/interpolationsetupprovider.h"
 #include "blackmisc/simulation/simulationenvironmentprovider.h"
-#include "blackmisc/simulation/interpolationlogger.h"
+#include "blackmisc/simulation/interpolation/interpolationlogger.h"
-#include "blackmisc/simulation/interpolant.h"
+#include "blackmisc/simulation/interpolation/interpolant.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/aviation/aircraftsituationchange.h"
 #include "blackmisc/aviation/aircraftsituation.h"

src/blackmisc/simulation/interpolation/interpolatorfunctions.h

@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATORFUNCTIONS_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORFUNCTIONS_H
-#define BLACKMISC_SIMULATION_INTERPOLATORFUNCTIONS_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORFUNCTIONS_H
 
 namespace BlackMisc::Simulation
 {

src/blackmisc/simulation/interpolation/interpolatorlinear.cpp

@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackmisc/simulation/interpolatorlinear.h"
+#include "blackmisc/simulation/interpolation/interpolatorlinear.h"
-#include "blackmisc/simulation/interpolatorfunctions.h"
+#include "blackmisc/simulation/interpolation/interpolatorfunctions.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
 #include "blackmisc/aviation/altitude.h"
 #include "blackmisc/geo/coordinategeodetic.h"

src/blackmisc/simulation/interpolation/interpolatorlinear.h

@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATORLINEAR_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORLINEAR_H
-#define BLACKMISC_SIMULATION_INTERPOLATORLINEAR_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORLINEAR_H
 
-#include "blackmisc/simulation/interpolator.h"
+#include "blackmisc/simulation/interpolation/interpolator.h"
-#include "blackmisc/simulation/interpolationlogger.h"
+#include "blackmisc/simulation/interpolation/interpolationlogger.h"
-#include "blackmisc/simulation/interpolant.h"
+#include "blackmisc/simulation/interpolation/interpolant.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/blackmiscexport.h"
 

src/blackmisc/simulation/interpolation/interpolatorlinearpbh.cpp

@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackmisc/simulation/interpolatorlinearpbh.h"
+#include "blackmisc/simulation/interpolation/interpolatorlinearpbh.h"
-#include "blackmisc/simulation/interpolatorfunctions.h"
+#include "blackmisc/simulation/interpolation/interpolatorfunctions.h"
 #include "blackmisc/verify.h"
 #include "blackconfig/buildconfig.h"
 

src/blackmisc/simulation/interpolation/interpolatorlinearpbh.h

@@ -3,15 +3,15 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATORLINEARPBH_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORLINEARPBH_H
-#define BLACKMISC_SIMULATION_INTERPOLATORLINEARPBH_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORLINEARPBH_H
 
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/aviation/heading.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/pq/speed.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/simulation/interpolatorpbh.h"
+#include "blackmisc/simulation/interpolation/interpolatorpbh.h"
 
 namespace BlackMisc::Simulation
 {

src/blackmisc/simulation/interpolation/interpolatormulti.cpp

@@ -3,7 +3,7 @@
 
 //! \file
 
-#include "blackmisc/simulation/interpolatormulti.h"
+#include "blackmisc/simulation/interpolation/interpolatormulti.h"
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/simulation/interpolation/interpolatormulti.h

@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATORMULTI_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORMULTI_H
-#define BLACKMISC_SIMULATION_INTERPOLATORMULTI_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORMULTI_H
 
-#include "blackmisc/simulation/interpolatorlinear.h"
+#include "blackmisc/simulation/interpolation/interpolatorlinear.h"
-#include "blackmisc/simulation/interpolatorspline.h"
+#include "blackmisc/simulation/interpolation/interpolatorspline.h"
 #include "blackmisc/statusmessagelist.h"
 
 namespace BlackMisc::Simulation

src/blackmisc/simulation/interpolation/interpolatorpbh.h

@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATORPBH_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORPBH_H
-#define BLACKMISC_SIMULATION_INTERPOLATORPBH_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORPBH_H
 
 #include "blackmisc/aviation/heading.h"
 #include "blackmisc/pq/angle.h"
@@ -31,4 +31,4 @@ namespace BlackMisc::Simulation
     };
 }
 
-#endif // BLACKMISC_SIMULATION_INTERPOLATORPBH_H
+#endif // BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORPBH_H

src/blackmisc/simulation/interpolation/interpolatorspline.cpp

@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackmisc/simulation/interpolatorspline.h"
+#include "blackmisc/simulation/interpolation/interpolatorspline.h"
-#include "blackmisc/simulation/interpolatorfunctions.h"
+#include "blackmisc/simulation/interpolation/interpolatorfunctions.h"
 #include "blackmisc/network/fsdsetup.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/verify.h"

src/blackmisc/simulation/interpolation/interpolatorspline.h

@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKMISC_SIMULATION_INTERPOLATORSPLINE_H
+#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORSPLINE_H
-#define BLACKMISC_SIMULATION_INTERPOLATORSPLINE_H
+#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORSPLINE_H
 
-#include "blackmisc/simulation/interpolator.h"
+#include "blackmisc/simulation/interpolation/interpolator.h"
-#include "blackmisc/simulation/interpolationlogger.h"
+#include "blackmisc/simulation/interpolation/interpolationlogger.h"
-#include "blackmisc/simulation/interpolant.h"
+#include "blackmisc/simulation/interpolation/interpolant.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/blackmiscexport.h"
 

src/blackmisc/simulation/registermetadatasimulation.cpp

@@ -9,8 +9,8 @@
 #include "blackmisc/simulation/airspaceaircraftsnapshot.h"
 #include "blackmisc/simulation/distributorlist.h"
 #include "blackmisc/simulation/distributorlistpreferences.h"
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
-#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
 #include "blackmisc/simulation/matchingstatistics.h"
 #include "blackmisc/simulation/matchinglog.h"
 #include "blackmisc/simulation/reverselookup.h"

src/blackmisc/simulation/settings/interpolationrenderingsetupsettings.h

@@ -6,7 +6,7 @@
 #ifndef BLACKMISC_SIMULATION_SETTINGS_INTERPOLATIONRENDERINGSETUP_H
 #define BLACKMISC_SIMULATION_SETTINGS_INTERPOLATIONRENDERINGSETUP_H
 
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "blackmisc/settingscache.h"
 
 namespace BlackMisc::Simulation::Settings

src/plugins/simulator/emulated/simulatoremulated.h

@@ -8,9 +8,9 @@
 
 #include "../plugincommon/simulatorplugincommon.h"
 #include "blackmisc/aviation/comsystem.h"
-#include "blackmisc/simulation/interpolatormulti.h"
+#include "blackmisc/simulation/interpolation/interpolatormulti.h"
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
-#include "blackmisc/simulation/interpolationlogger.h"
+#include "blackmisc/simulation/interpolation/interpolationlogger.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/simulation/settings/swiftpluginsettings.h"
 #include "blackmisc/pq/time.h"

src/plugins/simulator/flightgear/flightgearmpaircraft.cpp

@@ -3,7 +3,7 @@
 
 #include "flightgearmpaircraft.h"
 #include "blackcore/simulator.h"
-#include "blackmisc/simulation/interpolatormulti.h"
+#include "blackmisc/simulation/interpolation/interpolatormulti.h"
 
 using namespace BlackCore;
 using namespace BlackMisc;

src/plugins/simulator/flightgear/flightgearmpaircraft.h

@@ -7,7 +7,7 @@
 #define BLACKSIMPLUGIN_FLIGHTGEAR_FGPLANEMPAIRCRAFT_H
 
 #include "blackmisc/simulation/simulatedaircraft.h"
-#include "blackmisc/simulation/interpolatormulti.h"
+#include "blackmisc/simulation/interpolation/interpolatormulti.h"
 #include <QSharedPointer>
 #include <QStringList>
 

src/plugins/simulator/fs9/fs9client.h

@@ -5,7 +5,7 @@
 #define DIRECTPLAY_CLIENT_H
 
 #include "directplaypeer.h"
-#include "blackmisc/simulation/interpolatormulti.h"
+#include "blackmisc/simulation/interpolation/interpolatormulti.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/pq/time.h"

src/plugins/simulator/fs9/simulatorfs9.h

@@ -12,7 +12,7 @@
 #include "../fscommon/simulatorfscommon.h"
 #include "blackcore/simulator.h"
 #include "blackmisc/simulation/settings/simulatorsettings.h"
-#include "blackmisc/simulation/interpolator.h"
+#include "blackmisc/simulation/interpolation/interpolator.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/pixmap.h"

src/plugins/simulator/fscommon/simulatorfscommon.h

@@ -7,7 +7,7 @@
 #define BLACKSIMPLUGIN_FSCOMMON_SIMULATORFSCOMMON_H
 
 #include "plugins/simulator/plugincommon/simulatorplugincommon.h"
-#include "blackmisc/simulation/interpolator.h"
+#include "blackmisc/simulation/interpolation/interpolator.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
 #include "plugins/simulator/fscommon/fscommonexport.h"
 

src/plugins/simulator/fsxcommon/simconnectobject.cpp

@@ -6,7 +6,7 @@
 #include "simulatorfsxcommon.h"
 #include "blackcore/simulator.h"
 #include "blackcore/simulator.h"
-#include "blackmisc/simulation/interpolatormulti.h"
+#include "blackmisc/simulation/interpolation/interpolatormulti.h"
 #include "blackconfig/buildconfig.h"
 
 using namespace BlackConfig;

src/plugins/simulator/fsxcommon/simconnectobject.h

@@ -9,7 +9,7 @@
 #include "plugins/simulator/fsxcommon/fsxcommonexport.h"
 #include "plugins/simulator/fsxcommon/simconnectdatadefinition.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
-#include "blackmisc/simulation/interpolatormulti.h"
+#include "blackmisc/simulation/interpolation/interpolatormulti.h"
 #include <QSharedPointer>
 #include <QStringList>
 #include <QByteArray>

src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp

@@ -12,7 +12,7 @@
 #include "blackmisc/simulation/fscommon/fscommonutil.h"
 #include "blackmisc/simulation/settings/simulatorsettings.h"
 #include "blackmisc/simulation/aircraftmodel.h"
-#include "blackmisc/simulation/interpolatormulti.h"
+#include "blackmisc/simulation/interpolation/interpolatormulti.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/aviation/airportlist.h"
 #include "blackmisc/geo/elevationplane.h"

src/plugins/simulator/fsxcommon/simulatorfsxcommon.h

@@ -12,7 +12,7 @@
 #include "plugins/simulator/fsxcommon/simconnectwindows.h"
 #include "plugins/simulator/fscommon/simulatorfscommon.h"
 #include "blackcore/simulator.h"
-#include "blackmisc/simulation/interpolatorlinear.h"
+#include "blackmisc/simulation/interpolation/interpolatorlinear.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/simulation/settings/simulatorsettings.h"
 #include "blackmisc/simulation/aircraftmodel.h"

src/plugins/simulator/xplane/xplanempaircraft.cpp

@@ -3,7 +3,7 @@
 
 #include "xplanempaircraft.h"
 #include "blackcore/simulator.h"
-#include "blackmisc/simulation/interpolatormulti.h"
+#include "blackmisc/simulation/interpolation/interpolatormulti.h"
 
 using namespace BlackCore;
 using namespace BlackMisc;

src/plugins/simulator/xplane/xplanempaircraft.h

@@ -7,7 +7,7 @@
 #define BLACKSIMPLUGIN_XPLANE_XPLANEMPAIRCRAFT_H
 
 #include "blackmisc/simulation/simulatedaircraft.h"
-#include "blackmisc/simulation/interpolatormulti.h"
+#include "blackmisc/simulation/interpolation/interpolatormulti.h"
 #include <QSharedPointer>
 #include <QStringList>
 

tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp

@@ -5,8 +5,8 @@
 //! \file
 //! \ingroup testblackmisc
 
-#include "blackmisc/simulation/interpolator.h"
+#include "blackmisc/simulation/interpolation/interpolator.h"
-#include "blackmisc/simulation/interpolatorlinear.h"
+#include "blackmisc/simulation/interpolation/interpolatorlinear.h"
 #include "blackmisc/simulation/remoteaircraftproviderdummy.h"
 #include "blackmisc/aviation/aircraftengine.h"
 #include "blackmisc/aviation/aircraftenginelist.h"

tests/blackmisc/simulation/testinterpolatorlinearpbh/testinterpolatorlinearpbh.cpp

@@ -7,7 +7,7 @@
 
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/aviation/heading.h"
-#include "blackmisc/simulation/interpolatorlinearpbh.h"
+#include "blackmisc/simulation/interpolation/interpolatorlinearpbh.h"
 #include "blackmisc/math/mathutils.h"
 #include "test.h"
 

tests/blackmisc/simulation/testinterpolatormisc/testinterpolatormisc.cpp

@@ -6,7 +6,7 @@
 //! \ingroup testblackmisc
 
 #include "blackmisc/aviation/aircraftsituation.h"
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "test.h"
 
 #include <QDebug>

tests/blackmisc/simulation/testinterpolatorparts/testinterpolatorparts.cpp

@@ -5,7 +5,7 @@
 //! \file
 //! \ingroup testblackmisc
 
-#include "blackmisc/simulation/interpolatorspline.h"
+#include "blackmisc/simulation/interpolation/interpolatorspline.h"
 #include "blackmisc/simulation/remoteaircraftproviderdummy.h"
 #include "test.h"
 #include <QTest>