From 78d3350bf3db7e2936febbf033e7679d9ceacd0c Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Thu, 2 Apr 2015 00:11:50 +0200 Subject: [PATCH] refs #396 move Blackmisc Aviation classes into subfolder --- samples/blackmisc/sampleschangeobject.cpp | 10 +-- samples/blackmisc/samplescontainer.cpp | 2 +- samples/blackmisc/samplesjson.cpp | 4 +- samples/blackmisc/samplesmetadata.cpp | 2 +- samples/blackmisc/samplesperformance.cpp | 4 +- samples/blackmisc/samplesperformance.h | 2 +- samples/blackmisc/samplesvariant.cpp | 2 +- samples/blackmiscdbus/servicetool.h | 4 +- samples/blackmiscdbus/testservice.h | 2 +- .../blackmiscquantities/samplesaviation.cpp | 16 ++--- samples/voiceclient/client.cpp | 2 +- src/blackcore/airspace_monitor.h | 8 +-- src/blackcore/airspace_watchdog.h | 2 +- src/blackcore/context_audio.h | 6 +- src/blackcore/context_audio_proxy.h | 2 +- src/blackcore/context_network.h | 2 +- src/blackcore/context_network_impl.cpp | 2 +- src/blackcore/context_network_impl.h | 4 +- src/blackcore/context_network_proxy.h | 2 +- src/blackcore/context_ownaircraft.h | 4 +- src/blackcore/context_ownaircraft_impl.h | 2 +- src/blackcore/context_ownaircraft_proxy.h | 2 +- src/blackcore/context_runtime.cpp | 2 +- src/blackcore/context_simulator.h | 4 +- src/blackcore/interpolator.h | 2 +- src/blackcore/interpolator_linear.cpp | 2 +- src/blackcore/interpolator_linear.h | 4 +- src/blackcore/network.h | 6 +- src/blackcore/simulator.h | 2 +- src/blackcore/vatsimbookingreader.cpp | 2 +- src/blackcore/vatsimbookingreader.h | 2 +- src/blackcore/vatsimdatafilereader.cpp | 2 +- src/blackcore/vatsimdatafilereader.h | 6 +- src/blackcore/voice.h | 4 +- src/blackcore/voice_channel.h | 2 +- src/blackcore/voice_channel_vatlib.h | 2 +- src/blackgui/components/aircraftcomponent.h | 2 +- .../components/atcstationcomponent.cpp | 2 +- src/blackgui/components/atcstationcomponent.h | 2 +- .../components/cockpitcomcomponent.cpp | 2 +- src/blackgui/components/cockpitcomcomponent.h | 4 +- .../cockpittranspondermodeledscomponent.h | 4 +- src/blackgui/components/flightplancomponent.h | 4 +- src/blackgui/components/logincomponent.cpp | 2 +- src/blackgui/components/logincomponent.h | 2 +- .../components/mainkeypadareacomponent.h | 2 +- .../components/remoteaircraftselector.h | 2 +- src/blackgui/components/settingscomponent.h | 2 +- .../components/simulatorcomponent.cpp | 2 +- .../components/textmessagecomponent.h | 2 +- .../models/aircraftmodellistmodel.cpp | 2 +- src/blackgui/models/airportlistmodel.h | 2 +- src/blackgui/models/atcstationlistmodel.h | 2 +- src/blackgui/models/columnformatters.h | 2 +- src/blackgui/models/listmodelbase.cpp | 6 +- .../models/simulatedaircraftlistmodel.cpp | 2 +- src/blackgui/selcalcodeselector.cpp | 2 +- src/blackgui/selcalcodeselector.h | 2 +- src/blackgui/transpondermodeselector.h | 2 +- src/blackgui/views/atcstationview.cpp | 2 +- src/blackmisc/avallclasses.h | 34 --------- .../{avioadfsystem.h => aviation/adfsystem.h} | 10 ++- .../{avaircraft.cpp => aviation/aircraft.cpp} | 3 +- .../{avaircraft.h => aviation/aircraft.h} | 31 ++++---- src/blackmisc/aviation/aircraftengine.cpp | 2 + src/blackmisc/aviation/aircraftengine.h | 7 +- src/blackmisc/aviation/aircraftenginelist.cpp | 2 + src/blackmisc/aviation/aircraftenginelist.h | 4 +- .../aircrafticao.cpp} | 3 +- .../aircrafticao.h} | 21 +++--- src/blackmisc/aviation/aircraftlights.cpp | 1 + src/blackmisc/aviation/aircraftlights.h | 7 +- .../aircraftlist.cpp} | 25 ++----- .../aircraftlist.h} | 18 ++--- src/blackmisc/aviation/aircraftparts.cpp | 1 + src/blackmisc/aviation/aircraftparts.h | 11 ++- src/blackmisc/aviation/aircraftpartslist.cpp | 2 + src/blackmisc/aviation/aircraftpartslist.h | 6 +- .../aircraftsituation.cpp} | 3 +- .../aircraftsituation.h} | 34 +++++---- .../aircraftsituationlist.cpp} | 5 +- .../aircraftsituationlist.h} | 12 ++-- .../{avairport.cpp => aviation/airport.cpp} | 30 ++------ .../{avairport.h => aviation/airport.h} | 23 +++--- .../airporticao.cpp} | 15 +--- .../airporticao.h} | 8 +-- .../airportlist.cpp} | 20 +----- .../airportlist.h} | 10 ++- .../{avaltitude.cpp => aviation/altitude.cpp} | 27 +------ .../{avaltitude.h => aviation/altitude.h} | 4 +- .../atcstation.cpp} | 70 +++---------------- .../{avatcstation.h => aviation/atcstation.h} | 42 +++++++---- .../atcstationlist.cpp} | 5 +- .../atcstationlist.h} | 20 +++--- src/blackmisc/aviation/aviation.h | 39 +++++++++++ .../{aviobase.h => aviation/avionicsbase.h} | 6 +- .../blackmiscfreefunctions_avmeta.cpp | 4 +- .../{avcallsign.cpp => aviation/callsign.cpp} | 51 +------------- .../{avcallsign.h => aviation/callsign.h} | 10 +-- .../callsignlist.cpp} | 6 +- .../callsignlist.h} | 10 +-- .../callsignobjectlist.cpp} | 8 +-- .../callsignobjectlist.h} | 6 +- .../comsystem.cpp} | 27 +------ .../{aviocomsystem.h => aviation/comsystem.h} | 8 +-- .../flightplan.cpp} | 4 +- .../{avflightplan.h => aviation/flightplan.h} | 40 +++++++---- .../{avheading.cpp => aviation/heading.cpp} | 7 +- .../{avheading.h => aviation/heading.h} | 8 +-- .../informationmessage.cpp} | 12 ++-- .../informationmessage.h} | 24 +++---- .../modulator.cpp} | 27 +++---- .../{aviomodulator.h => aviation/modulator.h} | 18 +++-- .../{avionavsystem.h => aviation/navsystem.h} | 6 +- .../{avselcal.cpp => aviation/selcal.cpp} | 27 +------ .../{avselcal.h => aviation/selcal.h} | 6 +- .../{avtrack.cpp => aviation/track.cpp} | 8 +-- src/blackmisc/{avtrack.h => aviation/track.h} | 4 +- .../transponder.cpp} | 33 +-------- .../transponder.h} | 16 +++-- src/blackmisc/blackmisc.h | 5 -- src/blackmisc/blackmisc.pro | 6 +- src/blackmisc/blackmiscallvalueclasses.h | 2 +- src/blackmisc/blackmiscfreefunctions.cpp | 2 +- src/blackmisc/geoobjectlist.cpp | 6 +- src/blackmisc/nwaircraftmapping.h | 2 +- src/blackmisc/nwclient.cpp | 6 +- src/blackmisc/nwclientlist.h | 10 +-- src/blackmisc/nwtextmessage.cpp | 6 +- src/blackmisc/nwtextmessage.h | 2 +- src/blackmisc/nwuser.cpp | 2 +- src/blackmisc/nwuser.h | 4 +- src/blackmisc/pqangle.cpp | 2 +- src/blackmisc/simulation/aircraftmodel.h | 4 +- .../simulation/simdirectaccessownaircraft.cpp | 2 +- .../simdirectaccessremoteaircraft.h | 2 +- src/blackmisc/simulation/simulatedaircraft.h | 2 +- .../simulation/simulatedaircraftlist.h | 4 +- src/blackmisc/testing.h | 2 +- src/blackmisc/timestampobjectlist.cpp | 2 +- src/blacksim/fscommon/bcdconversions.h | 2 +- src/blacksound/soundgenerator.h | 2 +- .../fs9/blacksimplugin_freefunctions.h | 2 +- src/plugins/simulator/fs9/fs9_client.cpp | 2 +- src/plugins/simulator/fs9/fs9_client.h | 2 +- src/plugins/simulator/fs9/simulator_fs9.h | 2 +- src/plugins/simulator/fsx/simconnect_object.h | 2 +- src/plugins/simulator/fsx/simulator_fsx.cpp | 2 +- src/plugins/simulator/fsx/simulator_fsx.h | 2 +- .../fsx/simulator_fsx_simconnectproc.cpp | 2 +- src/swiftcore/tool.cpp | 2 +- src/swiftgui_standard/swiftguistd.cpp | 2 +- src/swiftgui_standard/swiftguistd_init.cpp | 2 +- src/swiftgui_standard/swiftguistd_menus.cpp | 2 +- tests/blackcore/testinterpolator.h | 2 +- tests/blackmisc/testaviation.cpp | 18 ++--- tests/blackmisc/testcontainers.cpp | 4 +- tests/blackmisc/testvariantandmap.cpp | 2 +- tests/blackmisc/testvariantandmap.h | 2 +- 159 files changed, 516 insertions(+), 730 deletions(-) delete mode 100644 src/blackmisc/avallclasses.h rename src/blackmisc/{avioadfsystem.h => aviation/adfsystem.h} (96%) rename src/blackmisc/{avaircraft.cpp => aviation/aircraft.cpp} (99%) rename src/blackmisc/{avaircraft.h => aviation/aircraft.h} (94%) rename src/blackmisc/{avaircrafticao.cpp => aviation/aircrafticao.cpp} (99%) rename src/blackmisc/{avaircrafticao.h => aviation/aircrafticao.h} (92%) rename src/blackmisc/{avaircraftlist.cpp => aviation/aircraftlist.cpp} (88%) rename src/blackmisc/{avaircraftlist.h => aviation/aircraftlist.h} (86%) rename src/blackmisc/{avaircraftsituation.cpp => aviation/aircraftsituation.cpp} (99%) rename src/blackmisc/{avaircraftsituation.h => aviation/aircraftsituation.h} (88%) rename src/blackmisc/{avaircraftsituationlist.cpp => aviation/aircraftsituationlist.cpp} (93%) rename src/blackmisc/{avaircraftsituationlist.h => aviation/aircraftsituationlist.h} (87%) rename src/blackmisc/{avairport.cpp => aviation/airport.cpp} (90%) rename src/blackmisc/{avairport.h => aviation/airport.h} (87%) rename src/blackmisc/{avairporticao.cpp => aviation/airporticao.cpp} (78%) rename src/blackmisc/{avairporticao.h => aviation/airporticao.h} (93%) rename src/blackmisc/{avairportlist.cpp => aviation/airportlist.cpp} (84%) rename src/blackmisc/{avairportlist.h => aviation/airportlist.h} (93%) rename src/blackmisc/{avaltitude.cpp => aviation/altitude.cpp} (89%) rename src/blackmisc/{avaltitude.h => aviation/altitude.h} (98%) rename src/blackmisc/{avatcstation.cpp => aviation/atcstation.cpp} (92%) rename src/blackmisc/{avatcstation.h => aviation/atcstation.h} (90%) rename src/blackmisc/{avatcstationlist.cpp => aviation/atcstationlist.cpp} (98%) rename src/blackmisc/{avatcstationlist.h => aviation/atcstationlist.h} (88%) create mode 100644 src/blackmisc/aviation/aviation.h rename src/blackmisc/{aviobase.h => aviation/avionicsbase.h} (92%) rename src/blackmisc/{ => aviation}/blackmiscfreefunctions_avmeta.cpp (95%) rename src/blackmisc/{avcallsign.cpp => aviation/callsign.cpp} (89%) rename src/blackmisc/{avcallsign.h => aviation/callsign.h} (96%) rename src/blackmisc/{avcallsignlist.cpp => aviation/callsignlist.cpp} (93%) rename src/blackmisc/{avcallsignlist.h => aviation/callsignlist.h} (88%) rename src/blackmisc/{avcallsignobjectlist.cpp => aviation/callsignobjectlist.cpp} (97%) rename src/blackmisc/{avcallsignobjectlist.h => aviation/callsignobjectlist.h} (95%) rename src/blackmisc/{aviocomsystem.cpp => aviation/comsystem.cpp} (90%) rename src/blackmisc/{aviocomsystem.h => aviation/comsystem.h} (98%) rename src/blackmisc/{avflightplan.cpp => aviation/flightplan.cpp} (96%) rename src/blackmisc/{avflightplan.h => aviation/flightplan.h} (89%) rename src/blackmisc/{avheading.cpp => aviation/heading.cpp} (90%) rename src/blackmisc/{avheading.h => aviation/heading.h} (94%) rename src/blackmisc/{avinformationmessage.cpp => aviation/informationmessage.cpp} (89%) rename src/blackmisc/{avinformationmessage.h => aviation/informationmessage.h} (86%) rename src/blackmisc/{aviomodulator.cpp => aviation/modulator.cpp} (83%) rename src/blackmisc/{aviomodulator.h => aviation/modulator.h} (93%) rename src/blackmisc/{avionavsystem.h => aviation/navsystem.h} (97%) rename src/blackmisc/{avselcal.cpp => aviation/selcal.cpp} (91%) rename src/blackmisc/{avselcal.h => aviation/selcal.h} (96%) rename src/blackmisc/{avtrack.cpp => aviation/track.cpp} (88%) rename src/blackmisc/{avtrack.h => aviation/track.h} (97%) rename src/blackmisc/{aviotransponder.cpp => aviation/transponder.cpp} (92%) rename src/blackmisc/{aviotransponder.h => aviation/transponder.h} (95%) diff --git a/samples/blackmisc/sampleschangeobject.cpp b/samples/blackmisc/sampleschangeobject.cpp index 6be73d2ad..bfc644d61 100644 --- a/samples/blackmisc/sampleschangeobject.cpp +++ b/samples/blackmisc/sampleschangeobject.cpp @@ -9,11 +9,11 @@ #include "sampleschangeobject.h" #include "blackmisc/pqconstants.h" -#include "blackmisc/avheading.h" -#include "blackmisc/aviocomsystem.h" -#include "blackmisc/avionavsystem.h" -#include "blackmisc/aviotransponder.h" -#include "blackmisc/avatcstationlist.h" +#include "blackmisc/aviation/heading.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/navsystem.h" +#include "blackmisc/aviation/transponder.h" +#include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/propertyindexallclasses.h" #include "blackmisc/predicates.h" #include "blackmisc/blackmiscfreefunctions.h" diff --git a/samples/blackmisc/samplescontainer.cpp b/samples/blackmisc/samplescontainer.cpp index 721af90be..f55890dc3 100644 --- a/samples/blackmisc/samplescontainer.cpp +++ b/samples/blackmisc/samplescontainer.cpp @@ -9,7 +9,7 @@ #include "samplescontainer.h" #include "blackmisc/blackmiscfreefunctions.h" -#include "blackmisc/avatcstationlist.h" +#include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/propertyindexallclasses.h" #include #include diff --git a/samples/blackmisc/samplesjson.cpp b/samples/blackmisc/samplesjson.cpp index c24f16b29..263618306 100644 --- a/samples/blackmisc/samplesjson.cpp +++ b/samples/blackmisc/samplesjson.cpp @@ -8,8 +8,8 @@ */ #include "samplesjson.h" -#include "blackmisc/avatcstationlist.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/aircraft.h" #include #include diff --git a/samples/blackmisc/samplesmetadata.cpp b/samples/blackmisc/samplesmetadata.cpp index dd39372f5..2b96be8a6 100644 --- a/samples/blackmisc/samplesmetadata.cpp +++ b/samples/blackmisc/samplesmetadata.cpp @@ -9,7 +9,7 @@ #include "samplesmetadata.h" #include "blackmisc/blackmiscfreefunctions.h" -#include "blackmisc/avatcstationlist.h" +#include "blackmisc/aviation/atcstationlist.h" #include #include #include diff --git a/samples/blackmisc/samplesperformance.cpp b/samples/blackmisc/samplesperformance.cpp index 2f6178490..fe20db71f 100644 --- a/samples/blackmisc/samplesperformance.cpp +++ b/samples/blackmisc/samplesperformance.cpp @@ -8,9 +8,9 @@ */ #include "samplesperformance.h" -#include "blackmisc/avaircraftsituationlist.h" +#include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/coordinategeodetic.h" -#include "blackmisc/avaltitude.h" +#include "blackmisc/aviation/altitude.h" #include "blackmisc/testing.h" using namespace BlackMisc::Aviation; diff --git a/samples/blackmisc/samplesperformance.h b/samples/blackmisc/samplesperformance.h index 00f69ceed..323eeda53 100644 --- a/samples/blackmisc/samplesperformance.h +++ b/samples/blackmisc/samplesperformance.h @@ -12,7 +12,7 @@ #ifndef BLACKMISCTEST_SAMPLESPERFORMANCEINDEX_H #define BLACKMISCTEST_SAMPLESPERFORMANCEINDEX_H -#include "blackmisc/avaircraftsituationlist.h" +#include "blackmisc/aviation/aircraftsituationlist.h" #include namespace BlackMiscTest diff --git a/samples/blackmisc/samplesvariant.cpp b/samples/blackmisc/samplesvariant.cpp index 585fb4bcc..ea44ef693 100644 --- a/samples/blackmisc/samplesvariant.cpp +++ b/samples/blackmisc/samplesvariant.cpp @@ -10,7 +10,7 @@ #include "samplesvariant.h" #include "blackmisc/variant.h" #include "blackmisc/pqallquantities.h" -#include "blackmisc/avallclasses.h" +#include "blackmisc/aviation/aviation.h" #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/blackmiscfreefunctions.h" #include diff --git a/samples/blackmiscdbus/servicetool.h b/samples/blackmiscdbus/servicetool.h index 267d1acb6..c2a50d5c8 100644 --- a/samples/blackmiscdbus/servicetool.h +++ b/samples/blackmiscdbus/servicetool.h @@ -13,8 +13,8 @@ #define BLACKMISCTEST_SERVICETOOL_H #include "blackcore/dbus_server.h" -#include "blackmisc/avatcstationlist.h" -#include "blackmisc/avairportlist.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/airportlist.h" #include "blackmisc/nwclientlist.h" #include "blacksim/fscommon/aircraftcfgentrieslist.h" #include diff --git a/samples/blackmiscdbus/testservice.h b/samples/blackmiscdbus/testservice.h index 4ed9baa60..93c06c8b5 100644 --- a/samples/blackmiscdbus/testservice.h +++ b/samples/blackmiscdbus/testservice.h @@ -16,7 +16,7 @@ #pragma push_macro("interface") #undef interface -#include "blackmisc/avallclasses.h" +#include "blackmisc/aviation/aviation.h" #include "blackmisc/networkallclasses.h" #include "blackmisc/pqallquantities.h" #include "blackmisc/simulation/simulatedaircraft.h" diff --git a/samples/blackmiscquantities/samplesaviation.cpp b/samples/blackmiscquantities/samplesaviation.cpp index d9f7dd392..05cf8a395 100644 --- a/samples/blackmiscquantities/samplesaviation.cpp +++ b/samples/blackmiscquantities/samplesaviation.cpp @@ -9,14 +9,14 @@ #include "samplesaviation.h" #include "blackmisc/pqconstants.h" -#include "blackmisc/avheading.h" -#include "blackmisc/aviocomsystem.h" -#include "blackmisc/avionavsystem.h" -#include "blackmisc/aviotransponder.h" -#include "blackmisc/avatcstationlist.h" -#include "blackmisc/avflightplan.h" -#include "blackmisc/avaircrafticao.h" -#include "blackmisc/avairporticao.h" +#include "blackmisc/aviation/heading.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/navsystem.h" +#include "blackmisc/aviation/transponder.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/flightplan.h" +#include "blackmisc/aviation/aircrafticao.h" +#include "blackmisc/aviation/airporticao.h" #include diff --git a/samples/voiceclient/client.cpp b/samples/voiceclient/client.cpp index 877737371..6432a3be0 100644 --- a/samples/voiceclient/client.cpp +++ b/samples/voiceclient/client.cpp @@ -6,7 +6,7 @@ #include "client.h" #include "blackcore/voice_vatlib.h" #include "blackmisc/audiodeviceinfolist.h" -#include "blackmisc/avcallsignlist.h" +#include "blackmisc/aviation/callsignlist.h" #include using namespace BlackMisc::Audio; diff --git a/src/blackcore/airspace_monitor.h b/src/blackcore/airspace_monitor.h index ce89b4db4..adeb58c4b 100644 --- a/src/blackcore/airspace_monitor.h +++ b/src/blackcore/airspace_monitor.h @@ -15,12 +15,12 @@ #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/simulation/simdirectaccessownaircraft.h" #include "blackmisc/simulation/simdirectaccessremoteaircraft.h" -#include "blackmisc/avatcstationlist.h" -#include "blackmisc/avaircraftsituationlist.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/nwclientlist.h" -#include "blackmisc/avflightplan.h" +#include "blackmisc/aviation/flightplan.h" #include "blackmisc/nwuserlist.h" -#include "blackmisc/avcallsignlist.h" +#include "blackmisc/aviation/callsignlist.h" #include "network.h" #include "vatsimbookingreader.h" #include "vatsimdatafilereader.h" diff --git a/src/blackcore/airspace_watchdog.h b/src/blackcore/airspace_watchdog.h index 96dd03caf..c1b530c19 100644 --- a/src/blackcore/airspace_watchdog.h +++ b/src/blackcore/airspace_watchdog.h @@ -13,7 +13,7 @@ #define BLACKCORE_AIRSPACE_WATCHDOG_H #include "blackmisc/pqtime.h" -#include "blackmisc/avcallsign.h" +#include "blackmisc/aviation/callsign.h" #include #include diff --git a/src/blackcore/context_audio.h b/src/blackcore/context_audio.h index 43f282c93..0df22a599 100644 --- a/src/blackcore/context_audio.h +++ b/src/blackcore/context_audio.h @@ -17,9 +17,9 @@ #include "blackmisc/audiodeviceinfolist.h" #include "blackmisc/voiceroomlist.h" #include "blackmisc/nwuserlist.h" -#include "blackmisc/avaircraft.h" -#include "blackmisc/avcallsignlist.h" -#include "blackmisc/avselcal.h" +#include "blackmisc/aviation/aircraft.h" +#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/aviation/selcal.h" #include //! \addtogroup dbus diff --git a/src/blackcore/context_audio_proxy.h b/src/blackcore/context_audio_proxy.h index 21f45f250..e1236014d 100644 --- a/src/blackcore/context_audio_proxy.h +++ b/src/blackcore/context_audio_proxy.h @@ -18,7 +18,7 @@ #include "blackmisc/audiodeviceinfolist.h" #include "blackmisc/voiceroomlist.h" #include "blackmisc/nwuserlist.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" namespace BlackCore { diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index 393601445..88fe0acd7 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -13,7 +13,7 @@ #define BLACKCORE_CONTEXTNETWORK_H #include "blackcore/context.h" -#include "blackmisc/avatcstationlist.h" +#include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/statusmessage.h" #include "blackmisc/statusmessagelist.h" diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp index e8ea43a27..24f910469 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -18,7 +18,7 @@ #include "vatsimdatafilereader.h" #include "blackmisc/networkutils.h" -#include "blackmisc/avatcstationlist.h" +#include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/logmessage.h" #include "blackmisc/simplecommandparser.h" #include "blackmisc/simulation/simdirectaccessownaircraft.h" diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h index 8b978c4c7..b2d98304c 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/context_network_impl.h @@ -19,12 +19,12 @@ #include "blackcore/dbus_server.h" #include "blackcore/network.h" #include "blackcore/airspace_monitor.h" -#include "blackmisc/avatcstationlist.h" +#include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/setnetwork.h" #include "blackmisc/nwclientlist.h" #include "blackmisc/digestsignal.h" #include "blackmisc/logmessage.h" -#include "blackmisc/avaircraftsituationlist.h" +#include "blackmisc/aviation/aircraftsituationlist.h" #include #include diff --git a/src/blackcore/context_network_proxy.h b/src/blackcore/context_network_proxy.h index ddf9588c0..06c6ae295 100644 --- a/src/blackcore/context_network_proxy.h +++ b/src/blackcore/context_network_proxy.h @@ -15,7 +15,7 @@ #include "context_network.h" #include "network_vatlib.h" -#include "blackmisc/avallclasses.h" +#include "blackmisc/aviation/aviation.h" #include "blackmisc/statusmessage.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/nwtextmessagelist.h" diff --git a/src/blackcore/context_ownaircraft.h b/src/blackcore/context_ownaircraft.h index 531dbe82d..e03e08aa8 100644 --- a/src/blackcore/context_ownaircraft.h +++ b/src/blackcore/context_ownaircraft.h @@ -14,9 +14,9 @@ #include "blackcore/context.h" #include "blackmisc/simulation/simulatedaircraft.h" -#include "blackmisc/avaircrafticao.h" +#include "blackmisc/aviation/aircrafticao.h" #include "blackmisc/voiceroomlist.h" -#include "blackmisc/avselcal.h" +#include "blackmisc/aviation/selcal.h" //! \addtogroup dbus //! @{ diff --git a/src/blackcore/context_ownaircraft_impl.h b/src/blackcore/context_ownaircraft_impl.h index ebf71c03c..fc68b2c4b 100644 --- a/src/blackcore/context_ownaircraft_impl.h +++ b/src/blackcore/context_ownaircraft_impl.h @@ -16,7 +16,7 @@ #include "blackcore/context_settings.h" #include "blackcore/context_runtime.h" #include "blackcore/dbus_server.h" -#include "blackmisc/avatcstation.h" +#include "blackmisc/aviation/atcstation.h" #include "blackmisc/simulation/simdirectaccessownaircraft.h" namespace BlackCore diff --git a/src/blackcore/context_ownaircraft_proxy.h b/src/blackcore/context_ownaircraft_proxy.h index 9c05ee959..ba06259c5 100644 --- a/src/blackcore/context_ownaircraft_proxy.h +++ b/src/blackcore/context_ownaircraft_proxy.h @@ -14,7 +14,7 @@ #include "blackcore/context_ownaircraft.h" #include "blackmisc/genericdbusinterface.h" -#include "blackmisc/avaircrafticao.h" +#include "blackmisc/aviation/aircrafticao.h" #include "blackmisc/simulation/simulatedaircraft.h" namespace BlackCore diff --git a/src/blackcore/context_runtime.cpp b/src/blackcore/context_runtime.cpp index ed4833310..4acc5f689 100644 --- a/src/blackcore/context_runtime.cpp +++ b/src/blackcore/context_runtime.cpp @@ -14,7 +14,7 @@ #include "blacksim/blacksimfreefunctions.h" #include "blackmisc/nwserver.h" #include "blackmisc/statusmessagelist.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/logmessage.h" #include "blackcore/context_runtime.h" diff --git a/src/blackcore/context_simulator.h b/src/blackcore/context_simulator.h index 659fd880f..a0046d0af 100644 --- a/src/blackcore/context_simulator.h +++ b/src/blackcore/context_simulator.h @@ -29,9 +29,9 @@ #include "blackmisc/simulation/aircraftmodellist.h" #include "blacksim/simulatorplugininfo.h" #include "blacksim/simulatorinfolist.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" #include "blackmisc/simulation/simulatedaircraftlist.h" -#include "blackmisc/avairportlist.h" +#include "blackmisc/aviation/airportlist.h" #include "blackmisc/project.h" #include "blackmisc/pixmap.h" #include "blackmisc/pqtime.h" diff --git a/src/blackcore/interpolator.h b/src/blackcore/interpolator.h index 0b6152d75..3f54cb4dc 100644 --- a/src/blackcore/interpolator.h +++ b/src/blackcore/interpolator.h @@ -12,7 +12,7 @@ #ifndef BLACKCORE_INTERPOLATOR_H #define BLACKCORE_INTERPOLATOR_H -#include "blackmisc/avaircraftsituation.h" +#include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/simulation/simdirectaccessremoteaircraft.h" #include "blackmisc/worker.h" #include diff --git a/src/blackcore/interpolator_linear.cpp b/src/blackcore/interpolator_linear.cpp index d2875a8d5..fc65e217c 100644 --- a/src/blackcore/interpolator_linear.cpp +++ b/src/blackcore/interpolator_linear.cpp @@ -8,7 +8,7 @@ */ #include "interpolator_linear.h" -#include "blackmisc/avaircraftsituation.h" +#include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/logmessage.h" #include diff --git a/src/blackcore/interpolator_linear.h b/src/blackcore/interpolator_linear.h index 7f8df1cb9..04f49267b 100644 --- a/src/blackcore/interpolator_linear.h +++ b/src/blackcore/interpolator_linear.h @@ -13,8 +13,8 @@ #define BLACKCORE_INTERPOLATOR_LINEAR_H #include "interpolator.h" -#include "blackmisc/avaircraftsituation.h" -#include "blackmisc/avaircraftsituationlist.h" +#include "blackmisc/aviation/aircraftsituation.h" +#include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/sequence.h" #include diff --git a/src/blackcore/network.h b/src/blackcore/network.h index 207b5a136..ba7cc750a 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -13,15 +13,15 @@ #define BLACKCORE_NETWORK_H #include "blacksim/simulatorplugininfo.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" #include "blackmisc/pqfrequency.h" #include "blackmisc/coordinategeodetic.h" #include "blackmisc/pqlength.h" #include "blackmisc/pqtime.h" #include "blackmisc/nwserverlist.h" #include "blackmisc/nwtextmessagelist.h" -#include "blackmisc/avinformationmessage.h" -#include "blackmisc/avflightplan.h" +#include "blackmisc/aviation/informationmessage.h" +#include "blackmisc/aviation/flightplan.h" #include #include #include diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 149114805..ba9a9182a 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -19,7 +19,7 @@ #include "blackmisc/simulation/simdirectaccessownaircraft.h" #include "blackmisc/simulation/simdirectaccessremoteaircraft.h" #include "blackmisc/statusmessagelist.h" -#include "blackmisc/avairportlist.h" +#include "blackmisc/aviation/airportlist.h" #include "blackmisc/nwtextmessage.h" #include "blackmisc/nwclient.h" #include "blackmisc/pixmap.h" diff --git a/src/blackcore/vatsimbookingreader.cpp b/src/blackcore/vatsimbookingreader.cpp index 1292dbe00..d7f849fdc 100644 --- a/src/blackcore/vatsimbookingreader.cpp +++ b/src/blackcore/vatsimbookingreader.cpp @@ -8,7 +8,7 @@ */ #include "blackmisc/sequence.h" -#include "blackmisc/avatcstation.h" +#include "blackmisc/aviation/atcstation.h" #include "blackmisc/nwuser.h" #include "blackmisc/logmessage.h" #include "vatsimbookingreader.h" diff --git a/src/blackcore/vatsimbookingreader.h b/src/blackcore/vatsimbookingreader.h index 163e31f54..6bae63afb 100644 --- a/src/blackcore/vatsimbookingreader.h +++ b/src/blackcore/vatsimbookingreader.h @@ -13,7 +13,7 @@ #define BLACKCORE_VATSIMBOOKINGREADER_H #include "blackmisc/threadedreader.h" -#include "blackmisc/avatcstationlist.h" +#include "blackmisc/aviation/atcstationlist.h" #include #include diff --git a/src/blackcore/vatsimdatafilereader.cpp b/src/blackcore/vatsimdatafilereader.cpp index 88c1598c2..5a9a4194f 100644 --- a/src/blackcore/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsimdatafilereader.cpp @@ -8,7 +8,7 @@ */ #include "blackmisc/sequence.h" -#include "blackmisc/avatcstation.h" +#include "blackmisc/aviation/atcstation.h" #include "blackmisc/nwuser.h" #include "blackmisc/nwserver.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/vatsimdatafilereader.h b/src/blackcore/vatsimdatafilereader.h index 6e440e845..554f3b8c2 100644 --- a/src/blackcore/vatsimdatafilereader.h +++ b/src/blackcore/vatsimdatafilereader.h @@ -13,12 +13,12 @@ #define BLACKCORE_VATSIMDATAFILEREADER_H #include "blackmisc/threadedreader.h" -#include "blackmisc/avatcstationlist.h" -#include "blackmisc/avaircraftlist.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/aircraftlist.h" #include "blackmisc/nwserverlist.h" #include "blackmisc/nwuserlist.h" #include "blackmisc/nwvoicecapabilities.h" -#include "blackmisc/avcallsignlist.h" +#include "blackmisc/aviation/callsignlist.h" #include #include diff --git a/src/blackcore/voice.h b/src/blackcore/voice.h index 0c7fa5ff2..ea83039a4 100644 --- a/src/blackcore/voice.h +++ b/src/blackcore/voice.h @@ -10,8 +10,8 @@ #include "voice_channel.h" #include "audio_mixer.h" -#include "../blackmisc/avcallsignlist.h" -#include "../blackmisc/avselcal.h" +#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/aviation/selcal.h" #include "../blackmisc/nwuserlist.h" #include "../blackmisc/voiceroomlist.h" #include "../blackmisc/audiodeviceinfolist.h" diff --git a/src/blackcore/voice_channel.h b/src/blackcore/voice_channel.h index f74605d98..a7052d5d7 100644 --- a/src/blackcore/voice_channel.h +++ b/src/blackcore/voice_channel.h @@ -14,7 +14,7 @@ #include "blackmisc/statusmessage.h" #include "blackmisc/voiceroomlist.h" -#include "blackmisc/avcallsignlist.h" +#include "blackmisc/aviation/callsignlist.h" #include #include diff --git a/src/blackcore/voice_channel_vatlib.h b/src/blackcore/voice_channel_vatlib.h index b657b09e4..eab3b7c2b 100644 --- a/src/blackcore/voice_channel_vatlib.h +++ b/src/blackcore/voice_channel_vatlib.h @@ -14,7 +14,7 @@ #include "voice_vatlib.h" #include "blackmisc/statusmessage.h" #include "blackmisc/voiceroomlist.h" -#include "blackmisc/avcallsignlist.h" +#include "blackmisc/aviation/callsignlist.h" #include #include diff --git a/src/blackgui/components/aircraftcomponent.h b/src/blackgui/components/aircraftcomponent.h index 432c7e9ff..dad0787f5 100644 --- a/src/blackgui/components/aircraftcomponent.h +++ b/src/blackgui/components/aircraftcomponent.h @@ -15,7 +15,7 @@ #include "blackgui/components/enableforruntime.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/updatetimer.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" #include #include diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp index 4e9250b45..2d50f3dca 100644 --- a/src/blackgui/components/atcstationcomponent.cpp +++ b/src/blackgui/components/atcstationcomponent.cpp @@ -10,7 +10,7 @@ #include "atcstationcomponent.h" #include "../guiutility.h" #include "ui_atcstationcomponent.h" -#include "blackmisc/avinformationmessage.h" +#include "blackmisc/aviation/informationmessage.h" #include "blackmisc/logmessage.h" #include "blackcore/context_network.h" #include "blackcore/context_ownaircraft.h" diff --git a/src/blackgui/components/atcstationcomponent.h b/src/blackgui/components/atcstationcomponent.h index 6d7a7becb..2a46bd78c 100644 --- a/src/blackgui/components/atcstationcomponent.h +++ b/src/blackgui/components/atcstationcomponent.h @@ -15,7 +15,7 @@ #include "blackgui/components/enableforruntime.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/updatetimer.h" -#include "blackmisc/avatcstation.h" +#include "blackmisc/aviation/atcstation.h" #include #include #include diff --git a/src/blackgui/components/cockpitcomcomponent.cpp b/src/blackgui/components/cockpitcomcomponent.cpp index b75d12fdf..48d2e3d77 100644 --- a/src/blackgui/components/cockpitcomcomponent.cpp +++ b/src/blackgui/components/cockpitcomcomponent.cpp @@ -13,7 +13,7 @@ #include "blackcore/context_network.h" #include "blackcore/context_ownaircraft.h" #include "blackcore/context_audio.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" #include "blackmisc/voiceroomlist.h" #include "blackmisc/logmessage.h" diff --git a/src/blackgui/components/cockpitcomcomponent.h b/src/blackgui/components/cockpitcomcomponent.h index fdd0f0c69..5eb81cf8f 100644 --- a/src/blackgui/components/cockpitcomcomponent.h +++ b/src/blackgui/components/cockpitcomcomponent.h @@ -12,8 +12,8 @@ #include "enablefordockwidgetinfoarea.h" #include "enableforruntime.h" -#include "blackmisc/avaircraft.h" -#include "blackmisc/aviotransponder.h" +#include "blackmisc/aviation/aircraft.h" +#include "blackmisc/aviation/transponder.h" #include "blackmisc/voiceroomlist.h" #include #include diff --git a/src/blackgui/components/cockpittranspondermodeledscomponent.h b/src/blackgui/components/cockpittranspondermodeledscomponent.h index e9443dd24..34b736436 100644 --- a/src/blackgui/components/cockpittranspondermodeledscomponent.h +++ b/src/blackgui/components/cockpittranspondermodeledscomponent.h @@ -14,8 +14,8 @@ #include "enableforruntime.h" #include "../led.h" -#include "blackmisc/avaircraft.h" -#include "blackmisc/aviotransponder.h" +#include "blackmisc/aviation/aircraft.h" +#include "blackmisc/aviation/transponder.h" #include namespace BlackGui diff --git a/src/blackgui/components/flightplancomponent.h b/src/blackgui/components/flightplancomponent.h index af8595d35..4232e5419 100644 --- a/src/blackgui/components/flightplancomponent.h +++ b/src/blackgui/components/flightplancomponent.h @@ -13,8 +13,8 @@ #define BLACKGUI_FLIGHTPLANCOMPONENT_H #include "blackgui/components/enableforruntime.h" -#include "blackmisc/avaircraft.h" -#include "blackmisc/avflightplan.h" +#include "blackmisc/aviation/aircraft.h" +#include "blackmisc/aviation/flightplan.h" #include diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index 2e3c89366..f28548189 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -16,7 +16,7 @@ #include "blackcore/context_simulator.h" #include "blackcore/network.h" #include "blackmisc/logmessage.h" -#include "blackmisc/avaircrafticao.h" +#include "blackmisc/aviation/aircrafticao.h" #include "../uppercasevalidator.h" #include diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h index 81b23374c..dd0f3a63f 100644 --- a/src/blackgui/components/logincomponent.h +++ b/src/blackgui/components/logincomponent.h @@ -13,7 +13,7 @@ #define BLACKGUI_LOGINCOMPONENT_H #include "enableforruntime.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" #include "blackmisc/nwserver.h" #include #include diff --git a/src/blackgui/components/mainkeypadareacomponent.h b/src/blackgui/components/mainkeypadareacomponent.h index c05299a69..e4a76474c 100644 --- a/src/blackgui/components/mainkeypadareacomponent.h +++ b/src/blackgui/components/mainkeypadareacomponent.h @@ -14,7 +14,7 @@ #include "maininfoareacomponent.h" #include "enableforruntime.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" #include #include diff --git a/src/blackgui/components/remoteaircraftselector.h b/src/blackgui/components/remoteaircraftselector.h index 407498e4f..f9dde2bc5 100644 --- a/src/blackgui/components/remoteaircraftselector.h +++ b/src/blackgui/components/remoteaircraftselector.h @@ -13,7 +13,7 @@ #define BLACKGUI_REMOTEAIRCRAFTSELECTOR_H #include "enableforruntime.h" -#include "blackmisc/avcallsign.h" +#include "blackmisc/aviation/callsign.h" #include "blackmisc/simulation/simulatedaircraftlist.h" diff --git a/src/blackgui/components/settingscomponent.h b/src/blackgui/components/settingscomponent.h index 826d4ebc4..b11f21e1d 100644 --- a/src/blackgui/components/settingscomponent.h +++ b/src/blackgui/components/settingscomponent.h @@ -14,7 +14,7 @@ #include "blackgui/components/enableforruntime.h" #include "blackmisc/nwserver.h" -#include "blackmisc/avaircrafticao.h" +#include "blackmisc/aviation/aircrafticao.h" #include #include #include diff --git a/src/blackgui/components/simulatorcomponent.cpp b/src/blackgui/components/simulatorcomponent.cpp index 967e516f5..d74205642 100644 --- a/src/blackgui/components/simulatorcomponent.cpp +++ b/src/blackgui/components/simulatorcomponent.cpp @@ -14,7 +14,7 @@ #include "blackcore/context_ownaircraft.h" #include "blackcore/simulator.h" #include "blackmisc/iconlist.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/textmessagecomponent.h b/src/blackgui/components/textmessagecomponent.h index 7020caefd..ba6297252 100644 --- a/src/blackgui/components/textmessagecomponent.h +++ b/src/blackgui/components/textmessagecomponent.h @@ -16,7 +16,7 @@ #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/textmessagetextedit.h" #include "blackmisc/nwtextmessage.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" #include "blackmisc/nwtextmessagelist.h" #include "blackcore/context_network.h" #include "blackcore/context_ownaircraft.h" diff --git a/src/blackgui/models/aircraftmodellistmodel.cpp b/src/blackgui/models/aircraftmodellistmodel.cpp index 5ce4f6e17..fbdf16eda 100644 --- a/src/blackgui/models/aircraftmodellistmodel.cpp +++ b/src/blackgui/models/aircraftmodellistmodel.cpp @@ -8,7 +8,7 @@ */ #include "aircraftmodellistmodel.h" -#include "blackmisc/avaircrafticao.h" +#include "blackmisc/aviation/aircrafticao.h" #include "blackmisc/icons.h" #include "blackmisc/blackmiscfreefunctions.h" diff --git a/src/blackgui/models/airportlistmodel.h b/src/blackgui/models/airportlistmodel.h index f6144717a..c6a0c3b03 100644 --- a/src/blackgui/models/airportlistmodel.h +++ b/src/blackgui/models/airportlistmodel.h @@ -13,7 +13,7 @@ #define BLACKGUI_AIRPORTLISTMODEL_H #include -#include "blackmisc/avairportlist.h" +#include "blackmisc/aviation/airportlist.h" #include "blackgui/models/listmodelbase.h" namespace BlackGui diff --git a/src/blackgui/models/atcstationlistmodel.h b/src/blackgui/models/atcstationlistmodel.h index 568996dfe..8ad2ff11b 100644 --- a/src/blackgui/models/atcstationlistmodel.h +++ b/src/blackgui/models/atcstationlistmodel.h @@ -12,7 +12,7 @@ #ifndef BLACKGUI_ATCLISTMODEL_H #define BLACKGUI_ATCLISTMODEL_H -#include "blackmisc/avatcstationlist.h" +#include "blackmisc/aviation/atcstationlist.h" #include "blackgui/models/listmodelbase.h" #include #include diff --git a/src/blackgui/models/columnformatters.h b/src/blackgui/models/columnformatters.h index d92c3e50a..a1d7ececc 100644 --- a/src/blackgui/models/columnformatters.h +++ b/src/blackgui/models/columnformatters.h @@ -14,7 +14,7 @@ #include "blackgui/led.h" #include "blackmisc/pqallquantities.h" -#include "blackmisc/aviocomsystem.h" +#include "blackmisc/aviation/comsystem.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/icon.h" #include diff --git a/src/blackgui/models/listmodelbase.cpp b/src/blackgui/models/listmodelbase.cpp index 049c0c12b..bcaf03852 100644 --- a/src/blackgui/models/listmodelbase.cpp +++ b/src/blackgui/models/listmodelbase.cpp @@ -11,9 +11,9 @@ #include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/namevariantpairlist.h" #include "blackmisc/statusmessagelist.h" -#include "blackmisc/avatcstationlist.h" -#include "blackmisc/avaircraftlist.h" -#include "blackmisc/avairportlist.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/aircraftlist.h" +#include "blackmisc/aviation/airportlist.h" #include "blackmisc/nwserverlist.h" #include "blackmisc/nwuserlist.h" #include "blackmisc/nwclientlist.h" diff --git a/src/blackgui/models/simulatedaircraftlistmodel.cpp b/src/blackgui/models/simulatedaircraftlistmodel.cpp index 22c3dc579..07bb5bf00 100644 --- a/src/blackgui/models/simulatedaircraftlistmodel.cpp +++ b/src/blackgui/models/simulatedaircraftlistmodel.cpp @@ -9,7 +9,7 @@ #include "simulatedaircraftlistmodel.h" #include "blackmisc/nwuser.h" -#include "blackmisc/avaircraftsituation.h" +#include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/blackmiscfreefunctions.h" using namespace BlackMisc::Simulation; diff --git a/src/blackgui/selcalcodeselector.cpp b/src/blackgui/selcalcodeselector.cpp index 5e0ab22bd..8b86637ab 100644 --- a/src/blackgui/selcalcodeselector.cpp +++ b/src/blackgui/selcalcodeselector.cpp @@ -9,7 +9,7 @@ #include "selcalcodeselector.h" #include "ui_selcalcodeselector.h" -#include "blackmisc/avselcal.h" +#include "blackmisc/aviation/selcal.h" #include "blackmisc/icons.h" using namespace BlackMisc; diff --git a/src/blackgui/selcalcodeselector.h b/src/blackgui/selcalcodeselector.h index 78d29f3f6..f741cd16e 100644 --- a/src/blackgui/selcalcodeselector.h +++ b/src/blackgui/selcalcodeselector.h @@ -12,7 +12,7 @@ #ifndef BLACKGUI_SELCALCODESELECTOR_H #define BLACKGUI_SELCALCODESELECTOR_H -#include "blackmisc/avselcal.h" +#include "blackmisc/aviation/selcal.h" #include #include diff --git a/src/blackgui/transpondermodeselector.h b/src/blackgui/transpondermodeselector.h index 6db7c5f8c..b467a5177 100644 --- a/src/blackgui/transpondermodeselector.h +++ b/src/blackgui/transpondermodeselector.h @@ -12,7 +12,7 @@ #ifndef BLACKGUI_TRANSPONDERMODESELECTOR_H #define BLACKGUI_TRANSPONDERMODESELECTOR_H -#include "blackmisc/aviotransponder.h" +#include "blackmisc/aviation/transponder.h" #include #include #include diff --git a/src/blackgui/views/atcstationview.cpp b/src/blackgui/views/atcstationview.cpp index 91e03a50d..9a78f4dd9 100644 --- a/src/blackgui/views/atcstationview.cpp +++ b/src/blackgui/views/atcstationview.cpp @@ -8,7 +8,7 @@ */ #include "atcstationview.h" -#include "blackmisc/avatcstationlist.h" +#include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/testing.h" #include diff --git a/src/blackmisc/avallclasses.h b/src/blackmisc/avallclasses.h deleted file mode 100644 index 98aa9b538..000000000 --- a/src/blackmisc/avallclasses.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 2013 VATSIM Community / contributors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BLACKMISC_AVALLCLASSES_H -#define BLACKMISC_AVALLCLASSES_H - -#include "blackmisc/avaltitude.h" -#include "blackmisc/avheading.h" -#include "blackmisc/avioadfsystem.h" -#include "blackmisc/aviocomsystem.h" -#include "blackmisc/avionavsystem.h" -#include "blackmisc/aviotransponder.h" -#include "blackmisc/avtrack.h" -#include "blackmisc/avcallsign.h" -#include "blackmisc/avcallsignlist.h" -#include "blackmisc/avatcstation.h" -#include "blackmisc/avatcstationlist.h" -#include "blackmisc/avaircraftlist.h" -#include "blackmisc/avaircraftsituation.h" -#include "blackmisc/avaircraftsituationlist.h" -#include "blackmisc/avairport.h" -#include "blackmisc/avairportlist.h" -#include "blackmisc/avinformationmessage.h" -#include "blackmisc/avselcal.h" -#include "blackmisc/avflightplan.h" -#include "blackmisc/aviation/aircraftengine.h" -#include "blackmisc/aviation/aircraftenginelist.h" -#include "blackmisc/aviation/aircraftlights.h" -#include "blackmisc/aviation/aircraftparts.h" -#include "blackmisc/aviation/aircraftpartslist.h" - -#endif // guard diff --git a/src/blackmisc/avioadfsystem.h b/src/blackmisc/aviation/adfsystem.h similarity index 96% rename from src/blackmisc/avioadfsystem.h rename to src/blackmisc/aviation/adfsystem.h index 43de40c5f..06170985b 100644 --- a/src/blackmisc/avioadfsystem.h +++ b/src/blackmisc/aviation/adfsystem.h @@ -9,10 +9,10 @@ //! \file -#ifndef BLACKMISC_AVIOADFSYSTEM_H -#define BLACKMISC_AVIOADFSYSTEM_H +#ifndef BLACKMISC_AVIATION_ADFSYSTEM_H +#define BLACKMISC_AVIATION_ADFSYSTEM_H -#include "blackmisc/aviomodulator.h" +#include "blackmisc/aviation/modulator.h" #include namespace BlackMisc @@ -34,9 +34,7 @@ namespace BlackMisc namespace Aviation { - /*! - * ADF system ("for NDBs") - */ + //! ADF system ("for NDBs") class CAdfSystem : public CValueObject> { public: diff --git a/src/blackmisc/avaircraft.cpp b/src/blackmisc/aviation/aircraft.cpp similarity index 99% rename from src/blackmisc/avaircraft.cpp rename to src/blackmisc/aviation/aircraft.cpp index 8ec616f56..2b675d12f 100644 --- a/src/blackmisc/avaircraft.cpp +++ b/src/blackmisc/aviation/aircraft.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "avaircraft.h" +#include "blackmisc/aviation/aircraft.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/pqconstants.h" #include "blackmisc/icon.h" @@ -19,6 +19,7 @@ namespace BlackMisc { namespace Aviation { + CAircraft::CAircraft(const CCallsign &callsign, const Network::CUser &user, const CAircraftSituation &situation) : m_callsign(callsign), m_pilot(user), m_situation(situation) { diff --git a/src/blackmisc/avaircraft.h b/src/blackmisc/aviation/aircraft.h similarity index 94% rename from src/blackmisc/avaircraft.h rename to src/blackmisc/aviation/aircraft.h index da841ec82..4ad4eaa34 100644 --- a/src/blackmisc/avaircraft.h +++ b/src/blackmisc/aviation/aircraft.h @@ -9,21 +9,21 @@ //! \file -#ifndef BLACKMISC_AIRCRAFT_H -#define BLACKMISC_AIRCRAFT_H +#ifndef BLACKMISC_AVIATION_AIRCRAFT_H +#define BLACKMISC_AVIATION_AIRCRAFT_H -#include "nwuser.h" -#include "avaircraftsituation.h" -#include "avaircrafticao.h" -#include "avcallsign.h" -#include "avselcal.h" -#include "aviotransponder.h" -#include "aviocomsystem.h" -#include "aviation/aircraftparts.h" -#include "valueobject.h" -#include "namevariantpairlist.h" -#include "propertyindex.h" -#include "blackmiscfreefunctions.h" +#include "blackmisc/nwuser.h" +#include "blackmisc/aviation/aircraftsituation.h" +#include "blackmisc/aviation/aircrafticao.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/selcal.h" +#include "blackmisc/aviation/transponder.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/aircraftparts.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/namevariantpairlist.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/blackmiscfreefunctions.h" namespace BlackMisc { @@ -300,7 +300,8 @@ BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraft, ( o.m_parts, o.m_icao, o.m_distanceToOwnAircraft, - o.m_bearingToOwnAircraft)) + o.m_bearingToOwnAircraft + )) Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraft) diff --git a/src/blackmisc/aviation/aircraftengine.cpp b/src/blackmisc/aviation/aircraftengine.cpp index 342f85bce..cf8e5f9e5 100644 --- a/src/blackmisc/aviation/aircraftengine.cpp +++ b/src/blackmisc/aviation/aircraftengine.cpp @@ -13,6 +13,7 @@ namespace BlackMisc { namespace Aviation { + CAircraftEngine::CAircraftEngine(int number, bool on) : m_number(number), m_on(on) { Q_ASSERT_X(number > 0, "CAircraftEngine", "Engine number have to be > 1"); @@ -31,5 +32,6 @@ namespace BlackMisc s += BlackMisc::boolToOnOff(m_on); return s; } + } // namespace } // namespace diff --git a/src/blackmisc/aviation/aircraftengine.h b/src/blackmisc/aviation/aircraftengine.h index 7cf2464db..8618ef645 100644 --- a/src/blackmisc/aviation/aircraftengine.h +++ b/src/blackmisc/aviation/aircraftengine.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKMISC_AIRCRAFTENGINES_H -#define BLACKMISC_AIRCRAFTENGINES_H +#ifndef BLACKMISC_AVIATION_AIRCRAFTENGINES_H +#define BLACKMISC_AVIATION_AIRCRAFTENGINES_H #include "blackmisc/valueobject.h" @@ -54,11 +54,10 @@ namespace BlackMisc } // namespace } // namespace +Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftEngine) BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftEngine, ( attr(o.m_number, flags()), attr(o.m_on, "on") )) -Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftEngine) - #endif // guard diff --git a/src/blackmisc/aviation/aircraftenginelist.cpp b/src/blackmisc/aviation/aircraftenginelist.cpp index 735d7e375..2333e8079 100644 --- a/src/blackmisc/aviation/aircraftenginelist.cpp +++ b/src/blackmisc/aviation/aircraftenginelist.cpp @@ -13,6 +13,7 @@ namespace BlackMisc { namespace Aviation { + CAircraftEngineList::CAircraftEngineList(std::initializer_list enginesOnOff) { int no = 1; // engines 1 based @@ -74,5 +75,6 @@ namespace BlackMisc qDBusRegisterMetaType(); registerMetaValueType(); } + } // namespace } // namespace diff --git a/src/blackmisc/aviation/aircraftenginelist.h b/src/blackmisc/aviation/aircraftenginelist.h index 6e00d021e..3526a5153 100644 --- a/src/blackmisc/aviation/aircraftenginelist.h +++ b/src/blackmisc/aviation/aircraftenginelist.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKMISC_AIRCRAFTENGINELIST_H -#define BLACKMISC_AIRCRAFTENGINELIST_H +#ifndef BLACKMISC_AVIATION_AIRCRAFTENGINELIST_H +#define BLACKMISC_AVIATION_AIRCRAFTENGINELIST_H #include "aircraftengine.h" #include "blackmisc/collection.h" diff --git a/src/blackmisc/avaircrafticao.cpp b/src/blackmisc/aviation/aircrafticao.cpp similarity index 99% rename from src/blackmisc/avaircrafticao.cpp rename to src/blackmisc/aviation/aircrafticao.cpp index 1f8a3ace2..fc06ee936 100644 --- a/src/blackmisc/avaircrafticao.cpp +++ b/src/blackmisc/aviation/aircrafticao.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "avaircrafticao.h" +#include "blackmisc/aviation/aircrafticao.h" #include "blackmisc/propertyindex.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/variant.h" @@ -19,6 +19,7 @@ namespace BlackMisc { namespace Aviation { + QString CAircraftIcao::convertToQString(bool i18n) const { Q_UNUSED(i18n); diff --git a/src/blackmisc/avaircrafticao.h b/src/blackmisc/aviation/aircrafticao.h similarity index 92% rename from src/blackmisc/avaircrafticao.h rename to src/blackmisc/aviation/aircrafticao.h index 79444fc45..1fd529851 100644 --- a/src/blackmisc/avaircrafticao.h +++ b/src/blackmisc/aviation/aircrafticao.h @@ -9,19 +9,17 @@ //! \file -#ifndef BLACKMISC_AIRCRAFTICAO_H -#define BLACKMISC_AIRCRAFTICAO_H +#ifndef BLACKMISC_AVIATION_AIRCRAFTICAO_H +#define BLACKMISC_AVIATION_AIRCRAFTICAO_H -#include "propertyindex.h" -#include "blackmiscfreefunctions.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/blackmiscfreefunctions.h" namespace BlackMisc { namespace Aviation { - /*! - * Value object for ICAO classification - */ + //! Value object for ICAO classification class CAircraftIcao : public CValueObject { public: @@ -169,7 +167,14 @@ namespace BlackMisc } // namespace } // namespace -BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftIcao, (o.m_aircraftDesignator, o.m_aircraftCombinedType, o.m_airlineDesignator, o.m_livery, o.m_aircraftColor)) Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftIcao) +BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftIcao, ( + o.m_aircraftDesignator, + o.m_aircraftCombinedType, + o.m_airlineDesignator, + o.m_livery, + o.m_aircraftColor + )) + #endif // guard diff --git a/src/blackmisc/aviation/aircraftlights.cpp b/src/blackmisc/aviation/aircraftlights.cpp index e48b8923b..3358632b5 100644 --- a/src/blackmisc/aviation/aircraftlights.cpp +++ b/src/blackmisc/aviation/aircraftlights.cpp @@ -16,6 +16,7 @@ namespace BlackMisc { namespace Aviation { + CAircraftLights::CAircraftLights(bool strobeOn, bool landingOn, bool taxiOn, bool beaconOn, bool navOn, bool logoOn) : m_strobeOn(strobeOn), m_landingOn(landingOn), m_taxiOn(taxiOn), m_beaconOn(beaconOn), m_navOn(navOn), m_logoOn(logoOn) { } diff --git a/src/blackmisc/aviation/aircraftlights.h b/src/blackmisc/aviation/aircraftlights.h index 91500e9e1..fb2eb1c91 100644 --- a/src/blackmisc/aviation/aircraftlights.h +++ b/src/blackmisc/aviation/aircraftlights.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKMISC_AIRCRAFTLIGHTS_H -#define BLACKMISC_AIRCRAFTLIGHTS_H +#ifndef BLACKMISC_AVIATION_AIRCRAFTLIGHTS_H +#define BLACKMISC_AVIATION_AIRCRAFTLIGHTS_H #include "blackmisc/valueobject.h" #include "blackmisc/propertyindex.h" @@ -112,6 +112,7 @@ namespace BlackMisc } // namespace } // namespace +Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftLights) BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftLights, ( attr(o.m_strobeOn, "strobe_on"), attr(o.m_landingOn, "landing_on"), @@ -121,6 +122,4 @@ BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftLights, ( attr(o.m_logoOn, "logo_on") )) -Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftLights) - #endif // guard diff --git a/src/blackmisc/avaircraftlist.cpp b/src/blackmisc/aviation/aircraftlist.cpp similarity index 88% rename from src/blackmisc/avaircraftlist.cpp rename to src/blackmisc/aviation/aircraftlist.cpp index f42e35da4..cf7cd8594 100644 --- a/src/blackmisc/avaircraftlist.cpp +++ b/src/blackmisc/aviation/aircraftlist.cpp @@ -7,10 +7,10 @@ * contained in the LICENSE file. */ -#include "avaircraftlist.h" -#include "nwuser.h" -#include "predicates.h" -#include "propertyindexallclasses.h" +#include "blackmisc/aviation/aircraftlist.h" +#include "blackmisc/nwuser.h" +#include "blackmisc/predicates.h" +#include "blackmisc/propertyindexallclasses.h" using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; @@ -20,21 +20,13 @@ namespace BlackMisc { namespace Aviation { - /* - * Default constructor - */ + CAircraftList::CAircraftList() { } - /* - * Construct from base class object - */ CAircraftList::CAircraftList(const CSequence &other) : CSequence(other) { } - /* - * Register metadata - */ void CAircraftList::registerMetadata() { qRegisterMetaType>(); @@ -46,17 +38,11 @@ namespace BlackMisc registerMetaValueType(); } - /* - * All pilots - */ CUserList CAircraftList::getPilots() const { return this->findBy(Predicates::MemberValid(&CAircraft::getPilot)).transform(Predicates::MemberTransform(&CAircraft::getPilot)); } - /* - * Merge with aircraft - */ bool CAircraftList::updateWithVatsimDataFileData(CAircraft &aircraftToBeUpdated) const { if (this->isEmpty()) return false; @@ -78,5 +64,6 @@ namespace BlackMisc aircraftToBeUpdated.setIcaoInfo(icao); return true; } + } // namespace } // namespace diff --git a/src/blackmisc/avaircraftlist.h b/src/blackmisc/aviation/aircraftlist.h similarity index 86% rename from src/blackmisc/avaircraftlist.h rename to src/blackmisc/aviation/aircraftlist.h index 05d6dddaf..0770cb5be 100644 --- a/src/blackmisc/avaircraftlist.h +++ b/src/blackmisc/aviation/aircraftlist.h @@ -9,16 +9,16 @@ //! \file -#ifndef BLACKMISC_AIRCRAFTLIST_H -#define BLACKMISC_AIRCRAFTLIST_H +#ifndef BLACKMISC_AVIATION_AIRCRAFTLIST_H +#define BLACKMISC_AVIATION_AIRCRAFTLIST_H -#include "avaircraft.h" -#include "avcallsignlist.h" -#include "avcallsignobjectlist.h" -#include "geoobjectlist.h" -#include "nwuserlist.h" -#include "collection.h" -#include "propertyindexvariantmap.h" +#include "blackmisc/aviation/aircraft.h" +#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/aviation/callsignobjectlist.h" +#include "blackmisc/geoobjectlist.h" +#include "blackmisc/nwuserlist.h" +#include "blackmisc/collection.h" +#include "blackmisc/propertyindexvariantmap.h" #include #include #include diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp index 6f54f49a9..13ba0f8bb 100644 --- a/src/blackmisc/aviation/aircraftparts.cpp +++ b/src/blackmisc/aviation/aircraftparts.cpp @@ -13,6 +13,7 @@ namespace BlackMisc { namespace Aviation { + QString CAircraftParts::convertToQString(bool i18n) const { QString s; diff --git a/src/blackmisc/aviation/aircraftparts.h b/src/blackmisc/aviation/aircraftparts.h index 77114268d..a0dc3a253 100644 --- a/src/blackmisc/aviation/aircraftparts.h +++ b/src/blackmisc/aviation/aircraftparts.h @@ -9,15 +9,15 @@ //! \file -#ifndef BLACKMISC_AIRCRAFTPARTS_H -#define BLACKMISC_AIRCRAFTPARTS_H +#ifndef BLACKMISC_AVIATION_AIRCRAFTPARTS_H +#define BLACKMISC_AVIATION_AIRCRAFTPARTS_H -#include "blackmisc/avcallsign.h" +#include "blackmisc/aviation/callsign.h" #include "blackmisc/valueobject.h" #include "blackmisc/timestampbased.h" #include "blackmisc/propertyindex.h" -#include "aircraftlights.h" -#include "aircraftenginelist.h" +#include "blackmisc/aviation/aircraftlights.h" +#include "blackmisc/aviation/aircraftenginelist.h" namespace BlackMisc { @@ -136,7 +136,6 @@ namespace BlackMisc } // namespace } // namespace -// FIXME: Use correct JSON names, when tuple bug is fixed BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftParts, ( attr(o.m_correspondingCallsign, flags < DisabledForJson > ()), attr(o.m_lights, "lights"), diff --git a/src/blackmisc/aviation/aircraftpartslist.cpp b/src/blackmisc/aviation/aircraftpartslist.cpp index f8b8f73e6..a18a78815 100644 --- a/src/blackmisc/aviation/aircraftpartslist.cpp +++ b/src/blackmisc/aviation/aircraftpartslist.cpp @@ -13,6 +13,7 @@ namespace BlackMisc { namespace Aviation { + CAircraftPartsList::CAircraftPartsList() { } CAircraftPartsList::CAircraftPartsList(const CSequence &other) : @@ -29,5 +30,6 @@ namespace BlackMisc qDBusRegisterMetaType(); registerMetaValueType(); } + } // namespace } // namespace diff --git a/src/blackmisc/aviation/aircraftpartslist.h b/src/blackmisc/aviation/aircraftpartslist.h index 90879d6df..011ac1490 100644 --- a/src/blackmisc/aviation/aircraftpartslist.h +++ b/src/blackmisc/aviation/aircraftpartslist.h @@ -9,12 +9,12 @@ //! \file -#ifndef BLACKMISC_AIRCRAFTPARTSLIST_H -#define BLACKMISC_AIRCRAFTPARTSLIST_H +#ifndef BLACKMISC_AVIATION_AIRCRAFTPARTSLIST_H +#define BLACKMISC_AVIATION_AIRCRAFTPARTSLIST_H #include "aircraftparts.h" #include "blackmisc/timestampobjectlist.h" -#include "blackmisc/avcallsignobjectlist.h" +#include "blackmisc/aviation/callsignobjectlist.h" #include namespace BlackMisc diff --git a/src/blackmisc/avaircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp similarity index 99% rename from src/blackmisc/avaircraftsituation.cpp rename to src/blackmisc/aviation/aircraftsituation.cpp index 05a9ead74..50a36fc1c 100644 --- a/src/blackmisc/avaircraftsituation.cpp +++ b/src/blackmisc/aviation/aircraftsituation.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "avaircraftsituation.h" +#include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" @@ -20,6 +20,7 @@ namespace BlackMisc { namespace Aviation { + QString CAircraftSituation::convertToQString(bool i18n) const { QString s(this->m_position.toQString(i18n)); diff --git a/src/blackmisc/avaircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h similarity index 88% rename from src/blackmisc/avaircraftsituation.h rename to src/blackmisc/aviation/aircraftsituation.h index 87de4c2d1..f19447411 100644 --- a/src/blackmisc/avaircraftsituation.h +++ b/src/blackmisc/aviation/aircraftsituation.h @@ -9,25 +9,23 @@ //! \file -#ifndef BLACKMISC_AIRCRAFTSITUATION_H -#define BLACKMISC_AIRCRAFTSITUATION_H +#ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATION_H +#define BLACKMISC_AVIATION_AIRCRAFTSITUATION_H -#include "coordinategeodetic.h" -#include "timestampbased.h" -#include "avaltitude.h" -#include "avheading.h" -#include "avcallsign.h" -#include "pqspeed.h" -#include "valueobject.h" +#include "blackmisc/coordinategeodetic.h" +#include "blackmisc/timestampbased.h" +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/aviation/heading.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/pqspeed.h" +#include "blackmisc/valueobject.h" #include namespace BlackMisc { namespace Aviation { - /*! - * Value object encapsulating information of an aircraft's situation - */ + //! Value object encapsulating information of an aircraft's situation class CAircraftSituation : public CValueObject, public Geo::ICoordinateGeodetic, public BlackMisc::ITimestampBased @@ -161,7 +159,17 @@ namespace BlackMisc } // namespace } // namespace -BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftSituation, (o.m_correspondingCallsign, o.m_position, o.m_altitude, o.m_heading, o.m_pitch, o.m_bank, o.m_groundspeed, o.m_timestampMSecsSinceEpoch)) +BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftSituation, ( + o.m_correspondingCallsign, + o.m_position, + o.m_altitude, + o.m_heading, + o.m_pitch, + o.m_bank, + o.m_groundspeed, + o.m_timestampMSecsSinceEpoch + )) + Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftSituation) #endif // guard diff --git a/src/blackmisc/avaircraftsituationlist.cpp b/src/blackmisc/aviation/aircraftsituationlist.cpp similarity index 93% rename from src/blackmisc/avaircraftsituationlist.cpp rename to src/blackmisc/aviation/aircraftsituationlist.cpp index fb8a0ff21..c906febdc 100644 --- a/src/blackmisc/avaircraftsituationlist.cpp +++ b/src/blackmisc/aviation/aircraftsituationlist.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "avaircraftsituationlist.h" -#include "predicates.h" +#include "blackmisc/aviation/aircraftsituationlist.h" +#include "blackmisc/predicates.h" using namespace BlackMisc::PhysicalQuantities; @@ -16,6 +16,7 @@ namespace BlackMisc { namespace Aviation { + CAircraftSituationList::CAircraftSituationList() { } diff --git a/src/blackmisc/avaircraftsituationlist.h b/src/blackmisc/aviation/aircraftsituationlist.h similarity index 87% rename from src/blackmisc/avaircraftsituationlist.h rename to src/blackmisc/aviation/aircraftsituationlist.h index dc77e6dd5..c180428dd 100644 --- a/src/blackmisc/avaircraftsituationlist.h +++ b/src/blackmisc/aviation/aircraftsituationlist.h @@ -9,13 +9,13 @@ //! \file -#ifndef BLACKMISC_AVAIRCRAFTSITUATIONLIST_H -#define BLACKMISC_AVAIRCRAFTSITUATIONLIST_H +#ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATIONLIST_H +#define BLACKMISC_AVIATION_AIRCRAFTSITUATIONLIST_H -#include "avaircraftsituation.h" -#include "timestampobjectlist.h" -#include "avcallsignobjectlist.h" -#include "sequence.h" +#include "blackmisc/aviation/aircraftsituation.h" +#include "blackmisc/timestampobjectlist.h" +#include "blackmisc/aviation/callsignobjectlist.h" +#include "blackmisc/sequence.h" namespace BlackMisc { diff --git a/src/blackmisc/avairport.cpp b/src/blackmisc/aviation/airport.cpp similarity index 90% rename from src/blackmisc/avairport.cpp rename to src/blackmisc/aviation/airport.cpp index 36f01848e..06c4a6d27 100644 --- a/src/blackmisc/avairport.cpp +++ b/src/blackmisc/aviation/airport.cpp @@ -7,10 +7,10 @@ * contained in the LICENSE file. */ -#include "avairport.h" -#include "blackmiscfreefunctions.h" -#include "propertyindex.h" -#include "variant.h" +#include "blackmisc/aviation/airport.h" +#include "blackmisc/blackmiscfreefunctions.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/variant.h" using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Geo; @@ -19,36 +19,22 @@ namespace BlackMisc { namespace Aviation { - /* - * Constructor - */ + CAirport::CAirport() { } - /* - * Constructor - */ CAirport::CAirport(const QString &icao) : m_icao(icao) { } - /* - * Constructor - */ CAirport::CAirport(const CAirportIcao &icao, const BlackMisc::Geo::CCoordinateGeodetic &position) : m_icao(icao), m_position(position) { } - /* - * Constructor - */ CAirport::CAirport(const CAirportIcao &icao, const BlackMisc::Geo::CCoordinateGeodetic &position, const QString &descriptiveName) : m_icao(icao), m_descriptiveName(descriptiveName), m_position(position) { } - /* - * Convert to string - */ QString CAirport::convertToQString(bool i18n) const { QString s = i18n ? @@ -65,9 +51,6 @@ namespace BlackMisc (void)QT_TRANSLATE_NOOP("Aviation", "ATC station"); } - /* - * Property by index - */ CVariant CAirport::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { if (index.isMyself()) { return this->toCVariant(); } @@ -93,9 +76,6 @@ namespace BlackMisc } } - /* - * Set property as index - */ void CAirport::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) diff --git a/src/blackmisc/avairport.h b/src/blackmisc/aviation/airport.h similarity index 87% rename from src/blackmisc/avairport.h rename to src/blackmisc/aviation/airport.h index 103f46132..70fe91c43 100644 --- a/src/blackmisc/avairport.h +++ b/src/blackmisc/aviation/airport.h @@ -9,20 +9,18 @@ //! \file -#ifndef BLACKMISC_AIRPORT_H -#define BLACKMISC_AIRPORT_H +#ifndef BLACKMISC_AVIATION_AIRPORT_H +#define BLACKMISC_AVIATION_AIRPORT_H -#include "avairporticao.h" -#include "coordinategeodetic.h" -#include "propertyindex.h" +#include "blackmisc/aviation/airporticao.h" +#include "blackmisc/coordinategeodetic.h" +#include "blackmisc/propertyindex.h" namespace BlackMisc { namespace Aviation { - /*! - * Value object encapsulating information about an airpot. - */ + //! Value object encapsulating information about an airpot. class CAirport : public CValueObject, public Geo::ICoordinateWithRelativePosition { public: @@ -116,7 +114,14 @@ namespace BlackMisc } // namespace } // namespace -BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAirport, (o.m_icao, o.m_descriptiveName, o.m_position, o.m_distanceToOwnAircraft, o.m_bearingToOwnAircraft)) +BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAirport, ( + o.m_icao, + o.m_descriptiveName, + o.m_position, + o.m_distanceToOwnAircraft, + o.m_bearingToOwnAircraft + )) + Q_DECLARE_METATYPE(BlackMisc::Aviation::CAirport) #endif // guard diff --git a/src/blackmisc/avairporticao.cpp b/src/blackmisc/aviation/airporticao.cpp similarity index 78% rename from src/blackmisc/avairporticao.cpp rename to src/blackmisc/aviation/airporticao.cpp index 5114aee1a..945a87b18 100644 --- a/src/blackmisc/avairporticao.cpp +++ b/src/blackmisc/aviation/airporticao.cpp @@ -1,29 +1,21 @@ -#include "avairporticao.h" +#include "blackmisc/aviation/airporticao.h" namespace BlackMisc { namespace Aviation { - /* - * Convert to string - */ + QString CAirportIcao::convertToQString(bool /** i18n **/) const { return this->m_icaoCode; } - /* - * Equals callsign? - */ bool CAirportIcao::equalsString(const QString &icaoCode) const { CAirportIcao other(icaoCode); return other == (*this); } - /* - * Unify ICAO code - */ QString CAirportIcao::unifyAirportCode(const QString &icaoCode) { QString code = icaoCode.trimmed().toUpper(); @@ -32,9 +24,6 @@ namespace BlackMisc return (reg.exactMatch(code)) ? code : ""; } - /* - * Valid ICAO designator? - */ bool CAirportIcao::isValidIcaoDesignator(const QString &icaoCode) { QString icao = unifyAirportCode(icaoCode); diff --git a/src/blackmisc/avairporticao.h b/src/blackmisc/aviation/airporticao.h similarity index 93% rename from src/blackmisc/avairporticao.h rename to src/blackmisc/aviation/airporticao.h index 8663dabc5..d0fe6c746 100644 --- a/src/blackmisc/avairporticao.h +++ b/src/blackmisc/aviation/airporticao.h @@ -9,11 +9,11 @@ //! \file -#ifndef BLACKMISC_AIRPORTICAO_H -#define BLACKMISC_AIRPORTICAO_H +#ifndef BLACKMISC_AVIATION_AIRPORTICAO_H +#define BLACKMISC_AVIATION_AIRPORTICAO_H -#include "valueobject.h" -#include "blackmiscfreefunctions.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/blackmiscfreefunctions.h" namespace BlackMisc { diff --git a/src/blackmisc/avairportlist.cpp b/src/blackmisc/aviation/airportlist.cpp similarity index 84% rename from src/blackmisc/avairportlist.cpp rename to src/blackmisc/aviation/airportlist.cpp index a6e674610..70d78fb78 100644 --- a/src/blackmisc/avairportlist.cpp +++ b/src/blackmisc/aviation/airportlist.cpp @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "avairportlist.h" -#include "predicates.h" +#include "blackmisc/aviation/airportlist.h" +#include "blackmisc/predicates.h" using namespace BlackMisc::PhysicalQuantities; @@ -12,21 +12,13 @@ namespace BlackMisc { namespace Aviation { - /* - * Empty constructor - */ + CAirportList::CAirportList() { } - /* - * Construct from base class object - */ CAirportList::CAirportList(const CSequence &other) : CSequence(other) { } - /* - * Register metadata - */ void CAirportList::registerMetadata() { qRegisterMetaType>(); @@ -38,9 +30,6 @@ namespace BlackMisc registerMetaValueType(); } - /* - * Find by ICAO - */ CAirportList CAirportList::findByIcao(const CAirportIcao &icao) const { return this->findBy(&CAirport::getIcao, icao); @@ -52,9 +41,6 @@ namespace BlackMisc this->replaceOrAdd(&CAirport::getIcao, addedOrReplacedAirport.getIcao(), addedOrReplacedAirport); } - /* - * Find first by ICAO - */ CAirport CAirportList::findFirstByIcao(const CAirportIcao &icao, const CAirport &ifNotFound) const { return this->findByIcao(icao).frontOrDefault(ifNotFound); diff --git a/src/blackmisc/avairportlist.h b/src/blackmisc/aviation/airportlist.h similarity index 93% rename from src/blackmisc/avairportlist.h rename to src/blackmisc/aviation/airportlist.h index 32213bcb9..398395e04 100644 --- a/src/blackmisc/avairportlist.h +++ b/src/blackmisc/aviation/airportlist.h @@ -9,10 +9,10 @@ //! \file -#ifndef BLACKMISC_AIRPORTLIST_H -#define BLACKMISC_AIRPORTLIST_H +#ifndef BLACKMISC_AVIATION_AIRPORTLIST_H +#define BLACKMISC_AVIATION_AIRPORTLIST_H -#include "blackmisc/avairport.h" +#include "blackmisc/aviation/airport.h" #include "blackmisc/geoobjectlist.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" @@ -25,9 +25,7 @@ namespace BlackMisc { namespace Aviation { - /*! - * Value object for a list of airports. - */ + //! Value object for a list of airports. class CAirportList : public CSequence, public BlackMisc::Geo::IGeoObjectWithRelativePositionList diff --git a/src/blackmisc/avaltitude.cpp b/src/blackmisc/aviation/altitude.cpp similarity index 89% rename from src/blackmisc/avaltitude.cpp rename to src/blackmisc/aviation/altitude.cpp index 827d3e8eb..9d05cd03e 100644 --- a/src/blackmisc/avaltitude.cpp +++ b/src/blackmisc/aviation/altitude.cpp @@ -7,9 +7,9 @@ * contained in the LICENSE file. */ -#include "avaltitude.h" -#include "pqstring.h" -#include "iconlist.h" +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/pqstring.h" +#include "blackmisc/iconlist.h" using BlackMisc::PhysicalQuantities::CLength; using BlackMisc::PhysicalQuantities::CLengthUnit; @@ -19,17 +19,11 @@ namespace BlackMisc namespace Aviation { - /* - * Constructor - */ CAltitude::CAltitude(const QString &altitudeAsString, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode) : CValueObject(0, BlackMisc::PhysicalQuantities::CLengthUnit::m()), m_datum(MeanSeaLevel) { this->parseFromString(altitudeAsString, mode); } - /* - * Own implementation for streaming - */ QString CAltitude::convertToQString(bool i18n) const { if (this->m_datum == FlightLevel) @@ -48,35 +42,23 @@ namespace BlackMisc } } - /* - * To FL - */ void CAltitude::toFlightLevel() { Q_ASSERT(this->m_datum == MeanSeaLevel || this->m_datum == FlightLevel); this->m_datum = FlightLevel; } - /* - * To MSL - */ void CAltitude::toMeanSeaLevel() { Q_ASSERT(this->m_datum == MeanSeaLevel || this->m_datum == FlightLevel); this->m_datum = MeanSeaLevel; } - /* - * Parse value - */ void CAltitude::parseFromString(const QString &value) { this->parseFromString(value, BlackMisc::PhysicalQuantities::CPqString::SeparatorsCLocale); } - /* - * Parse value - */ void CAltitude::parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode) { QString v = value.trimmed(); @@ -110,9 +92,6 @@ namespace BlackMisc *this = CAltitude(l, rd); } - /* - * Icon - */ CIcon CAltitude::toIcon() const { return BlackMisc::CIconList::iconByIndex(CIcons::GeoPosition); diff --git a/src/blackmisc/avaltitude.h b/src/blackmisc/aviation/altitude.h similarity index 98% rename from src/blackmisc/avaltitude.h rename to src/blackmisc/aviation/altitude.h index 3e9ea5a3c..ed43c1153 100644 --- a/src/blackmisc/avaltitude.h +++ b/src/blackmisc/aviation/altitude.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKMISC_AVALTITUDE_H -#define BLACKMISC_AVALTITUDE_H +#ifndef BLACKMISC_AVIATION_ALTITUDE_H +#define BLACKMISC_AVIATION_ALTITUDE_H #include "blackmisc/pqlength.h" diff --git a/src/blackmisc/avatcstation.cpp b/src/blackmisc/aviation/atcstation.cpp similarity index 92% rename from src/blackmisc/avatcstation.cpp rename to src/blackmisc/aviation/atcstation.cpp index 942689276..72e418d4a 100644 --- a/src/blackmisc/avatcstation.cpp +++ b/src/blackmisc/aviation/atcstation.cpp @@ -7,13 +7,13 @@ * contained in the LICENSE file. */ -#include "avatcstation.h" -#include "aviocomsystem.h" -#include "voiceroom.h" -#include "icon.h" -#include "propertyindex.h" -#include "blackmiscfreefunctions.h" -#include "variant.h" +#include "blackmisc/aviation/atcstation.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/voiceroom.h" +#include "blackmisc/icon.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/blackmiscfreefunctions.h" +#include "blackmisc/variant.h" using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Geo; @@ -25,25 +25,12 @@ namespace BlackMisc namespace Aviation { - /* - * Constructor - */ CAtcStation::CAtcStation() - { - // void - } + { } - /* - * Constructor - */ CAtcStation::CAtcStation(const QString &callsign) : m_callsign(callsign) - { - // void - } + { } - /* - * Constructor - */ CAtcStation::CAtcStation(const CCallsign &callsign, const CUser &controller, const CFrequency &frequency, const CCoordinateGeodetic &pos, const CLength &range, bool isOnline, const QDateTime &bookedFromUtc, const QDateTime &bookedUntilUtc, const CInformationMessage &atis, const CInformationMessage &metar) : m_callsign(callsign), m_controller(controller), m_frequency(frequency), m_position(pos), @@ -54,34 +41,22 @@ namespace BlackMisc this->m_controller.setCallsign(callsign); } - /* - * METAR - */ bool CAtcStation::hasMetar() const { return this->m_metar.hasMessage(); } - /* - * Suffix - */ QString CAtcStation::getCallsignSuffix() const { return m_callsign.getSuffix(); } - /* - * Callsign - */ void CAtcStation::setCallsign(const CCallsign &callsign) { this->m_callsign = callsign; this->m_controller.setCallsign(callsign); } - /* - * Convert to string - */ QString CAtcStation::convertToQString(bool i18n) const { QString s = i18n ? @@ -184,18 +159,12 @@ namespace BlackMisc (void)QT_TRANSLATE_NOOP("Network", "voiceroom"); } - /* - * Frequency - */ void CAtcStation::setFrequency(const CFrequency &frequency) { this->m_frequency = frequency; this->m_frequency.setUnit(CFrequencyUnit::MHz()); } - /* - * SyncronizeControllerData - */ void CAtcStation::syncronizeControllerData(CAtcStation &otherStation) { if (this->m_controller == otherStation.getController()) return; @@ -204,9 +173,6 @@ namespace BlackMisc otherStation.setController(otherController); } - /* - * Booked now - */ bool CAtcStation::isBookedNow() const { if (!this->hasValidBookingTimes()) return false; @@ -216,9 +182,6 @@ namespace BlackMisc return true; } - /* - * When booked? - */ CTime CAtcStation::bookedWhen() const { if (!this->hasValidBookingTimes()) return CTime(-365.0, CTimeUnit::d()); @@ -243,33 +206,21 @@ namespace BlackMisc } } - /* - * latitude - */ const CLatitude &CAtcStation::latitude() const { return this->getPosition().latitude(); } - /* - * lomgitude - */ const CLongitude &CAtcStation::longitude() const { return this->getPosition().longitude(); } - /* - * geodetic height - */ const CLength &CAtcStation::geodeticHeight() const { return this->m_position.geodeticHeight(); } - /* - * Property by index - */ CVariant CAtcStation::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { if (index.isMyself()) { return this->toCVariant(); } @@ -310,9 +261,6 @@ namespace BlackMisc } } - /* - * Set property as index - */ void CAtcStation::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { this->convertFromCVariant(variant); return; } diff --git a/src/blackmisc/avatcstation.h b/src/blackmisc/aviation/atcstation.h similarity index 90% rename from src/blackmisc/avatcstation.h rename to src/blackmisc/aviation/atcstation.h index cee127067..ddd7e87da 100644 --- a/src/blackmisc/avatcstation.h +++ b/src/blackmisc/aviation/atcstation.h @@ -9,18 +9,18 @@ //! \file -#ifndef BLACKMISC_ATCSTATION_H -#define BLACKMISC_ATCSTATION_H +#ifndef BLACKMISC_AVIATION_ATCSTATION_H +#define BLACKMISC_AVIATION_ATCSTATION_H -#include "voiceroom.h" -#include "aviocomsystem.h" -#include "avinformationmessage.h" -#include "avcallsign.h" -#include "nwuser.h" -#include "coordinategeodetic.h" -#include "pqfrequency.h" -#include "pqlength.h" -#include "pqtime.h" +#include "blackmisc/voiceroom.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/informationmessage.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/nwuser.h" +#include "blackmisc/coordinategeodetic.h" +#include "blackmisc/pqfrequency.h" +#include "blackmisc/pqlength.h" +#include "blackmisc/pqtime.h" #include #include #include @@ -29,9 +29,7 @@ namespace BlackMisc { namespace Aviation { - /*! - * Value object encapsulating information about an ATC station. - */ + //! Value object encapsulating information about an ATC station. class CAtcStation : public CValueObject, public Geo::ICoordinateWithRelativePosition { public: @@ -270,7 +268,21 @@ namespace BlackMisc } // namespace } // namespace -BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAtcStation, (o.m_callsign, o.m_controller, o.m_frequency, o.m_position, o.m_range, o.m_isOnline, o.m_atis, o.m_bookedFromUtc, o.m_bookedUntilUtc, o.m_metar, o.m_voiceRoom, o.m_distanceToOwnAircraft, o.m_bearingToOwnAircraft)) +BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAtcStation, ( + o.m_callsign, + o.m_controller, + o.m_frequency, + o.m_position, + o.m_range, + o.m_isOnline, + o.m_atis, + o.m_bookedFromUtc, + o.m_bookedUntilUtc, + o.m_metar, + o.m_voiceRoom, + o.m_distanceToOwnAircraft, + o.m_bearingToOwnAircraft + )) Q_DECLARE_METATYPE(BlackMisc::Aviation::CAtcStation) #endif // guard diff --git a/src/blackmisc/avatcstationlist.cpp b/src/blackmisc/aviation/atcstationlist.cpp similarity index 98% rename from src/blackmisc/avatcstationlist.cpp rename to src/blackmisc/aviation/atcstationlist.cpp index 220bed374..575587a14 100644 --- a/src/blackmisc/avatcstationlist.cpp +++ b/src/blackmisc/aviation/atcstationlist.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "avatcstationlist.h" -#include "predicates.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/predicates.h" using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Network; @@ -17,6 +17,7 @@ namespace BlackMisc { namespace Aviation { + CAtcStationList::CAtcStationList() { } CAtcStationList::CAtcStationList(const CSequence &other) : diff --git a/src/blackmisc/avatcstationlist.h b/src/blackmisc/aviation/atcstationlist.h similarity index 88% rename from src/blackmisc/avatcstationlist.h rename to src/blackmisc/aviation/atcstationlist.h index 52f98891d..36608ef53 100644 --- a/src/blackmisc/avatcstationlist.h +++ b/src/blackmisc/aviation/atcstationlist.h @@ -9,15 +9,15 @@ //! \file -#ifndef BLACKMISC_ATCSTATIONLIST_H -#define BLACKMISC_ATCSTATIONLIST_H +#ifndef BLACKMISC_AVIATION_ATCSTATIONLIST_H +#define BLACKMISC_AVIATION_ATCSTATIONLIST_H -#include "geoobjectlist.h" -#include "nwuserlist.h" -#include "avatcstation.h" -#include "avcallsignobjectlist.h" -#include "collection.h" -#include "sequence.h" +#include "blackmisc/geoobjectlist.h" +#include "blackmisc/nwuserlist.h" +#include "blackmisc/aviation/atcstation.h" +#include "blackmisc/aviation/callsignobjectlist.h" +#include "blackmisc/collection.h" +#include "blackmisc/sequence.h" #include #include #include @@ -26,9 +26,7 @@ namespace BlackMisc { namespace Aviation { - /*! - * Value object for a list of ATC stations. - */ + //! Value object for a list of ATC stations. class CAtcStationList : public CSequence, public BlackMisc::Aviation::ICallsignObjectList, diff --git a/src/blackmisc/aviation/aviation.h b/src/blackmisc/aviation/aviation.h new file mode 100644 index 000000000..89d1cf7e4 --- /dev/null +++ b/src/blackmisc/aviation/aviation.h @@ -0,0 +1,39 @@ +/* Copyright (C) 2013 VATSIM Community / contributors + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef BLACKMISC_AVIATION_AVIATION_H +#define BLACKMISC_AVIATION_AVIATION_H + +/*! + * \namespace BlackMisc::Aviation + * \brief Aviation and Avionics classes such as CHeading or CTransponder . + */ + +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/aviation/heading.h" +#include "blackmisc/aviation/adfsystem.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/navsystem.h" +#include "blackmisc/aviation/transponder.h" +#include "blackmisc/aviation/track.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/aviation/atcstation.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/aircraftlist.h" +#include "blackmisc/aviation/aircraftsituation.h" +#include "blackmisc/aviation/aircraftsituationlist.h" +#include "blackmisc/aviation/airport.h" +#include "blackmisc/aviation/airportlist.h" +#include "blackmisc/aviation/informationmessage.h" +#include "blackmisc/aviation/selcal.h" +#include "blackmisc/aviation/flightplan.h" +#include "blackmisc/aviation/aircraftengine.h" +#include "blackmisc/aviation/aircraftenginelist.h" +#include "blackmisc/aviation/aircraftlights.h" +#include "blackmisc/aviation/aircraftparts.h" +#include "blackmisc/aviation/aircraftpartslist.h" + +#endif // guard diff --git a/src/blackmisc/aviobase.h b/src/blackmisc/aviation/avionicsbase.h similarity index 92% rename from src/blackmisc/aviobase.h rename to src/blackmisc/aviation/avionicsbase.h index df534af3b..1588d38d0 100644 --- a/src/blackmisc/aviobase.h +++ b/src/blackmisc/aviation/avionicsbase.h @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef BLACKMISC_AVIOBASE_H -#define BLACKMISC_AVIOBASE_H +#ifndef BLACKMISC_AVIATION_AVIONICSBASE_H +#define BLACKMISC_AVIATION_AVIONICSBASE_H //! \file @@ -17,7 +17,7 @@ namespace BlackMisc namespace Aviation { - //! \brief Base class for avionics + //! Base class for avionics class CAvionicsBase : public CValueObject { protected: diff --git a/src/blackmisc/blackmiscfreefunctions_avmeta.cpp b/src/blackmisc/aviation/blackmiscfreefunctions_avmeta.cpp similarity index 95% rename from src/blackmisc/blackmiscfreefunctions_avmeta.cpp rename to src/blackmisc/aviation/blackmiscfreefunctions_avmeta.cpp index ed589e549..604da248a 100644 --- a/src/blackmisc/blackmiscfreefunctions_avmeta.cpp +++ b/src/blackmisc/aviation/blackmiscfreefunctions_avmeta.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "blackmiscfreefunctions.h" -#include "avallclasses.h" +#include "blackmisc/blackmiscfreefunctions.h" +#include "blackmisc/aviation/aviation.h" /* * Metadata for aviation diff --git a/src/blackmisc/avcallsign.cpp b/src/blackmisc/aviation/callsign.cpp similarity index 89% rename from src/blackmisc/avcallsign.cpp rename to src/blackmisc/aviation/callsign.cpp index 249e79476..6da97cfc2 100644 --- a/src/blackmisc/avcallsign.cpp +++ b/src/blackmisc/aviation/callsign.cpp @@ -7,25 +7,19 @@ * contained in the LICENSE file. */ -#include "avcallsign.h" -#include "iconlist.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/iconlist.h" namespace BlackMisc { namespace Aviation { - /* - * Convert to string - */ QString CCallsign::convertToQString(bool i18n) const { Q_UNUSED(i18n); return this->m_callsign; } - /* - * Unify the callsign - */ QString CCallsign::unifyCallsign(const QString &callsign) { QString unified = callsign.toUpper(); @@ -34,9 +28,6 @@ namespace BlackMisc return unified; } - /* - * Iconify - */ const CIcon &CCallsign::convertToIcon(const CCallsign &callsign) { if (callsign.hasSuffix()) @@ -67,44 +58,28 @@ namespace BlackMisc return CIconList::iconByIndex(CIcons::NetworkRoleUnknown); } - /* - * ATC callsign? - */ bool CCallsign::isAtcCallsign() const { if (!this->hasSuffix()) { return false; } return atcCallsignSuffixes().contains(this->getSuffix(), Qt::CaseInsensitive); } - /* - * Supervisor callsign? - */ bool CCallsign::isSupervisorCallsign() const { return this->m_callsign.endsWith("SUP"); } - /* - * ATC callsign? - */ bool CCallsign::isAtcAlikeCallsign() const { if (!this->hasSuffix()) { return false; } return atcAlikeCallsignSuffixes().contains(this->getSuffix(), Qt::CaseInsensitive); } - - /* - * OBS callsign? - */ bool CCallsign::isObserverCallsign() const { return m_callsignAsSet.endsWith("_OBS", Qt::CaseInsensitive); } - /* - * Callsign as Observer - */ QString CCallsign::getAsObserverCallsignString() const { if (this->isEmpty()) { return ""; } @@ -114,9 +89,6 @@ namespace BlackMisc return obs.append("_OBS").toUpper(); } - /* - * Suffix - */ QString CCallsign::getSuffix() const { QString s; @@ -127,26 +99,17 @@ namespace BlackMisc return s; } - /* - * Suffix? - */ bool CCallsign::hasSuffix() const { return this->getStringAsSet().contains('_'); } - /* - * Equals callsign? - */ bool CCallsign::equalsString(const QString &callsignString) const { CCallsign other(callsignString); return other == (*this); } - /* - * Index - */ CVariant CCallsign::propertyByIndex(const CPropertyIndex &index) const { if (index.isMyself()) { return this->toCVariant(); } @@ -166,9 +129,6 @@ namespace BlackMisc } } - /* - * Index - */ void CCallsign::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) { if (index.isMyself()) @@ -193,9 +153,6 @@ namespace BlackMisc } } - /* - * Valid callsign? - */ bool CCallsign::isValidCallsign(const QString &callsign) { // We allow all number callsigns @@ -204,9 +161,6 @@ namespace BlackMisc return (regexp.match(callsign).hasMatch()); } - /* - * Suffixes - */ const QStringList &CCallsign::atcCallsignSuffixes() { static const QStringList a( { "APP", "GND", "TWR", "DEL", "CTR" }); @@ -219,6 +173,5 @@ namespace BlackMisc return a; } - } // namespace } // namespace diff --git a/src/blackmisc/avcallsign.h b/src/blackmisc/aviation/callsign.h similarity index 96% rename from src/blackmisc/avcallsign.h rename to src/blackmisc/aviation/callsign.h index 572a58965..572a7b032 100644 --- a/src/blackmisc/avcallsign.h +++ b/src/blackmisc/aviation/callsign.h @@ -9,12 +9,12 @@ //! \file -#ifndef BLACKMISC_CALLSIGN_H -#define BLACKMISC_CALLSIGN_H +#ifndef BLACKMISC_AVIATION_CALLSIGN_H +#define BLACKMISC_AVIATION_CALLSIGN_H -#include "propertyindex.h" -#include "icon.h" -#include "blackmiscfreefunctions.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/icon.h" +#include "blackmisc/blackmiscfreefunctions.h" namespace BlackMisc { diff --git a/src/blackmisc/avcallsignlist.cpp b/src/blackmisc/aviation/callsignlist.cpp similarity index 93% rename from src/blackmisc/avcallsignlist.cpp rename to src/blackmisc/aviation/callsignlist.cpp index 781a47e91..481e22059 100644 --- a/src/blackmisc/avcallsignlist.cpp +++ b/src/blackmisc/aviation/callsignlist.cpp @@ -7,13 +7,14 @@ * contained in the LICENSE file. */ -#include "avcallsignlist.h" -#include "predicates.h" +#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/predicates.h" namespace BlackMisc { namespace Aviation { + CCallsignList::CCallsignList() { } CCallsignList::CCallsignList(const CCollection &other) : @@ -30,5 +31,6 @@ namespace BlackMisc qDBusRegisterMetaType(); registerMetaValueType(); } + } // namespace } // namespace diff --git a/src/blackmisc/avcallsignlist.h b/src/blackmisc/aviation/callsignlist.h similarity index 88% rename from src/blackmisc/avcallsignlist.h rename to src/blackmisc/aviation/callsignlist.h index da037c181..3af44923c 100644 --- a/src/blackmisc/avcallsignlist.h +++ b/src/blackmisc/aviation/callsignlist.h @@ -9,12 +9,12 @@ //! \file -#ifndef BLACKMISC_CALLSIGNLIST_H -#define BLACKMISC_CALLSIGNLIST_H +#ifndef BLACKMISC_AVIATION_CALLSIGNLIST_H +#define BLACKMISC_AVIATION_CALLSIGNLIST_H -#include "avcallsign.h" -#include "collection.h" -#include "sequence.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/collection.h" +#include "blackmisc/sequence.h" #include namespace BlackMisc diff --git a/src/blackmisc/avcallsignobjectlist.cpp b/src/blackmisc/aviation/callsignobjectlist.cpp similarity index 97% rename from src/blackmisc/avcallsignobjectlist.cpp rename to src/blackmisc/aviation/callsignobjectlist.cpp index 6dfc2a03c..94f435d22 100644 --- a/src/blackmisc/avcallsignobjectlist.cpp +++ b/src/blackmisc/aviation/callsignobjectlist.cpp @@ -7,11 +7,11 @@ * contained in the LICENSE file. */ -#include "blackmisc/avcallsignobjectlist.h" +#include "blackmisc/aviation/callsignobjectlist.h" #include "blackmisc/predicates.h" -#include "blackmisc/avatcstationlist.h" -#include "blackmisc/avaircraftlist.h" -#include "blackmisc/avaircraftsituationlist.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/aircraftlist.h" +#include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/aviation/aircraftpartslist.h" #include "blackmisc/nwclientlist.h" #include "blackmisc/simulation/simulatedaircraftlist.h" diff --git a/src/blackmisc/avcallsignobjectlist.h b/src/blackmisc/aviation/callsignobjectlist.h similarity index 95% rename from src/blackmisc/avcallsignobjectlist.h rename to src/blackmisc/aviation/callsignobjectlist.h index ad65b23e9..041b329dc 100644 --- a/src/blackmisc/avcallsignobjectlist.h +++ b/src/blackmisc/aviation/callsignobjectlist.h @@ -9,12 +9,12 @@ //! \file -#ifndef BLACKMISC_CALLSIGNOBJECTLIST_H -#define BLACKMISC_CALLSIGNOBJECTLIST_H +#ifndef BLACKMISC_AVIATION_CALLSIGNOBJECTLIST_H +#define BLACKMISC_AVIATION_CALLSIGNOBJECTLIST_H #include "blackmisc/collection.h" #include "blackmisc/sequence.h" -#include "blackmisc/avcallsignlist.h" +#include "blackmisc/aviation/callsignlist.h" #include "blackmisc/propertyindexlist.h" #include "blackmisc/propertyindexvariantmap.h" #include diff --git a/src/blackmisc/aviocomsystem.cpp b/src/blackmisc/aviation/comsystem.cpp similarity index 90% rename from src/blackmisc/aviocomsystem.cpp rename to src/blackmisc/aviation/comsystem.cpp index 9930317b4..f7d33a446 100644 --- a/src/blackmisc/aviocomsystem.cpp +++ b/src/blackmisc/aviation/comsystem.cpp @@ -8,7 +8,7 @@ */ #include "blackmisc/blackmiscfreefunctions.h" -#include "blackmisc/aviocomsystem.h" +#include "blackmisc/aviation/comsystem.h" using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Math; @@ -17,9 +17,7 @@ namespace BlackMisc { namespace Aviation { - /* - * Valid values? - */ + bool CComSystem::validValues() const { if (this->isDefaultValue()) return true; // special case @@ -30,27 +28,18 @@ namespace BlackMisc CComSystem::isValidMilitaryFrequency(this->getFrequencyStandby())); } - /* - * COM frequency - */ void CComSystem::setFrequencyActiveMHz(double frequencyMHz) { CFrequency f(frequencyMHz, CFrequencyUnit::MHz()); this->setFrequencyActive(f); } - /* - * COM frequency - */ void CComSystem::setFrequencyStandbyMHz(double frequencyMHz) { CFrequency f(frequencyMHz, CFrequencyUnit::MHz()); this->setFrequencyStandby(f); } - /* - * COM frequency - */ void CComSystem::setFrequencyActive(const CFrequency &frequency) { if (frequency == this->getFrequencyActive()) { return; } // save all the comparisons / rounding @@ -59,9 +48,6 @@ namespace BlackMisc this->CModulator::setFrequencyActive(fRounded); } - /* - * COM frequency - */ void CComSystem::setFrequencyStandby(const CFrequency &frequency) { if (frequency == this->getFrequencyStandby()) { return; } // save all the comparisons / rounding @@ -70,9 +56,6 @@ namespace BlackMisc this->CModulator::setFrequencyStandby(fRounded); } - /* - * Round to channel spacing - */ void CComSystem::roundToChannelSpacing(PhysicalQuantities::CFrequency &frequency, ChannelSpacing channelSpacing) { double channelSpacingKHz = CComSystem::channelSpacingToFrequencyKHz(channelSpacing); @@ -86,9 +69,6 @@ namespace BlackMisc frequency.setCurrentUnitValue(down ? f1 : f2); } - /* - * Within channel spacing - */ bool CComSystem::isWithinChannelSpacing(const CFrequency &setFrequency, const CFrequency &compareFrequency, CComSystem::ChannelSpacing channelSpacing) { if (setFrequency == compareFrequency) return true; // shortcut for many of such comparisons @@ -99,9 +79,6 @@ namespace BlackMisc (setFrequencyKHz + channelSpacingKHz > compareFrequencyKHz); } - /* - * Helper, give me number for channels spacing - */ double CComSystem::channelSpacingToFrequencyKHz(ChannelSpacing channelSpacing) { switch (channelSpacing) diff --git a/src/blackmisc/aviocomsystem.h b/src/blackmisc/aviation/comsystem.h similarity index 98% rename from src/blackmisc/aviocomsystem.h rename to src/blackmisc/aviation/comsystem.h index b98b701d8..cac15d62c 100644 --- a/src/blackmisc/aviocomsystem.h +++ b/src/blackmisc/aviation/comsystem.h @@ -9,10 +9,10 @@ //! \file -#ifndef BLACKMISC_AVIOCOMSYSTEM_H -#define BLACKMISC_AVIOCOMSYSTEM_H +#ifndef BLACKMISC_AVIATION_COMSYSTEM_H +#define BLACKMISC_AVIATION_COMSYSTEM_H -#include "blackmisc/aviomodulator.h" +#include "blackmisc/aviation/modulator.h" namespace BlackMisc { @@ -176,4 +176,4 @@ namespace BlackMisc BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CComSystem, (o.m_channelSpacing)) Q_DECLARE_METATYPE(BlackMisc::Aviation::CComSystem) -#endif // include guard +#endif // guard diff --git a/src/blackmisc/avflightplan.cpp b/src/blackmisc/aviation/flightplan.cpp similarity index 96% rename from src/blackmisc/avflightplan.cpp rename to src/blackmisc/aviation/flightplan.cpp index 414b8ecef..f7d3f667c 100644 --- a/src/blackmisc/avflightplan.cpp +++ b/src/blackmisc/aviation/flightplan.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "avflightplan.h" -#include "iconlist.h" +#include "blackmisc/aviation/flightplan.h" +#include "blackmisc/iconlist.h" namespace BlackMisc { diff --git a/src/blackmisc/avflightplan.h b/src/blackmisc/aviation/flightplan.h similarity index 89% rename from src/blackmisc/avflightplan.h rename to src/blackmisc/aviation/flightplan.h index 34ef2c972..19da76803 100644 --- a/src/blackmisc/avflightplan.h +++ b/src/blackmisc/aviation/flightplan.h @@ -9,29 +9,25 @@ //! \file -#ifndef BLACKMISC_AVFLIGHTPLAN_H -#define BLACKMISC_AVFLIGHTPLAN_H +#ifndef BLACKMISC_AVIATION_FLIGHTPLAN_H +#define BLACKMISC_AVIATION_FLIGHTPLAN_H -#include "valueobject.h" -#include "avaltitude.h" -#include "avairporticao.h" -#include "pqtime.h" -#include "pqspeed.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/aviation/airporticao.h" +#include "blackmisc/pqtime.h" +#include "blackmisc/pqspeed.h" #include namespace BlackMisc { namespace Aviation { - /*! - * Value object for a flight plan - */ + //! Value object for a flight plan class CFlightPlan : public CValueObject { public: - /*! - * Flight rules (VFR or IFR) - */ + //! Flight rules (VFR or IFR) enum FlightRules { VFR = 0, //!< Visual flight rules @@ -210,7 +206,21 @@ namespace BlackMisc } // namespace Q_DECLARE_METATYPE(BlackMisc::Aviation::CFlightPlan) -BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CFlightPlan, (o.m_equipmentIcao, o.m_originAirportIcao, o.m_destinationAirportIcao, o.m_alternateAirportIcao, - o.m_takeoffTimePlanned, o.m_takeoffTimeActual, o.m_enrouteTime, o.m_fuelTime, o.m_cruiseAltitude, o.m_cruiseTrueAirspeed, o.m_flightRules, o.m_route, o.m_remarks, o.m_lastSentOrLoaded)) +BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CFlightPlan, ( + o.m_equipmentIcao, + o.m_originAirportIcao, + o.m_destinationAirportIcao, + o.m_alternateAirportIcao, + o.m_takeoffTimePlanned, + o.m_takeoffTimeActual, + o.m_enrouteTime, + o.m_fuelTime, + o.m_cruiseAltitude, + o.m_cruiseTrueAirspeed, + o.m_flightRules, + o.m_route, + o.m_remarks, + o.m_lastSentOrLoaded + )) #endif // guard diff --git a/src/blackmisc/avheading.cpp b/src/blackmisc/aviation/heading.cpp similarity index 90% rename from src/blackmisc/avheading.cpp rename to src/blackmisc/aviation/heading.cpp index d21e11a72..286e70c3e 100644 --- a/src/blackmisc/avheading.cpp +++ b/src/blackmisc/aviation/heading.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "blackmiscfreefunctions.h" -#include "avheading.h" +#include "blackmisc/blackmiscfreefunctions.h" +#include "blackmisc/aviation/heading.h" using BlackMisc::PhysicalQuantities::CAngle; using BlackMisc::PhysicalQuantities::CAngleUnit; @@ -18,9 +18,6 @@ namespace BlackMisc namespace Aviation { - /* - * Own implementation for streaming - */ QString CHeading::convertToQString(bool i18n) const { QString s = CAngle::convertToQString(i18n).append(" "); diff --git a/src/blackmisc/avheading.h b/src/blackmisc/aviation/heading.h similarity index 94% rename from src/blackmisc/avheading.h rename to src/blackmisc/aviation/heading.h index daa15ee03..586bcf04b 100644 --- a/src/blackmisc/avheading.h +++ b/src/blackmisc/aviation/heading.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKMISC_AVHEADING_H -#define BLACKMISC_AVHEADING_H +#ifndef BLACKMISC_AVIATION_HEADING_H +#define BLACKMISC_AVIATION_HEADING_H #include "blackmisc/pqangle.h" @@ -37,9 +37,7 @@ namespace BlackMisc class CHeading : public CValueObject { public: - /*! - * Enum type to distinguish between true north and magnetic north - */ + //! Enum type to distinguish between true north and magnetic north enum ReferenceNorth { Magnetic = 0, //!< magnetic north diff --git a/src/blackmisc/avinformationmessage.cpp b/src/blackmisc/aviation/informationmessage.cpp similarity index 89% rename from src/blackmisc/avinformationmessage.cpp rename to src/blackmisc/aviation/informationmessage.cpp index 82ca028b2..931d2643a 100644 --- a/src/blackmisc/avinformationmessage.cpp +++ b/src/blackmisc/aviation/informationmessage.cpp @@ -7,24 +7,19 @@ * contained in the LICENSE file. */ -#include "avinformationmessage.h" -#include "blackmiscfreefunctions.h" +#include "blackmisc/aviation/informationmessage.h" +#include "blackmisc/blackmiscfreefunctions.h" namespace BlackMisc { namespace Aviation { - /* - * Convert to string - */ + QString CInformationMessage::convertToQString(bool /** i18n **/) const { return this->m_message; } - /* - * Type as string - */ const QString &CInformationMessage::getTypeAsString() const { switch (this->m_type) @@ -51,5 +46,6 @@ namespace BlackMisc } } } + } // namespace } // namespace diff --git a/src/blackmisc/avinformationmessage.h b/src/blackmisc/aviation/informationmessage.h similarity index 86% rename from src/blackmisc/avinformationmessage.h rename to src/blackmisc/aviation/informationmessage.h index 463645bf5..e14d02035 100644 --- a/src/blackmisc/avinformationmessage.h +++ b/src/blackmisc/aviation/informationmessage.h @@ -9,11 +9,11 @@ //! \file -#ifndef BLACKMISC_INFORMATIONMESSAGE_H -#define BLACKMISC_INFORMATIONMESSAGE_H +#ifndef BLACKMISC_AVIATION_INFORMATIONMESSAGE_H +#define BLACKMISC_AVIATION_INFORMATIONMESSAGE_H -#include "valueobject.h" -#include "blackmiscfreefunctions.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/blackmiscfreefunctions.h" #include #include @@ -21,10 +21,7 @@ namespace BlackMisc { namespace Aviation { - /*! - * Value object encapsulating information message. - * ATIS, METAR, TAF - */ + //! Value object encapsulating information message (ATIS, METAR, TAF) class CInformationMessage : public CValueObject { public: @@ -46,9 +43,7 @@ namespace BlackMisc //! Information message of type explicit CInformationMessage(InformationType type) : m_type(type) {} - /*! - * Information message of type - */ + //! Information message of type CInformationMessage(InformationType type, const QString &message) : m_type(type), m_message(message) {} @@ -107,7 +102,12 @@ namespace BlackMisc } // namespace } // namespace -BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CInformationMessage, (o.m_type, o.m_message, o.m_receivedTimestamp)) +BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CInformationMessage, ( + o.m_type, + o.m_message, + o.m_receivedTimestamp + )) + Q_DECLARE_METATYPE(BlackMisc::Aviation::CInformationMessage) #endif // guard diff --git a/src/blackmisc/aviomodulator.cpp b/src/blackmisc/aviation/modulator.cpp similarity index 83% rename from src/blackmisc/aviomodulator.cpp rename to src/blackmisc/aviation/modulator.cpp index 86189662e..425c6b446 100644 --- a/src/blackmisc/aviomodulator.cpp +++ b/src/blackmisc/aviation/modulator.cpp @@ -7,10 +7,10 @@ * contained in the LICENSE file. */ -#include "blackmisc/aviomodulator.h" -#include "blackmisc/aviocomsystem.h" -#include "blackmisc/avionavsystem.h" -#include "blackmisc/avioadfsystem.h" +#include "blackmisc/aviation/modulator.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/navsystem.h" +#include "blackmisc/aviation/adfsystem.h" #include "blackmisc/propertyindex.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/variant.h" @@ -22,20 +22,17 @@ namespace BlackMisc { namespace Aviation { - /* - * Toggle standby <-> active - */ - template void CModulator::toggleActiveStandby() + + template + void CModulator::toggleActiveStandby() { CFrequency a = this->m_frequencyActive; this->m_frequencyActive = this->m_frequencyStandby; this->m_frequencyStandby = a; } - /* - * Property by index - */ - template CVariant CModulator::propertyByIndex(const CPropertyIndex &index) const + template + CVariant CModulator::propertyByIndex(const CPropertyIndex &index) const { if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); @@ -56,10 +53,8 @@ namespace BlackMisc } } - /* - * Property by index - */ - template void CModulator::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) + template + void CModulator::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) { if (index.isMyself()) { diff --git a/src/blackmisc/aviomodulator.h b/src/blackmisc/aviation/modulator.h similarity index 93% rename from src/blackmisc/aviomodulator.h rename to src/blackmisc/aviation/modulator.h index f4909c553..0bd6dd079 100644 --- a/src/blackmisc/aviomodulator.h +++ b/src/blackmisc/aviation/modulator.h @@ -9,11 +9,11 @@ //! \file -#ifndef BLACKMISC_AVIOMODULATORUNIT_H -#define BLACKMISC_AVIOMODULATORUNIT_H +#ifndef BLACKMISC_AVIATION_MODULATORUNIT_H +#define BLACKMISC_AVIATION_MODULATORUNIT_H #include "blackmisc/propertyindex.h" -#include "blackmisc/aviobase.h" +#include "blackmisc/aviation/avionicsbase.h" #include "blackmisc/mathematics.h" #include "blackmisc/blackmiscfreefunctions.h" @@ -22,9 +22,7 @@ namespace BlackMisc namespace Aviation { - /*! - * Base class for COM, NAV, Squawk units. - */ + //! Base class for COM, NAV, Squawk units. template class CModulator : public CValueObject, CAvionicsBase> { public: @@ -220,6 +218,12 @@ namespace BlackMisc } } -BLACK_DECLARE_TUPLE_CONVERSION_TEMPLATE(BlackMisc::Aviation::CModulator, (o.m_frequencyActive, o.m_frequencyStandby, o.m_volumeInput , o.m_volumeOutput, o.m_enabled)) +BLACK_DECLARE_TUPLE_CONVERSION_TEMPLATE(BlackMisc::Aviation::CModulator, ( + o.m_frequencyActive, + o.m_frequencyStandby, + o.m_volumeInput , + o.m_volumeOutput, + o.m_enabled + )) #endif // guard diff --git a/src/blackmisc/avionavsystem.h b/src/blackmisc/aviation/navsystem.h similarity index 97% rename from src/blackmisc/avionavsystem.h rename to src/blackmisc/aviation/navsystem.h index 785da31d0..5ce63a106 100644 --- a/src/blackmisc/avionavsystem.h +++ b/src/blackmisc/aviation/navsystem.h @@ -9,10 +9,10 @@ //! \file -#ifndef BLACKMISC_AVIONAVSYSTEM_H -#define BLACKMISC_AVIONAVSYSTEM_H +#ifndef BLACKMISC_AVIATION_NAVSYSTEM_H +#define BLACKMISC_AVIATION_NAVSYSTEM_H -#include "blackmisc/aviomodulator.h" +#include "blackmisc/aviation/modulator.h" namespace BlackMisc { diff --git a/src/blackmisc/avselcal.cpp b/src/blackmisc/aviation/selcal.cpp similarity index 91% rename from src/blackmisc/avselcal.cpp rename to src/blackmisc/aviation/selcal.cpp index e2a48833e..f58d200b1 100644 --- a/src/blackmisc/avselcal.cpp +++ b/src/blackmisc/aviation/selcal.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "avselcal.h" +#include "blackmisc/aviation/selcal.h" using namespace BlackMisc::PhysicalQuantities; @@ -15,29 +15,21 @@ namespace BlackMisc { namespace Aviation { + QList CSelcal::frequencyEquivalents = QList(); QStringList CSelcal::allCodePairs = QStringList(); - /* - * Convert to string - */ QString CSelcal::convertToQString(bool /** i18n **/) const { return this->m_code; } - /* - * Equals code? - */ bool CSelcal::equalsString(const QString &code) const { if (code.isEmpty()) return false; return (this->m_code.compare(code, Qt::CaseInsensitive) == 0); } - /* - * SELCAL code frequencies - */ QList CSelcal::getFrequencies() const { QList f; @@ -49,26 +41,17 @@ namespace BlackMisc return f; } - /* - * Valid characters - */ const QString &CSelcal::validCharacters() { static const QString valid = "ABCDEFGHJKLMPQRS"; return valid; } - /* - * Valid character? - */ bool CSelcal::isValidCharacter(QChar c) { return CSelcal::validCharacters().contains(c.toUpper()); } - /* - * Valid code - */ bool CSelcal::isValidCode(const QString &code) { if (code.length() != 4) return false; @@ -83,9 +66,6 @@ namespace BlackMisc return true; } - /* - * Character to frequency equivalent - */ const PhysicalQuantities::CFrequency &CSelcal::audioFrequencyEquivalent(QChar c) { if (CSelcal::frequencyEquivalents.isEmpty()) @@ -116,9 +96,6 @@ namespace BlackMisc return CSelcal::frequencyEquivalents.at(pos); } - /* - * Code pairs - */ const QStringList &CSelcal::codePairs() { if (CSelcal::allCodePairs.isEmpty()) diff --git a/src/blackmisc/avselcal.h b/src/blackmisc/aviation/selcal.h similarity index 96% rename from src/blackmisc/avselcal.h rename to src/blackmisc/aviation/selcal.h index bcab391cb..dadd30b04 100644 --- a/src/blackmisc/avselcal.h +++ b/src/blackmisc/aviation/selcal.h @@ -9,11 +9,11 @@ //! \file -#ifndef BLACKMISC_SELCAL_H -#define BLACKMISC_SELCAL_H +#ifndef BLACKMISC_AVIATION_SELCAL_H +#define BLACKMISC_AVIATION_SELCAL_H #include "blackmisc/pqfrequency.h" -#include "valueobject.h" +#include "blackmisc/valueobject.h" namespace BlackMisc { diff --git a/src/blackmisc/avtrack.cpp b/src/blackmisc/aviation/track.cpp similarity index 88% rename from src/blackmisc/avtrack.cpp rename to src/blackmisc/aviation/track.cpp index 25cad8c28..f5302bb2f 100644 --- a/src/blackmisc/avtrack.cpp +++ b/src/blackmisc/aviation/track.cpp @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "blackmiscfreefunctions.h" -#include "avtrack.h" +#include "blackmisc/blackmiscfreefunctions.h" +#include "blackmisc/aviation/track.h" using BlackMisc::PhysicalQuantities::CAngle; using BlackMisc::PhysicalQuantities::CAngleUnit; @@ -13,9 +13,7 @@ namespace BlackMisc { namespace Aviation { - /* - * Own implementation for streaming - */ + QString CTrack::convertToQString(bool i18n) const { QString s = CAngle::convertToQString(i18n).append(" "); diff --git a/src/blackmisc/avtrack.h b/src/blackmisc/aviation/track.h similarity index 97% rename from src/blackmisc/avtrack.h rename to src/blackmisc/aviation/track.h index 16c42b2f2..9e6f46c4f 100644 --- a/src/blackmisc/avtrack.h +++ b/src/blackmisc/aviation/track.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKMISC_AVTRACK_H -#define BLACKMISC_AVTRACK_H +#ifndef BLACKMISC_AVIATION_TRACK_H +#define BLACKMISC_AVIATION_TRACK_H #include "blackmisc/pqangle.h" diff --git a/src/blackmisc/aviotransponder.cpp b/src/blackmisc/aviation/transponder.cpp similarity index 92% rename from src/blackmisc/aviotransponder.cpp rename to src/blackmisc/aviation/transponder.cpp index c3cb16291..217e9b906 100644 --- a/src/blackmisc/aviotransponder.cpp +++ b/src/blackmisc/aviation/transponder.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "blackmisc/aviotransponder.h" +#include "blackmisc/aviation/transponder.h" #include "blackmisc/propertyindex.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/variant.h" @@ -17,9 +17,6 @@ namespace BlackMisc namespace Aviation { - /* - * Valid values? - */ bool CTransponder::validValues() const { if (this->isDefaultValue()) return true; // special case @@ -45,9 +42,6 @@ namespace BlackMisc } } - /* - * String representation - */ QString CTransponder::convertToQString(bool /* i18n */) const { QString s = this->getName(); @@ -55,9 +49,6 @@ namespace BlackMisc return s; } - /* - * Mode as readable string - */ CTransponder::TransponderMode CTransponder::modeFromString(const QString &modeString) { if (modeString.startsWith("I", Qt::CaseInsensitive)) return StateIdent; @@ -73,9 +64,6 @@ namespace BlackMisc return StateStandby; } - /* - * Formatted transponder code - */ QString CTransponder::getTransponderCodeFormatted() const { QString f("0000"); @@ -83,9 +71,6 @@ namespace BlackMisc return f.right(4); } - /* - * Formatted transponder code + mode - */ QString CTransponder::getTransponderCodeAndModeFormatted() const { QString s = this->getTransponderCodeFormatted(); @@ -93,9 +78,6 @@ namespace BlackMisc return s; } - /* - * Transponder by string - */ void CTransponder::setTransponderCode(const QString &transponderCode) { if (CTransponder::isValidTransponderCode(transponderCode)) @@ -109,9 +91,6 @@ namespace BlackMisc } } - /* - * Valid code? - */ bool CTransponder::isValidTransponderCode(const QString &transponderCode) { if (transponderCode.isEmpty() || transponderCode.length() > 4) return false; @@ -123,18 +102,12 @@ namespace BlackMisc return rx.exactMatch(transponderCode); } - /* - * Valid code? - */ bool CTransponder::isValidTransponderCode(qint32 transponderCode) { if (transponderCode < 0 || transponderCode > 7777) return false; return CTransponder::isValidTransponderCode(QString::number(transponderCode)); } - /* - * Mode as readable string - */ const QString &CTransponder::modeAsString(CTransponder::TransponderMode mode) { static QString m; @@ -173,9 +146,6 @@ namespace BlackMisc return m; } - /* - * Property - */ CVariant CTransponder::propertyByIndex(const CPropertyIndex &index) const { if (index.isMyself()) { return this->toCVariant(); } @@ -234,5 +204,6 @@ namespace BlackMisc break; } } + } // namespace } // namespace diff --git a/src/blackmisc/aviotransponder.h b/src/blackmisc/aviation/transponder.h similarity index 95% rename from src/blackmisc/aviotransponder.h rename to src/blackmisc/aviation/transponder.h index ffb814a70..f877d58b9 100644 --- a/src/blackmisc/aviotransponder.h +++ b/src/blackmisc/aviation/transponder.h @@ -9,18 +9,16 @@ //! \file -#ifndef BLACKMISC_AVIOTRANSPONDER_H -#define BLACKMISC_AVIOTRANSPONDER_H +#ifndef BLACKMISC_AVIATION_TRANSPONDER_H +#define BLACKMISC_AVIATION_TRANSPONDER_H -#include "blackmisc/aviobase.h" +#include "blackmisc/aviation/avionicsbase.h" namespace BlackMisc { namespace Aviation { - /*! - * Transponder - */ + //! Transponder class CTransponder : public CValueObject { public: @@ -179,7 +177,11 @@ namespace BlackMisc } } -BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CTransponder, (o.m_transponderCode, o.m_transponderMode)) +BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CTransponder, ( + o.m_transponderCode, + o.m_transponderMode + )) + Q_DECLARE_METATYPE(BlackMisc::Aviation::CTransponder) #endif // guard diff --git a/src/blackmisc/blackmisc.h b/src/blackmisc/blackmisc.h index abbd04388..10be0f156 100644 --- a/src/blackmisc/blackmisc.h +++ b/src/blackmisc/blackmisc.h @@ -18,11 +18,6 @@ * \brief Base and utility classes available in all other projects. */ -/*! - * \namespace BlackMisc::Aviation - * \brief Aviation and Avionics classes such as CHeading or CTransponder . - */ - /*! * \namespace BlackMisc::Math * \brief Math classes such as vectors, matrices, and utility methods. diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index 9bdcbc483..ce01086ae 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -24,12 +24,14 @@ TRANSLATIONS += translations/blackmisc_i18n_de.ts \ translations/blackmisc_i18n_en.ts HEADERS += *.h \ + $$PWD/aviation/*.h \ $$PWD/simulation/*.h \ - $$PWD/aviation/*.h + SOURCES += *.cpp \ + $$PWD/aviation/*.cpp \ $$PWD/simulation/*.cpp \ - $$PWD/aviation/*.cpp + DESTDIR = ../../lib OTHER_FILES += $$TRANSLATIONS readme.txt diff --git a/src/blackmisc/blackmiscallvalueclasses.h b/src/blackmisc/blackmiscallvalueclasses.h index c84c8469a..3d64aef10 100644 --- a/src/blackmisc/blackmiscallvalueclasses.h +++ b/src/blackmisc/blackmiscallvalueclasses.h @@ -13,7 +13,7 @@ #define BLACKMISC_ALLVALUECLASSES_H #include "blackmisc/pqallquantities.h" -#include "blackmisc/avallclasses.h" +#include "blackmisc/aviation/aviationall.h" #include "blackmisc/geoallclasses.h" #include "blackmisc/settingsblackmiscclasses.h" #include "blackmisc/propertyindexallclasses.h" diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp index 18e74c910..049f6cc26 100644 --- a/src/blackmisc/blackmiscfreefunctions.cpp +++ b/src/blackmisc/blackmiscfreefunctions.cpp @@ -8,7 +8,7 @@ */ #include "blackmiscfreefunctions.h" -#include "avallclasses.h" +#include "blackmisc/aviation/aviation.h" #include "pqallquantities.h" #include "mathallclasses.h" #include "geoallclasses.h" diff --git a/src/blackmisc/geoobjectlist.cpp b/src/blackmisc/geoobjectlist.cpp index 564e882a9..9977cebdc 100644 --- a/src/blackmisc/geoobjectlist.cpp +++ b/src/blackmisc/geoobjectlist.cpp @@ -9,9 +9,9 @@ #include "blackmisc/geoobjectlist.h" #include "blackmisc/predicates.h" -#include "blackmisc/avatcstationlist.h" -#include "blackmisc/avaircraftlist.h" -#include "blackmisc/avairportlist.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/aircraftlist.h" +#include "blackmisc/aviation/airportlist.h" #include "blackmisc/simulation/simulatedaircraftlist.h" using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/nwaircraftmapping.h b/src/blackmisc/nwaircraftmapping.h index e1acfd5f0..d21a7668e 100644 --- a/src/blackmisc/nwaircraftmapping.h +++ b/src/blackmisc/nwaircraftmapping.h @@ -12,7 +12,7 @@ #ifndef BLACKMISC_NETWORK_AIRCRAFTMAPPING_H #define BLACKMISC_NETWORK_AIRCRAFTMAPPING_H -#include "blackmisc/avaircrafticao.h" +#include "blackmisc/aviation/aircrafticao.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/valueobject.h" diff --git a/src/blackmisc/nwclient.cpp b/src/blackmisc/nwclient.cpp index d8e3ebe4a..952262a70 100644 --- a/src/blackmisc/nwclient.cpp +++ b/src/blackmisc/nwclient.cpp @@ -7,9 +7,9 @@ * contained in the LICENSE file. */ -#include "nwclient.h" -#include "icon.h" -#include "avcallsign.h" +#include "blackmisc/nwclient.h" +#include "blackmisc/icon.h" +#include "blackmisc/aviation/callsign.h" #include diff --git a/src/blackmisc/nwclientlist.h b/src/blackmisc/nwclientlist.h index da39617b0..ef695245d 100644 --- a/src/blackmisc/nwclientlist.h +++ b/src/blackmisc/nwclientlist.h @@ -12,11 +12,11 @@ #ifndef BLACKMISC_CLIENTLIST_H #define BLACKMISC_CLIENTLIST_H -#include "nwclient.h" -#include "sequence.h" -#include "collection.h" -#include "blackmisc/avcallsignobjectlist.h" -#include "blackmisc/avcallsign.h" +#include "blackmisc/nwclient.h" +#include "blackmisc/sequence.h" +#include "blackmisc/collection.h" +#include "blackmisc/aviation/callsignobjectlist.h" +#include "blackmisc/aviation/callsign.h" #include #include diff --git a/src/blackmisc/nwtextmessage.cpp b/src/blackmisc/nwtextmessage.cpp index c325cdaf1..e88690293 100644 --- a/src/blackmisc/nwtextmessage.cpp +++ b/src/blackmisc/nwtextmessage.cpp @@ -10,9 +10,9 @@ #include "nwtextmessage.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/pqconstants.h" -#include "blackmisc/aviocomsystem.h" -#include "blackmisc/avcallsign.h" -#include "blackmisc/avselcal.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/selcal.h" using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/nwtextmessage.h b/src/blackmisc/nwtextmessage.h index 962e24dbf..f446ff9af 100644 --- a/src/blackmisc/nwtextmessage.h +++ b/src/blackmisc/nwtextmessage.h @@ -14,7 +14,7 @@ #include "blackmisc/timestampbased.h" #include "pqfrequency.h" -#include "avcallsign.h" +#include "blackmisc/aviation/callsign.h" #include "statusmessage.h" #include "valueobject.h" #include diff --git a/src/blackmisc/nwuser.cpp b/src/blackmisc/nwuser.cpp index d3249a20a..ea0bd5581 100644 --- a/src/blackmisc/nwuser.cpp +++ b/src/blackmisc/nwuser.cpp @@ -8,7 +8,7 @@ */ #include "nwuser.h" -#include "blackmisc/avairporticao.h" +#include "blackmisc/aviation/airporticao.h" #include "blackmisc/icon.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/propertyindex.h" diff --git a/src/blackmisc/nwuser.h b/src/blackmisc/nwuser.h index 81d3ae147..9b6f931c8 100644 --- a/src/blackmisc/nwuser.h +++ b/src/blackmisc/nwuser.h @@ -12,8 +12,8 @@ #ifndef BLACKMISC_USER_H #define BLACKMISC_USER_H -#include "avcallsign.h" -#include "avairporticao.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/airporticao.h" #include "propertyindex.h" #include "statusmessagelist.h" diff --git a/src/blackmisc/pqangle.cpp b/src/blackmisc/pqangle.cpp index cc36546e3..12da0c327 100644 --- a/src/blackmisc/pqangle.cpp +++ b/src/blackmisc/pqangle.cpp @@ -9,7 +9,7 @@ #include "iconlist.h" #include "pqangle.h" -#include "avheading.h" +#include "blackmisc/aviation/heading.h" namespace BlackMisc { diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h index 65551122d..e764b09a3 100644 --- a/src/blackmisc/simulation/aircraftmodel.h +++ b/src/blackmisc/simulation/aircraftmodel.h @@ -12,8 +12,8 @@ #ifndef BLACKMISC_AIRCRAFTMODEL_H #define BLACKMISC_AIRCRAFTMODEL_H -#include "blackmisc/avaircraft.h" -#include "blackmisc/avaircrafticao.h" +#include "blackmisc/aviation/aircraft.h" +#include "blackmisc/aviation/aircrafticao.h" #include "blackmisc/nwuser.h" #include "blackmisc/propertyindex.h" diff --git a/src/blackmisc/simulation/simdirectaccessownaircraft.cpp b/src/blackmisc/simulation/simdirectaccessownaircraft.cpp index cdd1bce1b..ac4adbdc4 100644 --- a/src/blackmisc/simulation/simdirectaccessownaircraft.cpp +++ b/src/blackmisc/simulation/simdirectaccessownaircraft.cpp @@ -8,7 +8,7 @@ */ #include "simdirectaccessownaircraft.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/simulation/simdirectaccessremoteaircraft.h b/src/blackmisc/simulation/simdirectaccessremoteaircraft.h index e8f9b2192..566d2a6d3 100644 --- a/src/blackmisc/simulation/simdirectaccessremoteaircraft.h +++ b/src/blackmisc/simulation/simdirectaccessremoteaircraft.h @@ -13,7 +13,7 @@ #define BLACKMISC_SIMDIRECTACCESSREMOTEAIRCRAFT_H #include "blackmisc/simulation/simulatedaircraftlist.h" -#include "blackmisc/avaircraftsituationlist.h" +#include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/aviation/aircraftpartslist.h" #include diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h index 9050b93fd..008c23440 100644 --- a/src/blackmisc/simulation/simulatedaircraft.h +++ b/src/blackmisc/simulation/simulatedaircraft.h @@ -12,7 +12,7 @@ #ifndef BLACKMISC_SIMULATEDAIRCRAFT_H #define BLACKMISC_SIMULATEDAIRCRAFT_H -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" #include "aircraftmodel.h" #include "blackmisc/nwclient.h" diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h index 28ae687ad..03b22db99 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.h +++ b/src/blackmisc/simulation/simulatedaircraftlist.h @@ -13,8 +13,8 @@ #define BLACKMISC_SIMULATEDNAIRCRAFTLIST_H #include "blackmisc/simulation/simulatedaircraft.h" -#include "blackmisc/avcallsignobjectlist.h" -#include "blackmisc/avaircraftlist.h" +#include "blackmisc/aviation/callsignobjectlist.h" +#include "blackmisc/aviation/aircraftlist.h" #include "blackmisc/geoobjectlist.h" #include "blackmisc/nwuserlist.h" #include "blackmisc/collection.h" diff --git a/src/blackmisc/testing.h b/src/blackmisc/testing.h index a50bb5dae..1ebf5a936 100644 --- a/src/blackmisc/testing.h +++ b/src/blackmisc/testing.h @@ -12,7 +12,7 @@ #ifndef BLACKMISC_TESTING_H #define BLACKMISC_TESTING_H -#include "avatcstationlist.h" +#include "blackmisc/aviation/atcstationlist.h" /*! * Generate data for testing purposes. diff --git a/src/blackmisc/timestampobjectlist.cpp b/src/blackmisc/timestampobjectlist.cpp index 0247490dc..5899dca4a 100644 --- a/src/blackmisc/timestampobjectlist.cpp +++ b/src/blackmisc/timestampobjectlist.cpp @@ -9,7 +9,7 @@ #include "blackmisc/timestampobjectlist.h" #include "blackmisc/predicates.h" -#include "blackmisc/avaircraftsituationlist.h" +#include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/aviation/aircraftpartslist.h" #include "blackmisc/nwtextmessagelist.h" #include "blackmisc/statusmessagelist.h" diff --git a/src/blacksim/fscommon/bcdconversions.h b/src/blacksim/fscommon/bcdconversions.h index d15cde8b2..57f630665 100644 --- a/src/blacksim/fscommon/bcdconversions.h +++ b/src/blacksim/fscommon/bcdconversions.h @@ -13,7 +13,7 @@ #define BLACKSIM_FSCOMMON_BCDCONVERSIONS_H #include "blackmisc/pqfrequency.h" -#include "blackmisc/aviotransponder.h" +#include "blackmisc/aviation/transponder.h" #include namespace BlackSim diff --git a/src/blacksound/soundgenerator.h b/src/blacksound/soundgenerator.h index c590b4842..c3582fe0e 100644 --- a/src/blacksound/soundgenerator.h +++ b/src/blacksound/soundgenerator.h @@ -12,7 +12,7 @@ #ifndef BLACKSOUND_SOUNDGENERATOR_H #define BLACKSOUND_SOUNDGENERATOR_H -#include "blackmisc/avselcal.h" +#include "blackmisc/aviation/selcal.h" #include "blackmisc/audiodeviceinfo.h" #include "blackmisc/pqtime.h" #include "blackmisc/notificationsounds.h" diff --git a/src/plugins/simulator/fs9/blacksimplugin_freefunctions.h b/src/plugins/simulator/fs9/blacksimplugin_freefunctions.h index 05bf53052..b524d3d9d 100644 --- a/src/plugins/simulator/fs9/blacksimplugin_freefunctions.h +++ b/src/plugins/simulator/fs9/blacksimplugin_freefunctions.h @@ -13,7 +13,7 @@ #define BLACKSIMPLUGIN_FREEFUNCTIONS_H #include "multiplayer_packets.h" -#include "blackmisc/avaircraftsituation.h" +#include "blackmisc/aviation/aircraftsituation.h" namespace BlackSimPlugin { diff --git a/src/plugins/simulator/fs9/fs9_client.cpp b/src/plugins/simulator/fs9/fs9_client.cpp index 2a0d7b517..e22d5291f 100644 --- a/src/plugins/simulator/fs9/fs9_client.cpp +++ b/src/plugins/simulator/fs9/fs9_client.cpp @@ -13,7 +13,7 @@ #include "multiplayer_packets.h" #include "multiplayer_packet_parser.h" #include "blacksimplugin_freefunctions.h" -#include "blackmisc/avaircraftsituation.h" +#include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/coordinategeodetic.h" #include "blackmisc/logmessage.h" #include diff --git a/src/plugins/simulator/fs9/fs9_client.h b/src/plugins/simulator/fs9/fs9_client.h index e4abd8571..f1b59ed12 100644 --- a/src/plugins/simulator/fs9/fs9_client.h +++ b/src/plugins/simulator/fs9/fs9_client.h @@ -12,7 +12,7 @@ #include "directplay_peer.h" #include "blackcore/interpolator.h" -#include "blackmisc/avaircraftsituation.h" +#include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/pqtime.h" #include #include diff --git a/src/plugins/simulator/fs9/simulator_fs9.h b/src/plugins/simulator/fs9/simulator_fs9.h index 74c4f13f5..b459ad1b8 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.h +++ b/src/plugins/simulator/fs9/simulator_fs9.h @@ -19,7 +19,7 @@ #include "blackcore/simulator.h" #include "blackcore/interpolator.h" #include "blackmisc/simulation/aircraftmodel.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" #include "blacksim/simulatorplugininfo.h" #include "blackmisc/pixmap.h" #include diff --git a/src/plugins/simulator/fsx/simconnect_object.h b/src/plugins/simulator/fsx/simconnect_object.h index 3cda0dd00..8ef7d2ebd 100644 --- a/src/plugins/simulator/fsx/simconnect_object.h +++ b/src/plugins/simulator/fsx/simconnect_object.h @@ -12,7 +12,7 @@ #ifndef BLACKSIMPLUGIN_SIMCONNECT_OBJECT_H #define BLACKSIMPLUGIN_SIMCONNECT_OBJECT_H -#include "blackmisc/avcallsign.h" +#include "blackmisc/aviation/callsign.h" #include namespace BlackCore { class IInterpolator; } diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp index 3acbb1790..26faded6b 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.cpp +++ b/src/plugins/simulator/fsx/simulator_fsx.cpp @@ -15,7 +15,7 @@ #include "blacksim/simulatorplugininfo.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/project.h" -#include "blackmisc/avairportlist.h" +#include "blackmisc/aviation/airportlist.h" #include "blackmisc/logmessage.h" #include "blackmisc/nwaircraftmappinglist.h" #include "blackcore/interpolator_linear.h" diff --git a/src/plugins/simulator/fsx/simulator_fsx.h b/src/plugins/simulator/fsx/simulator_fsx.h index 9a9f57410..f5924e81c 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.h +++ b/src/plugins/simulator/fsx/simulator_fsx.h @@ -20,7 +20,7 @@ #include "blacksim/simulatorplugininfo.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/simulatedaircraft.h" -#include "blackmisc/avairportlist.h" +#include "blackmisc/aviation/airportlist.h" #include "blackmisc/statusmessage.h" #include "blackmisc/nwclient.h" #include "blackmisc/pixmap.h" diff --git a/src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp b/src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp index 10696f9a9..fb14be94e 100644 --- a/src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp +++ b/src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp @@ -14,7 +14,7 @@ #include "blacksim/fsx/fsxsimulatorsetup.h" #include "blacksim/simulatorplugininfo.h" #include "blackmisc/project.h" -#include "blackmisc/avairportlist.h" +#include "blackmisc/aviation/airportlist.h" #include "blackmisc/logmessage.h" using namespace BlackMisc; diff --git a/src/swiftcore/tool.cpp b/src/swiftcore/tool.cpp index a06697767..5ee0f141f 100644 --- a/src/swiftcore/tool.cpp +++ b/src/swiftcore/tool.cpp @@ -1,7 +1,7 @@ #include "tool.h" #include "blackcore/context_all_interfaces.h" #include "blackmisc/propertyindexallclasses.h" -#include "blackmisc/avallclasses.h" +#include "blackmisc/aviation/aviation.h" #include "blackmisc/pqallquantities.h" #include "blackmisc/loghandler.h" #include "blackmisc/worker.h" diff --git a/src/swiftgui_standard/swiftguistd.cpp b/src/swiftgui_standard/swiftguistd.cpp index ef1cc9edf..16477e27f 100644 --- a/src/swiftgui_standard/swiftguistd.cpp +++ b/src/swiftgui_standard/swiftguistd.cpp @@ -17,7 +17,7 @@ #include "blackcore/context_application.h" #include "blackcore/context_ownaircraft.h" #include "blackcore/network.h" -#include "blackmisc/avaircraft.h" +#include "blackmisc/aviation/aircraft.h" #include "blackmisc/logmessage.h" #include "blackmisc/notificationsounds.h" #include diff --git a/src/swiftgui_standard/swiftguistd_init.cpp b/src/swiftgui_standard/swiftguistd_init.cpp index fe529995c..2b0e6293a 100644 --- a/src/swiftgui_standard/swiftguistd_init.cpp +++ b/src/swiftgui_standard/swiftguistd_init.cpp @@ -18,7 +18,7 @@ #include "blackgui/models/atcstationlistmodel.h" #include "blackgui/models/keyboardkeylistmodel.h" #include "blackmisc/icons.h" -#include "blackmisc/avselcal.h" +#include "blackmisc/aviation/selcal.h" #include "blackmisc/project.h" #include "blackmisc/hotkeyfunction.h" #include "blackmisc/logmessage.h" diff --git a/src/swiftgui_standard/swiftguistd_menus.cpp b/src/swiftgui_standard/swiftguistd_menus.cpp index 725698d36..ab21c31c5 100644 --- a/src/swiftgui_standard/swiftguistd_menus.cpp +++ b/src/swiftgui_standard/swiftguistd_menus.cpp @@ -11,7 +11,7 @@ #include "ui_swiftguistd.h" #include "blackgui/stylesheetutility.h" #include "blackmisc/statusmessagelist.h" -#include "blackmisc/avaltitude.h" +#include "blackmisc/aviation/altitude.h" #include "blackmisc/logmessage.h" #include #include diff --git a/tests/blackcore/testinterpolator.h b/tests/blackcore/testinterpolator.h index 8fa6e4626..9bfed57c2 100644 --- a/tests/blackcore/testinterpolator.h +++ b/tests/blackcore/testinterpolator.h @@ -12,7 +12,7 @@ #ifndef BLACKCORETEST_TESTINTERPOLATOR_H #define BLACKCORETEST_TESTINTERPOLATOR_H -#include "blackmisc/avaircraftsituation.h" +#include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/aviation/aircraftparts.h" #include diff --git a/tests/blackmisc/testaviation.cpp b/tests/blackmisc/testaviation.cpp index 8d47a5906..7681dcc6a 100644 --- a/tests/blackmisc/testaviation.cpp +++ b/tests/blackmisc/testaviation.cpp @@ -5,15 +5,15 @@ #include "testaviation.h" #include "blackmisc/pqconstants.h" -#include "blackmisc/avheading.h" -#include "blackmisc/avinformationmessage.h" -#include "blackmisc/avaircraftsituation.h" -#include "blackmisc/avaircrafticao.h" -#include "blackmisc/avcallsignlist.h" -#include "blackmisc/aviocomsystem.h" -#include "blackmisc/avionavsystem.h" -#include "blackmisc/aviotransponder.h" -#include "blackmisc/avatcstation.h" +#include "blackmisc/aviation/heading.h" +#include "blackmisc/aviation/informationmessage.h" +#include "blackmisc/aviation/aircraftsituation.h" +#include "blackmisc/aviation/aircrafticao.h" +#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/navsystem.h" +#include "blackmisc/aviation/transponder.h" +#include "blackmisc/aviation/atcstation.h" #include "blackmisc/nwuser.h" #include "blackmisc/nwserver.h" diff --git a/tests/blackmisc/testcontainers.cpp b/tests/blackmisc/testcontainers.cpp index d1ca1c2f1..3846b39e6 100644 --- a/tests/blackmisc/testcontainers.cpp +++ b/tests/blackmisc/testcontainers.cpp @@ -14,8 +14,8 @@ #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" -#include "blackmisc/avcallsignlist.h" -#include "blackmisc/avaircraftsituationlist.h" +#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/dictionary.h" #include #include diff --git a/tests/blackmisc/testvariantandmap.cpp b/tests/blackmisc/testvariantandmap.cpp index 69a25ca85..befffbeac 100644 --- a/tests/blackmisc/testvariantandmap.cpp +++ b/tests/blackmisc/testvariantandmap.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "testvariantandmap.h" -#include "blackmisc/avatcstation.h" +#include "blackmisc/aviation/atcstation.h" #include "blackmisc/propertyindexallclasses.h" #include "blackmisc/tuple.h" #include diff --git a/tests/blackmisc/testvariantandmap.h b/tests/blackmisc/testvariantandmap.h index 50e30c9e5..bc9aa632d 100644 --- a/tests/blackmisc/testvariantandmap.h +++ b/tests/blackmisc/testvariantandmap.h @@ -7,7 +7,7 @@ #define BLACKMISCTEST_TESTVARIANTANDMAP_H #include "blackmisc/pqconstants.h" -#include "blackmisc/avatcstation.h" +#include "blackmisc/aviation/atcstation.h" #include namespace BlackMiscTest