refs #649, refs #658 fixed includes to new subfolders "db"

some style changes in same step

src/blackgui/components/dbaircrafticaoselectorcomponent.cpp

@@ -7,17 +7,17 @@
  * contained in the LICENSE file.
  */
 
+#include "ui_dbaircrafticaoselectorcomponent.h"
 #include "blackcore/application.h"
 #include "blackcore/webdataservices.h"
 #include "blackgui/components/dbaircrafticaoselectorcomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/uppercasevalidator.h"
 #include "blackmisc/aviation/aircrafticaocodelist.h"
+#include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/compare.h"
-#include "blackmisc/datastoreutility.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/variant.h"
-#include "ui_dbaircrafticaoselectorcomponent.h"
 
 #include <QCompleter>
 #include <QDragEnterEvent>

src/blackgui/components/dbairlineicaocomponent.cpp

@@ -60,6 +60,5 @@ namespace BlackGui
             if (!sGui) { return; }
             sGui->getWebDataServices()->triggerRead(CEntityFlags::AirlineIcaoEntity, QDateTime());
         }
-
     } // ns
 } // ns

src/blackgui/components/dbairlineicaocomponent.h

@@ -56,6 +56,6 @@ namespace BlackGui
         private:
             QScopedPointer<Ui::CDbAirlineIcaoComponent> ui;
         };
-    }
-}
+    } // ns
+} // ns
 #endif // guard

src/blackgui/components/dbairlineicaoselectorbase.cpp

@@ -7,12 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/webdataservices.h"
 #include "blackgui/components/dbairlineicaoselectorbase.h"
 #include "blackgui/guiapplication.h"
+#include "blackcore/webdataservices.h"
 #include "blackmisc/aviation/airlineicaocodelist.h"
+#include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/compare.h"
-#include "blackmisc/datastoreutility.h"
 #include "blackmisc/variant.h"
 
 #include <QCompleter>
@@ -42,7 +42,17 @@ namespace BlackGui
             this->setAcceptedMetaTypeIds({qMetaTypeId<CAirlineIcaoCode>(), qMetaTypeId<CAirlineIcaoCodeList>()});
 
             connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbAirlineIcaoSelectorBase::ps_codesRead);
-            this->ps_codesRead(CEntityFlags::AirlineIcaoEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getAirlineIcaoCodesCount());
+
+            // when we already have data, init completers. This can not be done directly in the
+            // constructor due to virtual functions
+            const int c =  sGui->getWebDataServices()->getAirlineIcaoCodesCount();
+            if (c > 0)
+            {
+                QTimer::singleShot(500, [this, c]()
+                {
+                    this->ps_codesRead(CEntityFlags::AirlineIcaoEntity, CEntityFlags::ReadFinished, c);
+                });
+            }
         }
 
         CDbAirlineIcaoSelectorBase::~CDbAirlineIcaoSelectorBase()
@@ -135,6 +145,5 @@ namespace BlackGui
             if (dbKey < 0) { return; }
             this->setAirlineIcao(dbKey);
         }
-
     }// class
 } // ns

src/blackgui/components/dbairlineicaoselectorcomponent.cpp

@@ -7,14 +7,14 @@
  * contained in the LICENSE file.
  */
 
+#include "ui_dbairlineicaoselectorcomponent.h"
 #include "blackcore/webdataservices.h"
 #include "blackgui/components/dbairlineicaoselectorcomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/uppercasevalidator.h"
+#include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/aviation/airlineicaocodelist.h"
-#include "blackmisc/datastoreutility.h"
 #include "blackmisc/stringutils.h"
-#include "ui_dbairlineicaoselectorcomponent.h"
 
 #include <QCompleter>
 #include <QLabel>

src/blackgui/components/dbairlinenameselectorcomponent.cpp

@@ -7,12 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/webdataservices.h"
+#include "ui_dbairlinenameselectorcomponent.h"
 #include "blackgui/components/dbairlinenameselectorcomponent.h"
 #include "blackgui/guiapplication.h"
+#include "blackcore/webdataservices.h"
 #include "blackmisc/aviation/airlineicaocodelist.h"
-#include "blackmisc/datastoreutility.h"
-#include "ui_dbairlinenameselectorcomponent.h"
+#include "blackmisc/db/datastoreutility.h"
 
 #include <QCompleter>
 #include <QLineEdit>

src/blackgui/components/dbautostashingcomponent.cpp

@@ -260,7 +260,7 @@ namespace BlackGui
             this->m_state = Completed;
         }
 
-        bool CDbAutoStashingComponent::tryToStashModel(Simulation::CAircraftModel &model)
+        bool CDbAutoStashingComponent::tryToStashModel(CAircraftModel &model)
         {
             bool stashed = false;
 

src/blackgui/components/dblogincomponent.cpp

@@ -28,6 +28,7 @@
 #include <QtGlobal>
 
 using namespace BlackCore;
+using namespace BlackCore::Db;
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
 

src/blackgui/components/dblogincomponent.h

@@ -12,7 +12,8 @@
 #ifndef BLACKGUI_COMPONENTS_DBLOGINCOMPONENT_H
 #define BLACKGUI_COMPONENTS_DBLOGINCOMPONENT_H
 
-#include "blackcore/databaseauthentication.h"
+#include "blackcore/db/databaseauthentication.h"
+#include "blackcore/data/globalsetup.h"
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/statusmessagelist.h"
 
@@ -20,8 +21,6 @@
 #include <QObject>
 #include <QScopedPointer>
 
-class QWidget;
-
 namespace BlackMisc { namespace Network { class CAuthenticatedUser; } }
 namespace Ui { class CDbLoginComponent; }
 
@@ -45,7 +44,7 @@ namespace BlackGui
 
         private:
             QScopedPointer<Ui::CDbLoginComponent>     ui;
-            BlackCore::CDatabaseAuthenticationService m_loginService {this};  //!< login service
+            BlackCore::Db::CDatabaseAuthenticationService m_loginService {this};  //!< login service
 
             //! Overlay messages
             void displayOverlayMessages(const BlackMisc::CStatusMessageList &msgs);
@@ -62,7 +61,6 @@ namespace BlackGui
 
             //! User authentication completed
             void ps_AuthenticationFinished(const BlackMisc::Network::CAuthenticatedUser &user, const BlackMisc::CStatusMessageList &status);
-
         };
     } // ns
 } // ns

src/blackgui/components/dbmodelmappingmodifycomponent.cpp

@@ -14,6 +14,7 @@
 #include <QWidget>
 
 using namespace BlackMisc;
+using namespace BlackMisc::Simulation;
 
 namespace BlackGui
 {
@@ -37,7 +38,7 @@ namespace BlackGui
             return (ui->editor_ModelMappingModify->getValues());
         }
 
-        void CDbModelMappingModifyComponent::setValue(const Simulation::CAircraftModel &model)
+        void CDbModelMappingModifyComponent::setValue(const CAircraftModel &model)
         {
             this->ui->editor_ModelMappingModify->setValue(model);
         }

src/blackgui/components/dbstashcomponent.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
+#include "blackcore/db/databasewriter.h"
 #include "blackcore/application.h"
-#include "blackcore/databasewriter.h"
 #include "blackcore/webdataservices.h"
 #include "blackgui/components/dbmappingcomponent.h"
 #include "blackgui/components/dbstashcomponent.h"
@@ -35,6 +35,7 @@
 #include <iterator>
 
 using namespace BlackCore;
+using namespace BlackCore::Db;
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
 using namespace BlackMisc::Aviation;

src/blackgui/editors/aircrafticaoform.cpp

@@ -7,7 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/webdataservices.h"
+#include "ui_aircrafticaoform.h"
+#include "aircrafticaoform.h"
+
 #include "blackgui/components/aircraftcombinedtypeselector.h"
 #include "blackgui/components/dbaircrafticaoselectorcomponent.h"
 #include "blackgui/dropsite.h"
@@ -16,11 +18,11 @@
 #include "blackgui/guiapplication.h"
 #include "blackgui/guiutility.h"
 #include "blackgui/labelandicon.h"
+#include "blackcore/webdataservices.h"
 #include "blackmisc/aviation/aircrafticaocodelist.h"
+#include "blackmisc/db/datastore.h"
 #include "blackmisc/compare.h"
-#include "blackmisc/datastore.h"
 #include "blackmisc/icons.h"
-#include "ui_aircrafticaoform.h"
 
 #include <QCheckBox>
 #include <QComboBox>

src/blackgui/models/aircrafticaolistmodel.cpp

@@ -11,7 +11,7 @@
 #include "blackgui/models/columnformatters.h"
 #include "blackgui/models/columns.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
-#include "blackmisc/datastore.h"
+#include "blackmisc/db/datastore.h"
 #include "blackmisc/timestampbased.h"
 
 #include <Qt>

src/blackgui/models/aircraftmodellistmodel.cpp

@@ -13,7 +13,7 @@
 #include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/aviation/livery.h"
-#include "blackmisc/datastore.h"
+#include "blackmisc/db/datastore.h"
 #include "blackmisc/orderable.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/distributor.h"

src/blackgui/models/airlineicaolistmodel.cpp

@@ -10,9 +10,9 @@
 #include "blackgui/models/airlineicaolistmodel.h"
 #include "blackgui/models/columnformatters.h"
 #include "blackgui/models/columns.h"
+#include "blackmisc/db/datastore.h"
 #include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/country.h"
-#include "blackmisc/datastore.h"
 #include "blackmisc/propertyindexvariantmap.h"
 #include "blackmisc/timestampbased.h"
 

src/blackgui/models/distributorlistmodel.cpp

@@ -9,7 +9,7 @@
 
 #include "blackgui/models/columns.h"
 #include "blackgui/models/distributorlistmodel.h"
-#include "blackmisc/datastore.h"
+#include "blackmisc/db/datastore.h"
 #include "blackmisc/propertyindexvariantmap.h"
 #include "blackmisc/simulation/distributor.h"
 #include "blackmisc/simulation/simulatorinfo.h"

src/blackgui/models/listmodeldbobjects.cpp

@@ -7,7 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "blackgui/models/listmodeldbobjects.h"
+#include "listmodeldbobjects.h"
+#include "allmodelcontainers.h"
+#include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/orderable.h"
 
 #include <QBrush>

src/blackgui/models/liverylistmodel.cpp

@@ -13,7 +13,7 @@
 #include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/aviation/livery.h"
 #include "blackmisc/country.h"
-#include "blackmisc/datastore.h"
+#include "blackmisc/db/datastore.h"
 #include "blackmisc/propertyindexvariantmap.h"
 #include "blackmisc/timestampbased.h"
 

src/blackgui/views/atcstationview.cpp

@@ -41,7 +41,7 @@ namespace BlackGui
             this->setSortIndicator();
         }
 
-        void CAtcStationView::changedAtcStationConnectionStatus(const Aviation::CAtcStation &station, bool added)
+        void CAtcStationView::changedAtcStationConnectionStatus(const CAtcStation &station, bool added)
         {
             this->m_model->changedAtcStationConnectionStatus(station, added);
             this->resizeToContents();