refs #396 move Blackmisc Aviation classes into subfolder

2026-04-03 15:45:46 +08:00 · 2015-04-02 00:11:50 +02:00
parent 4d09279c65
commit 78d3350bf3
159 changed files with 516 additions and 730 deletions
--- 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 <QTabWidget>
 #include <QScopedPointer>
--- 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"
--- 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 <QTabWidget>
 #include <QModelIndex>
 #include <QScopedPointer>
--- 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"

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

 namespace BlackGui
--- 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 <QTabWidget>

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

--- 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 <QFrame>
 #include <QScopedPointer>
--- 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 <QFrame>
 #include <QPushButton>
--- 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"


--- 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 <QTabWidget>
 #include <QModelIndex>
 #include <QTimer>
--- 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;
--- 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"
--- 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"

--- a/src/blackgui/models/airportlistmodel.h
+++ b/src/blackgui/models/airportlistmodel.h
@@ -13,7 +13,7 @@
 #define BLACKGUI_AIRPORTLISTMODEL_H

 #include <QAbstractItemModel>
-#include "blackmisc/avairportlist.h"
+#include "blackmisc/aviation/airportlist.h"
 #include "blackgui/models/listmodelbase.h"

 namespace BlackGui
--- 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 <QAbstractItemModel>
 #include <QStandardItemModel>
--- 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 <QDateTime>
--- 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"
--- 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;
--- 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;
--- 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 <QFrame>
 #include <QScopedPointer>

--- 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 <QTimer>
 #include <QComboBox>
 #include <QStringList>
--- 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 <QHeaderView>