refs #396 move Blackmisc Aviation classes into subfolder

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"

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 <QObject>
 #include <QHash>
 

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 <QObject>
 
 //! \addtogroup dbus

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
 {

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"

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"

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 <QMap>
 #include <QTimer>

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"

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
 //! @{

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

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

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"

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"

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 <QHash>

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 <QDateTime>
 

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 <QDateTime>
 

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 <QObject>
 #include <QString>
 #include <QMap>

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"

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"

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 <QObject>
 #include <QTimer>

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"

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 <QObject>
 #include <QTimer>

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"

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 <QObject>
 #include <QScopedPointer>
 

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 <QObject>
 #include <QSharedPointer>