From 3af2fe23042a83891798131fe0f99618bbc42379 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Tue, 9 Jan 2024 23:31:52 +0100 Subject: [PATCH] refactor: Move interpolation-related files to new subdirectory --- cppcheck.supp | 2 +- src/blackcore/context/contextsimulator.h | 2 +- src/blackcore/context/contextsimulatorimpl.h | 2 +- src/blackcore/simulator.h | 6 +-- .../components/internalscomponent.cpp | 4 +- .../components/interpolationlogdisplay.h | 2 +- .../interpolationsetupcomponent.cpp | 2 +- .../components/interpolationsetupcomponent.h | 2 +- src/blackgui/editors/interpolationsetupform.h | 2 +- src/blackgui/models/allmodelcontainers.h | 2 +- src/blackgui/models/interpolationsetupmodel.h | 2 +- src/blackmisc/CMakeLists.txt | 50 +++++++++---------- .../{ => interpolation}/interpolant.h | 6 +-- .../interpolationlogger.cpp | 2 +- .../{ => interpolation}/interpolationlogger.h | 6 +-- .../interpolationrenderingsetup.cpp | 2 +- .../interpolationrenderingsetup.h | 4 +- .../interpolationresult.cpp | 2 +- .../{ => interpolation}/interpolationresult.h | 8 +-- .../interpolationsetuplist.cpp | 2 +- .../interpolationsetuplist.h | 6 +-- .../interpolationsetupprovider.cpp | 2 +- .../interpolationsetupprovider.h | 10 ++-- .../interpolationstatus.cpp | 2 +- .../{ => interpolation}/interpolationstatus.h | 6 +-- .../{ => interpolation}/interpolator.cpp | 8 +-- .../{ => interpolation}/interpolator.h | 16 +++--- .../interpolatorfunctions.h | 4 +- .../interpolatorlinear.cpp | 4 +- .../{ => interpolation}/interpolatorlinear.h | 10 ++-- .../interpolatorlinearpbh.cpp | 4 +- .../interpolatorlinearpbh.h | 6 +-- .../{ => interpolation}/interpolatormulti.cpp | 2 +- .../{ => interpolation}/interpolatormulti.h | 8 +-- .../{ => interpolation}/interpolatorpbh.h | 6 +-- .../interpolatorspline.cpp | 4 +- .../{ => interpolation}/interpolatorspline.h | 10 ++-- .../simulation/registermetadatasimulation.cpp | 4 +- .../interpolationrenderingsetupsettings.h | 2 +- .../simulator/emulated/simulatoremulated.h | 6 +-- .../flightgear/flightgearmpaircraft.cpp | 2 +- .../flightgear/flightgearmpaircraft.h | 2 +- src/plugins/simulator/fs9/fs9client.h | 2 +- src/plugins/simulator/fs9/simulatorfs9.h | 2 +- .../simulator/fscommon/simulatorfscommon.h | 2 +- .../simulator/fsxcommon/simconnectobject.cpp | 2 +- .../simulator/fsxcommon/simconnectobject.h | 2 +- .../fsxcommon/simulatorfsxcommon.cpp | 2 +- .../simulator/fsxcommon/simulatorfsxcommon.h | 2 +- .../simulator/xplane/xplanempaircraft.cpp | 2 +- .../simulator/xplane/xplanempaircraft.h | 2 +- .../testinterpolatorlinear.cpp | 4 +- .../testinterpolatorlinearpbh.cpp | 2 +- .../testinterpolatormisc.cpp | 2 +- .../testinterpolatorparts.cpp | 2 +- 55 files changed, 131 insertions(+), 131 deletions(-) rename src/blackmisc/simulation/{ => interpolation}/interpolant.h (91%) rename src/blackmisc/simulation/{ => interpolation}/interpolationlogger.cpp (99%) rename src/blackmisc/simulation/{ => interpolation}/interpolationlogger.h (97%) rename src/blackmisc/simulation/{ => interpolation}/interpolationrenderingsetup.cpp (99%) rename src/blackmisc/simulation/{ => interpolation}/interpolationrenderingsetup.h (98%) rename src/blackmisc/simulation/{ => interpolation}/interpolationresult.cpp (90%) rename src/blackmisc/simulation/{ => interpolation}/interpolationresult.h (90%) rename src/blackmisc/simulation/{ => interpolation}/interpolationsetuplist.cpp (91%) rename src/blackmisc/simulation/{ => interpolation}/interpolationsetuplist.h (87%) rename src/blackmisc/simulation/{ => interpolation}/interpolationsetupprovider.cpp (99%) rename src/blackmisc/simulation/{ => interpolation}/interpolationsetupprovider.h (92%) rename src/blackmisc/simulation/{ => interpolation}/interpolationstatus.cpp (95%) rename src/blackmisc/simulation/{ => interpolation}/interpolationstatus.h (90%) rename src/blackmisc/simulation/{ => interpolation}/interpolator.cpp (99%) rename src/blackmisc/simulation/{ => interpolation}/interpolator.h (94%) rename src/blackmisc/simulation/{ => interpolation}/interpolatorfunctions.h (86%) rename src/blackmisc/simulation/{ => interpolation}/interpolatorlinear.cpp (98%) rename src/blackmisc/simulation/{ => interpolation}/interpolatorlinear.h (90%) rename src/blackmisc/simulation/{ => interpolation}/interpolatorlinearpbh.cpp (96%) rename src/blackmisc/simulation/{ => interpolation}/interpolatorlinearpbh.h (91%) rename src/blackmisc/simulation/{ => interpolation}/interpolatormulti.cpp (98%) rename src/blackmisc/simulation/{ => interpolation}/interpolatormulti.h (92%) rename src/blackmisc/simulation/{ => interpolation}/interpolatorpbh.h (84%) rename src/blackmisc/simulation/{ => interpolation}/interpolatorspline.cpp (99%) rename src/blackmisc/simulation/{ => interpolation}/interpolatorspline.h (93%) diff --git a/cppcheck.supp b/cppcheck.supp index 29299fa52..8b867a92c 100644 --- a/cppcheck.supp +++ b/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. diff --git a/src/blackcore/context/contextsimulator.h b/src/blackcore/context/contextsimulator.h index 46e9b4c21..6a8eb1316 100644 --- a/src/blackcore/context/contextsimulator.h +++ b/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" diff --git a/src/blackcore/context/contextsimulatorimpl.h b/src/blackcore/context/contextsimulatorimpl.h index d38000d18..21829c7e4 100644 --- a/src/blackcore/context/contextsimulatorimpl.h +++ b/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" diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 9f5e81f3e..34af0675f 100644 --- a/src/blackcore/simulator.h +++ b/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" diff --git a/src/blackgui/components/internalscomponent.cpp b/src/blackgui/components/internalscomponent.cpp index 4d9acea9a..4b30f2f1e 100644 --- a/src/blackgui/components/internalscomponent.cpp +++ b/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/interpolationrenderingsetup.h" +#include "blackmisc/simulation/interpolation/interpolationlogger.h" +#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/network/client.h" #include "blackmisc/network/textmessage.h" diff --git a/src/blackgui/components/interpolationlogdisplay.h b/src/blackgui/components/interpolationlogdisplay.h index 685f4ad2f..d99f7b318 100644 --- a/src/blackgui/components/interpolationlogdisplay.h +++ b/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" diff --git a/src/blackgui/components/interpolationsetupcomponent.cpp b/src/blackgui/components/interpolationsetupcomponent.cpp index e8304e5c4..5670dad16 100644 --- a/src/blackgui/components/interpolationsetupcomponent.cpp +++ b/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 diff --git a/src/blackgui/components/interpolationsetupcomponent.h b/src/blackgui/components/interpolationsetupcomponent.h index efe913eef..25d3b8560 100644 --- a/src/blackgui/components/interpolationsetupcomponent.h +++ b/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 #include diff --git a/src/blackgui/editors/interpolationsetupform.h b/src/blackgui/editors/interpolationsetupform.h index 3f83662b1..bc4fb8ef5 100644 --- a/src/blackgui/editors/interpolationsetupform.h +++ b/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" diff --git a/src/blackgui/models/allmodelcontainers.h b/src/blackgui/models/allmodelcontainers.h index 0dc38306b..a3331a089 100644 --- a/src/blackgui/models/allmodelcontainers.h +++ b/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" diff --git a/src/blackgui/models/interpolationsetupmodel.h b/src/blackgui/models/interpolationsetupmodel.h index ff4c9ec62..e583b912c 100644 --- a/src/blackgui/models/interpolationsetupmodel.h +++ b/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 diff --git a/src/blackmisc/CMakeLists.txt b/src/blackmisc/CMakeLists.txt index 52cb387ff..c5448234e 100644 --- a/src/blackmisc/CMakeLists.txt +++ b/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/interpolationsetupprovider.h + simulation/interpolation/interpolatormulti.h + simulation/interpolation/interpolationsetupprovider.h simulation/aircraftmodellist.h - simulation/interpolationsetupprovider.cpp - simulation/interpolationstatus.cpp - simulation/interpolationstatus.h - simulation/interpolatorlinear.h + simulation/interpolation/interpolationsetupprovider.cpp + simulation/interpolation/interpolationstatus.cpp + simulation/interpolation/interpolationstatus.h + simulation/interpolation/interpolatorlinear.h simulation/backgroundvalidation.cpp simulation/airspaceaircraftsnapshot.cpp simulation/autopublishdata.h - simulation/interpolationrenderingsetup.h - simulation/interpolationresult.cpp - simulation/interpolationresult.h + simulation/interpolation/interpolationrenderingsetup.h + simulation/interpolation/interpolationresult.cpp + 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/interpolatormulti.cpp + simulation/interpolation/interpolationlogger.h + simulation/interpolation/interpolatormulti.cpp simulation/remoteaircraftprovider.cpp simulation/modelconverterx.cpp simulation/simulatorinfolist.h simulation/simulationenvironmentprovider.cpp - simulation/interpolator.h - simulation/interpolatorspline.cpp + simulation/interpolation/interpolator.h + 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/interpolatorpbh.h + simulation/interpolation/interpolationsetuplist.h + simulation/interpolation/interpolatorpbh.h # Test test/testdata.cpp diff --git a/src/blackmisc/simulation/interpolant.h b/src/blackmisc/simulation/interpolation/interpolant.h similarity index 91% rename from src/blackmisc/simulation/interpolant.h rename to src/blackmisc/simulation/interpolation/interpolant.h index 21199d658..11f255ed2 100644 --- a/src/blackmisc/simulation/interpolant.h +++ b/src/blackmisc/simulation/interpolation/interpolant.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLANT_H -#define BLACKMISC_SIMULATION_INTERPOLANT_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLANT_H +#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLANT_H -#include "blackmisc/simulation/interpolatorlinearpbh.h" +#include "blackmisc/simulation/interpolation/interpolatorlinearpbh.h" namespace BlackMisc::Simulation { diff --git a/src/blackmisc/simulation/interpolationlogger.cpp b/src/blackmisc/simulation/interpolation/interpolationlogger.cpp similarity index 99% rename from src/blackmisc/simulation/interpolationlogger.cpp rename to src/blackmisc/simulation/interpolation/interpolationlogger.cpp index 0e1322340..c6a294f76 100644 --- a/src/blackmisc/simulation/interpolationlogger.cpp +++ b/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" diff --git a/src/blackmisc/simulation/interpolationlogger.h b/src/blackmisc/simulation/interpolation/interpolationlogger.h similarity index 97% rename from src/blackmisc/simulation/interpolationlogger.h rename to src/blackmisc/simulation/interpolation/interpolationlogger.h index b2c7c3b70..9a7c2f696 100644 --- a/src/blackmisc/simulation/interpolationlogger.h +++ b/src/blackmisc/simulation/interpolation/interpolationlogger.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATIONLOGGER_H -#define BLACKMISC_SIMULATION_INTERPOLATIONLOGGER_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_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" diff --git a/src/blackmisc/simulation/interpolationrenderingsetup.cpp b/src/blackmisc/simulation/interpolation/interpolationrenderingsetup.cpp similarity index 99% rename from src/blackmisc/simulation/interpolationrenderingsetup.cpp rename to src/blackmisc/simulation/interpolation/interpolationrenderingsetup.cpp index ead098465..1117356fd 100644 --- a/src/blackmisc/simulation/interpolationrenderingsetup.cpp +++ b/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" diff --git a/src/blackmisc/simulation/interpolationrenderingsetup.h b/src/blackmisc/simulation/interpolation/interpolationrenderingsetup.h similarity index 98% rename from src/blackmisc/simulation/interpolationrenderingsetup.h rename to src/blackmisc/simulation/interpolation/interpolationrenderingsetup.h index 44ad191e6..07fc92deb 100644 --- a/src/blackmisc/simulation/interpolationrenderingsetup.h +++ b/src/blackmisc/simulation/interpolation/interpolationrenderingsetup.h @@ -3,8 +3,8 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATIONRENDERINGSETUP_H -#define BLACKMISC_SIMULATION_INTERPOLATIONRENDERINGSETUP_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONRENDERINGSETUP_H +#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONRENDERINGSETUP_H #include "blackmisc/aviation/callsign.h" #include "blackmisc/pq/length.h" diff --git a/src/blackmisc/simulation/interpolationresult.cpp b/src/blackmisc/simulation/interpolation/interpolationresult.cpp similarity index 90% rename from src/blackmisc/simulation/interpolationresult.cpp rename to src/blackmisc/simulation/interpolation/interpolationresult.cpp index d7fc661c2..2076dedce 100644 --- a/src/blackmisc/simulation/interpolationresult.cpp +++ b/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; diff --git a/src/blackmisc/simulation/interpolationresult.h b/src/blackmisc/simulation/interpolation/interpolationresult.h similarity index 90% rename from src/blackmisc/simulation/interpolationresult.h rename to src/blackmisc/simulation/interpolation/interpolationresult.h index fce03da0d..564191f2f 100644 --- a/src/blackmisc/simulation/interpolationresult.h +++ b/src/blackmisc/simulation/interpolation/interpolationresult.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATIONRESULT_H -#define BLACKMISC_SIMULATION_INTERPOLATIONRESULT_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_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 diff --git a/src/blackmisc/simulation/interpolationsetuplist.cpp b/src/blackmisc/simulation/interpolation/interpolationsetuplist.cpp similarity index 91% rename from src/blackmisc/simulation/interpolationsetuplist.cpp rename to src/blackmisc/simulation/interpolation/interpolationsetuplist.cpp index c4f182543..bae72aa3f 100644 --- a/src/blackmisc/simulation/interpolationsetuplist.cpp +++ b/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) diff --git a/src/blackmisc/simulation/interpolationsetuplist.h b/src/blackmisc/simulation/interpolation/interpolationsetuplist.h similarity index 87% rename from src/blackmisc/simulation/interpolationsetuplist.h rename to src/blackmisc/simulation/interpolation/interpolationsetuplist.h index 5fc53e068..1f0249ab0 100644 --- a/src/blackmisc/simulation/interpolationsetuplist.h +++ b/src/blackmisc/simulation/interpolation/interpolationsetuplist.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATIONSETUPLIST_H -#define BLACKMISC_SIMULATION_INTERPOLATIONSETUPLIST_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_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" diff --git a/src/blackmisc/simulation/interpolationsetupprovider.cpp b/src/blackmisc/simulation/interpolation/interpolationsetupprovider.cpp similarity index 99% rename from src/blackmisc/simulation/interpolationsetupprovider.cpp rename to src/blackmisc/simulation/interpolation/interpolationsetupprovider.cpp index 17e8f0762..16c4c63e8 100644 --- a/src/blackmisc/simulation/interpolationsetupprovider.cpp +++ b/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; diff --git a/src/blackmisc/simulation/interpolationsetupprovider.h b/src/blackmisc/simulation/interpolation/interpolationsetupprovider.h similarity index 92% rename from src/blackmisc/simulation/interpolationsetupprovider.h rename to src/blackmisc/simulation/interpolation/interpolationsetupprovider.h index 7f87097e9..18fc10fec 100644 --- a/src/blackmisc/simulation/interpolationsetupprovider.h +++ b/src/blackmisc/simulation/interpolation/interpolationsetupprovider.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATIONSETUPPROVIDER_H -#define BLACKMISC_SIMULATION_INTERPOLATIONSETUPPROVIDER_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSETUPPROVIDER_H +#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSETUPPROVIDER_H -#include "blackmisc/simulation/interpolationsetuplist.h" -#include "blackmisc/simulation/interpolationrenderingsetup.h" -#include "blackmisc/simulation/interpolationsetuplist.h" +#include "blackmisc/simulation/interpolation/interpolationsetuplist.h" +#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h" +#include "blackmisc/simulation/interpolation/interpolationsetuplist.h" #include "blackmisc/aviation/callsignset.h" #include "blackmisc/provider.h" #include diff --git a/src/blackmisc/simulation/interpolationstatus.cpp b/src/blackmisc/simulation/interpolation/interpolationstatus.cpp similarity index 95% rename from src/blackmisc/simulation/interpolationstatus.cpp rename to src/blackmisc/simulation/interpolation/interpolationstatus.cpp index e98b98cc1..bceae6b18 100644 --- a/src/blackmisc/simulation/interpolationstatus.cpp +++ b/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; diff --git a/src/blackmisc/simulation/interpolationstatus.h b/src/blackmisc/simulation/interpolation/interpolationstatus.h similarity index 90% rename from src/blackmisc/simulation/interpolationstatus.h rename to src/blackmisc/simulation/interpolation/interpolationstatus.h index 82a131d46..372bf0caf 100644 --- a/src/blackmisc/simulation/interpolationstatus.h +++ b/src/blackmisc/simulation/interpolation/interpolationstatus.h @@ -3,8 +3,8 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATIONSTATUS_H -#define BLACKMISC_SIMULATION_INTERPOLATIONSTATUS_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_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 diff --git a/src/blackmisc/simulation/interpolator.cpp b/src/blackmisc/simulation/interpolation/interpolator.cpp similarity index 99% rename from src/blackmisc/simulation/interpolator.cpp rename to src/blackmisc/simulation/interpolation/interpolator.cpp index 48465d348..596682a53 100644 --- a/src/blackmisc/simulation/interpolator.cpp +++ b/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/interpolatorlinear.h" -#include "blackmisc/simulation/interpolatorspline.h" +#include "blackmisc/simulation/interpolation/interpolationlogger.h" +#include "blackmisc/simulation/interpolation/interpolatorlinear.h" +#include "blackmisc/simulation/interpolation/interpolatorspline.h" #include "blackmisc/aviation/aircraftsituationchange.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/network/fsdsetup.h" diff --git a/src/blackmisc/simulation/interpolator.h b/src/blackmisc/simulation/interpolation/interpolator.h similarity index 94% rename from src/blackmisc/simulation/interpolator.h rename to src/blackmisc/simulation/interpolation/interpolator.h index 9bef92e56..2750e5224 100644 --- a/src/blackmisc/simulation/interpolator.h +++ b/src/blackmisc/simulation/interpolation/interpolator.h @@ -3,18 +3,18 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATOR_H -#define BLACKMISC_SIMULATION_INTERPOLATOR_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATOR_H +#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATOR_H -#include "blackmisc/simulation/interpolationresult.h" -#include "blackmisc/simulation/interpolationstatus.h" +#include "blackmisc/simulation/interpolation/interpolationresult.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/interpolant.h" +#include "blackmisc/simulation/interpolation/interpolationlogger.h" +#include "blackmisc/simulation/interpolation/interpolant.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/aviation/aircraftsituationchange.h" #include "blackmisc/aviation/aircraftsituation.h" diff --git a/src/blackmisc/simulation/interpolatorfunctions.h b/src/blackmisc/simulation/interpolation/interpolatorfunctions.h similarity index 86% rename from src/blackmisc/simulation/interpolatorfunctions.h rename to src/blackmisc/simulation/interpolation/interpolatorfunctions.h index 0d3f05153..a03aef69a 100644 --- a/src/blackmisc/simulation/interpolatorfunctions.h +++ b/src/blackmisc/simulation/interpolation/interpolatorfunctions.h @@ -3,8 +3,8 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATORFUNCTIONS_H -#define BLACKMISC_SIMULATION_INTERPOLATORFUNCTIONS_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORFUNCTIONS_H +#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORFUNCTIONS_H namespace BlackMisc::Simulation { diff --git a/src/blackmisc/simulation/interpolatorlinear.cpp b/src/blackmisc/simulation/interpolation/interpolatorlinear.cpp similarity index 98% rename from src/blackmisc/simulation/interpolatorlinear.cpp rename to src/blackmisc/simulation/interpolation/interpolatorlinear.cpp index 874610629..f1f5ff07d 100644 --- a/src/blackmisc/simulation/interpolatorlinear.cpp +++ b/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/interpolatorfunctions.h" +#include "blackmisc/simulation/interpolation/interpolatorlinear.h" +#include "blackmisc/simulation/interpolation/interpolatorfunctions.h" #include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/aviation/altitude.h" #include "blackmisc/geo/coordinategeodetic.h" diff --git a/src/blackmisc/simulation/interpolatorlinear.h b/src/blackmisc/simulation/interpolation/interpolatorlinear.h similarity index 90% rename from src/blackmisc/simulation/interpolatorlinear.h rename to src/blackmisc/simulation/interpolation/interpolatorlinear.h index 0cb6e9bce..c82bbde26 100644 --- a/src/blackmisc/simulation/interpolatorlinear.h +++ b/src/blackmisc/simulation/interpolation/interpolatorlinear.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATORLINEAR_H -#define BLACKMISC_SIMULATION_INTERPOLATORLINEAR_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORLINEAR_H +#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORLINEAR_H -#include "blackmisc/simulation/interpolator.h" -#include "blackmisc/simulation/interpolationlogger.h" -#include "blackmisc/simulation/interpolant.h" +#include "blackmisc/simulation/interpolation/interpolator.h" +#include "blackmisc/simulation/interpolation/interpolationlogger.h" +#include "blackmisc/simulation/interpolation/interpolant.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/blackmiscexport.h" diff --git a/src/blackmisc/simulation/interpolatorlinearpbh.cpp b/src/blackmisc/simulation/interpolation/interpolatorlinearpbh.cpp similarity index 96% rename from src/blackmisc/simulation/interpolatorlinearpbh.cpp rename to src/blackmisc/simulation/interpolation/interpolatorlinearpbh.cpp index 5147c1457..aec4cab9d 100644 --- a/src/blackmisc/simulation/interpolatorlinearpbh.cpp +++ b/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/interpolatorfunctions.h" +#include "blackmisc/simulation/interpolation/interpolatorlinearpbh.h" +#include "blackmisc/simulation/interpolation/interpolatorfunctions.h" #include "blackmisc/verify.h" #include "blackconfig/buildconfig.h" diff --git a/src/blackmisc/simulation/interpolatorlinearpbh.h b/src/blackmisc/simulation/interpolation/interpolatorlinearpbh.h similarity index 91% rename from src/blackmisc/simulation/interpolatorlinearpbh.h rename to src/blackmisc/simulation/interpolation/interpolatorlinearpbh.h index e4efa59ff..d777be725 100644 --- a/src/blackmisc/simulation/interpolatorlinearpbh.h +++ b/src/blackmisc/simulation/interpolation/interpolatorlinearpbh.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATORLINEARPBH_H -#define BLACKMISC_SIMULATION_INTERPOLATORLINEARPBH_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_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 { diff --git a/src/blackmisc/simulation/interpolatormulti.cpp b/src/blackmisc/simulation/interpolation/interpolatormulti.cpp similarity index 98% rename from src/blackmisc/simulation/interpolatormulti.cpp rename to src/blackmisc/simulation/interpolation/interpolatormulti.cpp index 1e2b26ae9..12c024b6f 100644 --- a/src/blackmisc/simulation/interpolatormulti.cpp +++ b/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; diff --git a/src/blackmisc/simulation/interpolatormulti.h b/src/blackmisc/simulation/interpolation/interpolatormulti.h similarity index 92% rename from src/blackmisc/simulation/interpolatormulti.h rename to src/blackmisc/simulation/interpolation/interpolatormulti.h index c2edd9a6b..612f5d70f 100644 --- a/src/blackmisc/simulation/interpolatormulti.h +++ b/src/blackmisc/simulation/interpolation/interpolatormulti.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATORMULTI_H -#define BLACKMISC_SIMULATION_INTERPOLATORMULTI_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORMULTI_H +#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORMULTI_H -#include "blackmisc/simulation/interpolatorlinear.h" -#include "blackmisc/simulation/interpolatorspline.h" +#include "blackmisc/simulation/interpolation/interpolatorlinear.h" +#include "blackmisc/simulation/interpolation/interpolatorspline.h" #include "blackmisc/statusmessagelist.h" namespace BlackMisc::Simulation diff --git a/src/blackmisc/simulation/interpolatorpbh.h b/src/blackmisc/simulation/interpolation/interpolatorpbh.h similarity index 84% rename from src/blackmisc/simulation/interpolatorpbh.h rename to src/blackmisc/simulation/interpolation/interpolatorpbh.h index e33a1f7eb..ad717b59f 100644 --- a/src/blackmisc/simulation/interpolatorpbh.h +++ b/src/blackmisc/simulation/interpolation/interpolatorpbh.h @@ -3,8 +3,8 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATORPBH_H -#define BLACKMISC_SIMULATION_INTERPOLATORPBH_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_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 diff --git a/src/blackmisc/simulation/interpolatorspline.cpp b/src/blackmisc/simulation/interpolation/interpolatorspline.cpp similarity index 99% rename from src/blackmisc/simulation/interpolatorspline.cpp rename to src/blackmisc/simulation/interpolation/interpolatorspline.cpp index da3f66188..285d7fa70 100644 --- a/src/blackmisc/simulation/interpolatorspline.cpp +++ b/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/interpolatorfunctions.h" +#include "blackmisc/simulation/interpolation/interpolatorspline.h" +#include "blackmisc/simulation/interpolation/interpolatorfunctions.h" #include "blackmisc/network/fsdsetup.h" #include "blackmisc/logmessage.h" #include "blackmisc/verify.h" diff --git a/src/blackmisc/simulation/interpolatorspline.h b/src/blackmisc/simulation/interpolation/interpolatorspline.h similarity index 93% rename from src/blackmisc/simulation/interpolatorspline.h rename to src/blackmisc/simulation/interpolation/interpolatorspline.h index 9c13cedc6..f0b56fe8d 100644 --- a/src/blackmisc/simulation/interpolatorspline.h +++ b/src/blackmisc/simulation/interpolation/interpolatorspline.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKMISC_SIMULATION_INTERPOLATORSPLINE_H -#define BLACKMISC_SIMULATION_INTERPOLATORSPLINE_H +#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORSPLINE_H +#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORSPLINE_H -#include "blackmisc/simulation/interpolator.h" -#include "blackmisc/simulation/interpolationlogger.h" -#include "blackmisc/simulation/interpolant.h" +#include "blackmisc/simulation/interpolation/interpolator.h" +#include "blackmisc/simulation/interpolation/interpolationlogger.h" +#include "blackmisc/simulation/interpolation/interpolant.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/blackmiscexport.h" diff --git a/src/blackmisc/simulation/registermetadatasimulation.cpp b/src/blackmisc/simulation/registermetadatasimulation.cpp index 8f77c418b..8d63441e0 100644 --- a/src/blackmisc/simulation/registermetadatasimulation.cpp +++ b/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/interpolationsetuplist.h" +#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h" +#include "blackmisc/simulation/interpolation/interpolationsetuplist.h" #include "blackmisc/simulation/matchingstatistics.h" #include "blackmisc/simulation/matchinglog.h" #include "blackmisc/simulation/reverselookup.h" diff --git a/src/blackmisc/simulation/settings/interpolationrenderingsetupsettings.h b/src/blackmisc/simulation/settings/interpolationrenderingsetupsettings.h index 3354406ee..9c983b2c5 100644 --- a/src/blackmisc/simulation/settings/interpolationrenderingsetupsettings.h +++ b/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 diff --git a/src/plugins/simulator/emulated/simulatoremulated.h b/src/plugins/simulator/emulated/simulatoremulated.h index 45cffa99a..e11353a45 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.h +++ b/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/interpolationrenderingsetup.h" -#include "blackmisc/simulation/interpolationlogger.h" +#include "blackmisc/simulation/interpolation/interpolatormulti.h" +#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h" +#include "blackmisc/simulation/interpolation/interpolationlogger.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/settings/swiftpluginsettings.h" #include "blackmisc/pq/time.h" diff --git a/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp b/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp index ef793bbff..7bea681b4 100644 --- a/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp +++ b/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; diff --git a/src/plugins/simulator/flightgear/flightgearmpaircraft.h b/src/plugins/simulator/flightgear/flightgearmpaircraft.h index 8b53fa4fe..15a678514 100644 --- a/src/plugins/simulator/flightgear/flightgearmpaircraft.h +++ b/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 #include diff --git a/src/plugins/simulator/fs9/fs9client.h b/src/plugins/simulator/fs9/fs9client.h index 56830f460..eb608cb59 100644 --- a/src/plugins/simulator/fs9/fs9client.h +++ b/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" diff --git a/src/plugins/simulator/fs9/simulatorfs9.h b/src/plugins/simulator/fs9/simulatorfs9.h index 7a4b8d959..4ede1479e 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.h +++ b/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" diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.h b/src/plugins/simulator/fscommon/simulatorfscommon.h index b7309a85c..5d16437de 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.h +++ b/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" diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.cpp b/src/plugins/simulator/fsxcommon/simconnectobject.cpp index 52d1e33ea..3a81d26a6 100644 --- a/src/plugins/simulator/fsxcommon/simconnectobject.cpp +++ b/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; diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.h b/src/plugins/simulator/fsxcommon/simconnectobject.h index c8a8a7e14..c2f143f0a 100644 --- a/src/plugins/simulator/fsxcommon/simconnectobject.h +++ b/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 #include #include diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index b9c3d2a0d..f2150dce2 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/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" diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h index 448f00c13..f93e6013b 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h +++ b/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" diff --git a/src/plugins/simulator/xplane/xplanempaircraft.cpp b/src/plugins/simulator/xplane/xplanempaircraft.cpp index dbd2c1952..1d25b9a42 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.cpp +++ b/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; diff --git a/src/plugins/simulator/xplane/xplanempaircraft.h b/src/plugins/simulator/xplane/xplanempaircraft.h index 6dd4ae7a3..0567e12cc 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.h +++ b/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 #include diff --git a/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp b/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp index 91c29b14c..3c9ad9ad0 100644 --- a/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp +++ b/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp @@ -5,8 +5,8 @@ //! \file //! \ingroup testblackmisc -#include "blackmisc/simulation/interpolator.h" -#include "blackmisc/simulation/interpolatorlinear.h" +#include "blackmisc/simulation/interpolation/interpolator.h" +#include "blackmisc/simulation/interpolation/interpolatorlinear.h" #include "blackmisc/simulation/remoteaircraftproviderdummy.h" #include "blackmisc/aviation/aircraftengine.h" #include "blackmisc/aviation/aircraftenginelist.h" diff --git a/tests/blackmisc/simulation/testinterpolatorlinearpbh/testinterpolatorlinearpbh.cpp b/tests/blackmisc/simulation/testinterpolatorlinearpbh/testinterpolatorlinearpbh.cpp index a65ff1656..c5cf22bcd 100644 --- a/tests/blackmisc/simulation/testinterpolatorlinearpbh/testinterpolatorlinearpbh.cpp +++ b/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" diff --git a/tests/blackmisc/simulation/testinterpolatormisc/testinterpolatormisc.cpp b/tests/blackmisc/simulation/testinterpolatormisc/testinterpolatormisc.cpp index 1b1528a2d..236f71854 100644 --- a/tests/blackmisc/simulation/testinterpolatormisc/testinterpolatormisc.cpp +++ b/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 diff --git a/tests/blackmisc/simulation/testinterpolatorparts/testinterpolatorparts.cpp b/tests/blackmisc/simulation/testinterpolatorparts/testinterpolatorparts.cpp index 258237254..c5d5dd59f 100644 --- a/tests/blackmisc/simulation/testinterpolatorparts/testinterpolatorparts.cpp +++ b/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