refs #703, moved context to subdir

* ns: Context
* adjusted using classes

src/blackgui/components/aircraftcomponent.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextnetwork.h"
-#include "blackcore/contextsimulator.h"
+#include "blackcore/context/contextnetwork.h"
+#include "blackcore/context/contextsimulator.h"
 #include "blackcore/network.h"
 #include "blackgui/components/aircraftcomponent.h"
 #include "blackgui/guiapplication.h"
@@ -28,6 +28,7 @@ using namespace BlackGui;
 using namespace BlackGui::Views;
 using namespace BlackGui::Models;
 using namespace BlackCore;
+using namespace BlackCore::Context;
 using namespace BlackMisc::Simulation;
 using namespace BlackMisc::PhysicalQuantities;
 

src/blackgui/components/atcstationcomponent.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextnetwork.h"
-#include "blackcore/contextownaircraft.h"
+#include "blackcore/context/contextnetwork.h"
+#include "blackcore/context/contextownaircraft.h"
 #include "blackgui/components/atcstationcomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/guiutility.h"
@@ -43,6 +43,7 @@ using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Weather;
 using namespace BlackCore;
+using namespace BlackCore::Context;
 
 namespace BlackGui
 {

src/blackgui/components/audiosetupcomponent.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextaudio.h"
+#include "blackcore/context/contextaudio.h"
 #include "blackgui/components/audiosetupcomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackmisc/audio/audiodeviceinfo.h"
@@ -22,6 +22,7 @@
 #include <QtGlobal>
 
 using namespace BlackCore;
+using namespace BlackCore::Context;
 using namespace BlackMisc;
 using namespace BlackGui;
 using namespace BlackMisc::Aviation;

src/blackgui/components/audiovolumecomponent.cpp

@@ -8,7 +8,7 @@
  */
 
 #include "audiovolumecomponent.h"
-#include "blackcore/contextaudio.h"
+#include "blackcore/context/contextaudio.h"
 #include "blackgui/components/audiovolumecomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackmisc/audio/audioutils.h"
@@ -22,6 +22,7 @@
 #include <QtGlobal>
 
 using namespace BlackCore;
+using namespace BlackCore::Context;
 
 namespace BlackGui
 {

src/blackgui/components/cockpitcomcomponent.cpp

@@ -7,9 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextaudio.h"
-#include "blackcore/contextnetwork.h"
-#include "blackcore/contextownaircraft.h"
+#include "blackcore/context/contextaudio.h"
+#include "blackcore/context/contextnetwork.h"
+#include "blackcore/context/contextownaircraft.h"
 #include "blackgui/components/cockpitcomcomponent.h"
 #include "blackgui/components/selcalcodeselector.h"
 #include "blackgui/components/transpondercodespinbox.h"
@@ -37,6 +37,7 @@
 
 using namespace BlackGui;
 using namespace BlackCore;
+using namespace BlackCore::Context;
 using namespace BlackMisc;
 using namespace BlackMisc::Audio;
 using namespace BlackMisc::Aviation;

src/blackgui/components/cockpittranspondermodeledscomponent.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextownaircraft.h"
+#include "blackcore/context/contextownaircraft.h"
 #include "blackgui/components/cockpittranspondermodeledscomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/led.h"
@@ -21,6 +21,7 @@ using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Simulation;
 using namespace BlackCore;
+using namespace BlackCore::Context;
 
 namespace BlackGui
 {

src/blackgui/components/flightplancomponent.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextnetwork.h"
-#include "blackcore/contextownaircraft.h"
+#include "blackcore/context/contextnetwork.h"
+#include "blackcore/context/contextownaircraft.h"
 #include "blackgui/components/flightplancomponent.h"
 #include "blackgui/components/selcalcodeselector.h"
 #include "blackgui/guiapplication.h"

src/blackgui/components/infobarstatuscomponent.cpp

@@ -8,10 +8,10 @@
  */
 
 #include "blackconfig/buildconfig.h"
-#include "blackcore/contextapplication.h"
-#include "blackcore/contextaudio.h"
-#include "blackcore/contextnetwork.h"
-#include "blackcore/contextsimulator.h"
+#include "blackcore/context/contextapplication.h"
+#include "blackcore/context/contextaudio.h"
+#include "blackcore/context/contextnetwork.h"
+#include "blackcore/context/contextsimulator.h"
 #include "blackcore/simulator.h"
 #include "blackgui/components/infobarstatuscomponent.h"
 #include "blackgui/guiapplication.h"
@@ -31,6 +31,7 @@
 
 using namespace BlackConfig;
 using namespace BlackCore;
+using namespace BlackCore::Context;
 using namespace BlackGui;
 using namespace BlackMisc;
 

src/blackgui/components/internalscomponent.cpp

@@ -7,11 +7,11 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextapplication.h"
-#include "blackcore/contextaudio.h"
-#include "blackcore/contextnetwork.h"
-#include "blackcore/contextownaircraft.h"
-#include "blackcore/contextsimulator.h"
+#include "blackcore/context/contextapplication.h"
+#include "blackcore/context/contextaudio.h"
+#include "blackcore/context/contextnetwork.h"
+#include "blackcore/context/contextownaircraft.h"
+#include "blackcore/context/contextsimulator.h"
 #include "blackgui/components/internalscomponent.h"
 #include "blackgui/components/remoteaircraftselector.h"
 #include "blackgui/guiapplication.h"

src/blackgui/components/logincomponent.cpp

@@ -8,10 +8,10 @@
  */
 
 #include "blackconfig/buildconfig.h"
-#include "blackcore/contextaudio.h"
-#include "blackcore/contextnetwork.h"
-#include "blackcore/contextownaircraft.h"
-#include "blackcore/contextsimulator.h"
+#include "blackcore/context/contextaudio.h"
+#include "blackcore/context/contextnetwork.h"
+#include "blackcore/context/contextownaircraft.h"
+#include "blackcore/context/contextsimulator.h"
 #include "blackcore/webdataservices.h"
 #include "blackcore/data/globalsetup.h"
 #include "blackcore/network.h"
@@ -55,6 +55,7 @@ using namespace BlackMisc::Network;
 using namespace BlackMisc::Simulation;
 using namespace BlackCore;
 using namespace BlackCore::Data;
+using namespace BlackCore::Context;
 using namespace BlackGui;
 
 namespace BlackGui

src/blackgui/components/mainkeypadareacomponent.cpp

@@ -7,9 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextaudio.h"
-#include "blackcore/contextnetwork.h"
-#include "blackcore/contextownaircraft.h"
+#include "blackcore/context/contextaudio.h"
+#include "blackcore/context/contextnetwork.h"
+#include "blackcore/context/contextownaircraft.h"
 #include "blackcore/corefacade.h"
 #include "blackgui/components/mainkeypadareacomponent.h"
 #include "blackgui/guiapplication.h"
@@ -25,6 +25,7 @@ using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Simulation;
 using namespace BlackCore;
+using namespace BlackCore::Context;
 
 namespace BlackGui
 {

src/blackgui/components/mainkeypadareacomponent.h

@@ -75,16 +75,16 @@ namespace BlackGui
             //! Button was clicked
             void ps_buttonSelected();
 
-            //! \copydoc BlackCore::IContextNetwork::connectionStatusChanged
+            //! \copydoc BlackCore::Context::IContextNetwork::connectionStatusChanged
             void ps_connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
 
             //! Command line entered
             void ps_commandEntered();
 
-            //! \copydoc BlackCore::IContextOwnAircraft::changedAircraftCockpit
+            //! \copydoc BlackCore::Context::IContextOwnAircraft::changedAircraftCockpit
             void ps_ownAircraftCockpitChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator);
 
-            //! \copydoc BlackCore::IContextAudio::changedMute
+            //! \copydoc BlackCore::Context::IContextAudio::changedMute
             void ps_muteChanged(bool muted);
 
         private:

src/blackgui/components/mappingcomponent.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextnetwork.h"
-#include "blackcore/contextsimulator.h"
+#include "blackcore/context/contextnetwork.h"
+#include "blackcore/context/contextsimulator.h"
 #include "blackcore/network.h"
 #include "blackgui/components/mappingcomponent.h"
 #include "blackgui/components/updatetimer.h"
@@ -48,6 +48,7 @@ using namespace BlackMisc::Network;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackCore;
+using namespace BlackCore::Context;
 using namespace BlackGui;
 using namespace BlackGui::Views;
 using namespace BlackGui::Models;

src/blackgui/components/modelmatcherlogcomponent.cpp

@@ -12,7 +12,7 @@
 
 #include "blackmisc/propertyindexlist.h"
 #include "blackmisc/htmlutils.h"
-#include "blackcore/contextnetwork.h"
+#include "blackcore/context/contextnetwork.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/uppercasevalidator.h"
 #include <QCompleter>

src/blackgui/components/registercomponent.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextapplication.h"
+#include "blackcore/context/contextapplication.h"
 #include "blackgui/components/registercomponent.h"
 #include "blackgui/components/updatetimer.h"
 #include "blackgui/guiapplication.h"
@@ -17,6 +17,7 @@
 #include <QtGlobal>
 
 using namespace BlackCore;
+using namespace BlackCore::Context;
 
 namespace BlackGui
 {

src/blackgui/components/remoteaircraftselector.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextnetwork.h"
+#include "blackcore/context/contextnetwork.h"
 #include "blackgui/components/remoteaircraftselector.h"
 #include "blackgui/guiapplication.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
@@ -25,6 +25,7 @@ using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Simulation;
 using namespace BlackCore;
+using namespace BlackCore::Context;
 
 namespace BlackGui
 {

src/blackgui/components/settingshotkeycomponent.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextapplication.h"
+#include "blackcore/context/contextapplication.h"
 #include "blackgui/components/hotkeydialog.h"
 #include "blackgui/components/settingshotkeycomponent.h"
 #include "blackgui/guiapplication.h"

src/blackgui/components/settingsnetworkcomponent.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextnetwork.h"
+#include "blackcore/context/contextnetwork.h"
 #include "blackgui/components/settingsnetworkcomponent.h"
 #include "blackgui/guiapplication.h"
 #include "ui_settingsnetworkcomponent.h"

src/blackgui/components/settingsnetworkserverscomponent.cpp

@@ -8,7 +8,7 @@
  */
 
 #include "blackconfig/buildconfig.h"
-#include "blackcore/contextapplication.h"
+#include "blackcore/context/contextapplication.h"
 #include "blackcore/data/globalsetup.h"
 #include "blackgui/editors/serverform.h"
 #include "blackgui/components/settingsnetworkserverscomponent.h"

src/blackgui/components/settingssimulatorcomponent.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextapplication.h"
-#include "blackcore/contextsimulator.h"
+#include "blackcore/context/contextapplication.h"
+#include "blackcore/context/contextsimulator.h"
 #include "blackcore/pluginmanagersimulator.h"
 #include "blackgui/components/settingssimulatorcomponent.h"
 #include "blackgui/guiapplication.h"
@@ -44,6 +44,7 @@ using namespace BlackMisc::Simulation;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Simulation;
 using namespace BlackCore;
+using namespace BlackCore::Context;
 
 namespace BlackGui
 {

src/blackgui/components/simulatorcomponent.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextownaircraft.h"
-#include "blackcore/contextsimulator.h"
+#include "blackcore/context/contextownaircraft.h"
+#include "blackcore/context/contextsimulator.h"
 #include "blackcore/simulator.h"
 #include "blackgui/components/simulatorcomponent.h"
 #include "blackgui/guiapplication.h"
@@ -31,6 +31,7 @@ using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Simulation;
 using namespace BlackCore;
+using namespace BlackCore::Context;
 
 namespace BlackGui
 {

src/blackgui/components/textmessagecomponent.cpp

@@ -8,9 +8,9 @@
  */
 
 #include "blackcore/application.h"
-#include "blackcore/contextaudio.h"
-#include "blackcore/contextnetwork.h"
-#include "blackcore/contextownaircraft.h"
+#include "blackcore/context/contextaudio.h"
+#include "blackcore/context/contextnetwork.h"
+#include "blackcore/context/contextownaircraft.h"
 #include "blackcore/corefacade.h"
 #include "blackgui/components/textmessagecomponent.h"
 #include "blackgui/dockwidgetinfoarea.h"
@@ -43,6 +43,7 @@
 #include <QtGlobal>
 
 using namespace BlackCore;
+using namespace BlackCore::Context;
 using namespace BlackMisc;
 using namespace BlackGui;
 using namespace BlackGui::Views;

src/blackgui/components/usercomponent.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextnetwork.h"
+#include "blackcore/context/contextnetwork.h"
 #include "blackcore/network.h"
 #include "blackgui/components/usercomponent.h"
 #include "blackgui/guiapplication.h"
@@ -22,6 +22,7 @@
 using namespace BlackGui;
 using namespace BlackGui::Views;
 using namespace BlackCore;
+using namespace BlackCore::Context;
 
 namespace BlackGui
 {

src/blackgui/components/voiceroomscomponent.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/contextaudio.h"
-#include "blackcore/contextownaircraft.h"
+#include "blackcore/context/contextaudio.h"
+#include "blackcore/context/contextownaircraft.h"
 #include "blackgui/components/voiceroomscomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/views/userview.h"
@@ -24,6 +24,7 @@
 #include <QtGlobal>
 
 using namespace BlackCore;
+using namespace BlackCore::Context;
 using namespace BlackMisc::Audio;
 
 namespace BlackGui
@@ -141,7 +142,5 @@ namespace BlackGui
                 this->ui->tvp_CockpitVoiceRoom2->clear();
             }
         }
-
     } // namespace
 } // namespace
-

src/blackgui/components/weathercomponent.cpp

@@ -11,9 +11,9 @@
 #include "blackgui/infoarea.h"
 #include "blackgui/views/viewbase.h"
 #include "blackgui/guiapplication.h"
-#include "blackcore/contextapplication.h"
-#include "blackcore/contextsimulator.h"
-#include "blackcore/contextownaircraft.h"
+#include "blackcore/context/contextapplication.h"
+#include "blackcore/context/contextsimulator.h"
+#include "blackcore/context/contextownaircraft.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/weather/weathergrid.h"
@@ -24,6 +24,7 @@
 #include <QRegularExpression>
 
 using namespace BlackCore;
+using namespace BlackCore::Context;
 using namespace BlackGui;
 using namespace BlackGui::Models;
 using namespace BlackGui::Views;