flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
some style changes in same step
This commit is contained in:
Klaus Basan
2016-05-24 00:40:40 +02:00
parent 5789bdd722
commit 54b1234f7f
44 changed files with 130 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/blackcore/contextnetworkproxy.cpp
View File

@@ -20,7 +20,9 @@
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
using namespace BlackMisc::Audio;
using namespace BlackMisc::Weather; using namespace BlackMisc::Weather;
using namespace BlackMisc::Simulation;
namespace BlackCore namespace BlackCore
{ {
@@ -73,8 +75,6 @@ namespace BlackCore
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
"textMessageSent", this, SIGNAL(textMessageSent(BlackMisc::Network::CTextMessage))); "textMessageSent", this, SIGNAL(textMessageSent(BlackMisc::Network::CTextMessage)));
Q_ASSERT(s); Q_ASSERT(s);
// s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
// "webServiceDataRead", this, SIGNAL(webServiceDataRead(BlackMisc::Network::CEntityFlags::Entity, BlackMisc::Network::CEntityFlags::ReadState, int)));
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
"webServiceDataRead", this, SIGNAL(webServiceDataRead(int, int, int))); "webServiceDataRead", this, SIGNAL(webServiceDataRead(int, int, int)));
@@ -109,7 +109,7 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1Literal("getAtcStationsBooked")); return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1Literal("getAtcStationsBooked"));
} }
Simulation::CSimulatedAircraftList CContextNetworkProxy::getAircraftInRange() const CSimulatedAircraftList CContextNetworkProxy::getAircraftInRange() const
{ {
return this->m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraftList>(QLatin1Literal("getAircraftInRange")); return this->m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraftList>(QLatin1Literal("getAircraftInRange"));
} }
@@ -119,7 +119,7 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<int>(QLatin1Literal("getAircraftInRangeCount")); return this->m_dBusInterface->callDBusRet<int>(QLatin1Literal("getAircraftInRangeCount"));
} }
Simulation::CSimulatedAircraft CContextNetworkProxy::getAircraftInRangeForCallsign(const CCallsign &callsign) const CSimulatedAircraft CContextNetworkProxy::getAircraftInRangeForCallsign(const CCallsign &callsign) const
{ {
return this->m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraft>(QLatin1Literal("getAircraftInRangeForCallsign"), callsign); return this->m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraft>(QLatin1Literal("getAircraftInRangeForCallsign"), callsign);
} }
@@ -129,47 +129,47 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStation>(QLatin1Literal("getOnlineStationForCallsign"), callsign); return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStation>(QLatin1Literal("getOnlineStationForCallsign"), callsign);
} }
BlackMisc::Network::CUserList CContextNetworkProxy::getUsers() const CUserList CContextNetworkProxy::getUsers() const
{ {
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1Literal("getUsers")); return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1Literal("getUsers"));
} }
BlackMisc::Network::CUserList CContextNetworkProxy::getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const CUserList CContextNetworkProxy::getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const
{ {
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1Literal("getUsersForCallsigns"), callsigns); return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1Literal("getUsersForCallsigns"), callsigns);
} }
BlackMisc::Network::CUser CContextNetworkProxy::getUserForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const CUser CContextNetworkProxy::getUserForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const
{ {
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUser>(QLatin1Literal("getUserForCallsign"), callsign); return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUser>(QLatin1Literal("getUserForCallsign"), callsign);
} }
BlackMisc::Network::CClientList CContextNetworkProxy::getOtherClients() const CClientList CContextNetworkProxy::getOtherClients() const
{ {
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CClientList>(QLatin1Literal("getOtherClients")); return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CClientList>(QLatin1Literal("getOtherClients"));
} }
BlackMisc::Network::CServerList CContextNetworkProxy::getVatsimFsdServers() const CServerList CContextNetworkProxy::getVatsimFsdServers() const
{ {
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CServerList>(QLatin1Literal("getVatsimFsdServers")); return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CServerList>(QLatin1Literal("getVatsimFsdServers"));
} }
BlackMisc::Network::CServerList CContextNetworkProxy::getVatsimVoiceServers() const CServerList CContextNetworkProxy::getVatsimVoiceServers() const
{ {
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CServerList>(QLatin1Literal("getVatsimVoiceServers")); return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CServerList>(QLatin1Literal("getVatsimVoiceServers"));
} }
BlackMisc::Network::CClientList CContextNetworkProxy::getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const CClientList CContextNetworkProxy::getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const
{ {
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CClientList>(QLatin1Literal("getOtherClientsForCallsigns"), callsigns); return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CClientList>(QLatin1Literal("getOtherClientsForCallsigns"), callsigns);
} }
BlackMisc::Audio::CVoiceRoomList CContextNetworkProxy::getSelectedVoiceRooms() const CVoiceRoomList CContextNetworkProxy::getSelectedVoiceRooms() const
{ {
return this->m_dBusInterface->callDBusRet<BlackMisc::Audio::CVoiceRoomList>(QLatin1Literal("getSelectedVoiceRooms")); return this->m_dBusInterface->callDBusRet<BlackMisc::Audio::CVoiceRoomList>(QLatin1Literal("getSelectedVoiceRooms"));
} }
BlackMisc::Aviation::CAtcStationList CContextNetworkProxy::getSelectedAtcStations() const CAtcStationList CContextNetworkProxy::getSelectedAtcStations() const
{ {
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1Literal("getSelectedAtcStations")); return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1Literal("getSelectedAtcStations"));
} }
@@ -189,7 +189,7 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateAircraftEnabled"), callsign, enabledForRedering, originator); return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateAircraftEnabled"), callsign, enabledForRedering, originator);
} }
bool CContextNetworkProxy::updateAircraftModel(const CCallsign &callsign, const Simulation::CAircraftModel &model, const CIdentifier &originator) bool CContextNetworkProxy::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator)
{ {
return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateAircraftModel"), callsign, model, originator); return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateAircraftModel"), callsign, model, originator);
} }

2
src/blackcore/networkvatlib.cpp
View File

@@ -71,7 +71,7 @@ using namespace BlackMisc::Simulation;
namespace BlackCore namespace BlackCore
{ {
CNetworkVatlib::CNetworkVatlib(Simulation::IOwnAircraftProvider *ownAircraft, QObject *parent) CNetworkVatlib::CNetworkVatlib(IOwnAircraftProvider *ownAircraft, QObject *parent)
: INetwork(parent), COwnAircraftAware(ownAircraft), : INetwork(parent), COwnAircraftAware(ownAircraft),
m_loginMode(LoginNormal), m_loginMode(LoginNormal),
m_status(vatStatusIdle), m_status(vatStatusIdle),

4
src/blackgui/components/dbaircrafticaoselectorcomponent.cpp
View File

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

1
src/blackgui/components/dbairlineicaocomponent.cpp
View File

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

4
src/blackgui/components/dbairlineicaocomponent.h
View File

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

17
src/blackgui/components/dbairlineicaoselectorbase.cpp
View File

@@ -7,12 +7,12 @@
* contained in the LICENSE file. * contained in the LICENSE file.
*/ */
#include "blackcore/webdataservices.h"
#include "blackgui/components/dbairlineicaoselectorbase.h" #include "blackgui/components/dbairlineicaoselectorbase.h"
#include "blackgui/guiapplication.h" #include "blackgui/guiapplication.h"
#include "blackcore/webdataservices.h"
#include "blackmisc/aviation/airlineicaocodelist.h" #include "blackmisc/aviation/airlineicaocodelist.h"
#include "blackmisc/db/datastoreutility.h"
#include "blackmisc/compare.h" #include "blackmisc/compare.h"
#include "blackmisc/datastoreutility.h"
#include "blackmisc/variant.h" #include "blackmisc/variant.h"
#include <QCompleter> #include <QCompleter>
@@ -42,7 +42,17 @@ namespace BlackGui
this->setAcceptedMetaTypeIds({qMetaTypeId<CAirlineIcaoCode>(), qMetaTypeId<CAirlineIcaoCodeList>()}); this->setAcceptedMetaTypeIds({qMetaTypeId<CAirlineIcaoCode>(), qMetaTypeId<CAirlineIcaoCodeList>()});
connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbAirlineIcaoSelectorBase::ps_codesRead); 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() CDbAirlineIcaoSelectorBase::~CDbAirlineIcaoSelectorBase()
@@ -135,6 +145,5 @@ namespace BlackGui
if (dbKey < 0) { return; } if (dbKey < 0) { return; }
this->setAirlineIcao(dbKey); this->setAirlineIcao(dbKey);
} }
}// class }// class
} // ns } // ns

4
src/blackgui/components/dbairlineicaoselectorcomponent.cpp
View File

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

6
src/blackgui/components/dbairlinenameselectorcomponent.cpp
View File

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

2
src/blackgui/components/dbautostashingcomponent.cpp
View File

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

1
src/blackgui/components/dblogincomponent.cpp
View File

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

8
src/blackgui/components/dblogincomponent.h
View File

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

3
src/blackgui/components/dbmodelmappingmodifycomponent.cpp
View File

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

3
src/blackgui/components/dbstashcomponent.cpp
View File

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

8
src/blackgui/editors/aircrafticaoform.cpp
View File

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

2
src/blackgui/models/aircrafticaolistmodel.cpp
View File

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

2
src/blackgui/models/aircraftmodellistmodel.cpp
View File

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

2
src/blackgui/models/airlineicaolistmodel.cpp
View File

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

2
src/blackgui/models/distributorlistmodel.cpp
View File

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

4
src/blackgui/models/listmodeldbobjects.cpp
View File

@@ -7,7 +7,9 @@
* contained in the LICENSE file. * 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 "blackmisc/orderable.h"
#include <QBrush> #include <QBrush>

2
src/blackgui/models/liverylistmodel.cpp
View File

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

2
src/blackgui/views/atcstationview.cpp
View File

@@ -41,7 +41,7 @@ namespace BlackGui
this->setSortIndicator(); 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->m_model->changedAtcStationConnectionStatus(station, added);
this->resizeToContents(); this->resizeToContents();

3
src/blackmisc/aviation/aircrafticaocode.cpp
View File

@@ -9,7 +9,7 @@
#include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/comparefunctions.h" #include "blackmisc/comparefunctions.h"
#include "blackmisc/datastoreutility.h" #include "blackmisc/db/datastoreutility.h"
#include "blackmisc/logcategory.h" #include "blackmisc/logcategory.h"
#include "blackmisc/logcategorylist.h" #include "blackmisc/logcategorylist.h"
#include "blackmisc/propertyindex.h" #include "blackmisc/propertyindex.h"
@@ -26,6 +26,7 @@
#include <QtGlobal> #include <QtGlobal>
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Db;
namespace BlackMisc namespace BlackMisc
{ {

4
src/blackmisc/aviation/aircrafticaocode.h
View File

@@ -12,8 +12,8 @@
#ifndef BLACKMISC_AVIATION_AIRCRAFTICAOCODE_H #ifndef BLACKMISC_AVIATION_AIRCRAFTICAOCODE_H
#define BLACKMISC_AVIATION_AIRCRAFTICAOCODE_H #define BLACKMISC_AVIATION_AIRCRAFTICAOCODE_H
#include "blackmisc/db/datastore.h"
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/datastore.h"
#include "blackmisc/metaclass.h" #include "blackmisc/metaclass.h"
#include "blackmisc/propertyindex.h" #include "blackmisc/propertyindex.h"
#include "blackmisc/statusmessagelist.h" #include "blackmisc/statusmessagelist.h"
@@ -33,7 +33,7 @@ namespace BlackMisc
//! Value object for ICAO classification //! Value object for ICAO classification
class BLACKMISC_EXPORT CAircraftIcaoCode : class BLACKMISC_EXPORT CAircraftIcaoCode :
public CValueObject<CAircraftIcaoCode>, public CValueObject<CAircraftIcaoCode>,
public BlackMisc::IDatastoreObjectWithIntegerKey public BlackMisc::Db::IDatastoreObjectWithIntegerKey
{ {
public: public:
//! Properties by index //! Properties by index

4
src/blackmisc/aviation/aircrafticaocodelist.h
View File

@@ -16,7 +16,7 @@
#include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h" #include "blackmisc/collection.h"
#include "blackmisc/datastoreobjectlist.h" #include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/sequence.h" #include "blackmisc/sequence.h"
#include "blackmisc/variant.h" #include "blackmisc/variant.h"
@@ -33,7 +33,7 @@ namespace BlackMisc
//! Value object encapsulating a list of ICAO codes. //! Value object encapsulating a list of ICAO codes.
class BLACKMISC_EXPORT CAircraftIcaoCodeList : class BLACKMISC_EXPORT CAircraftIcaoCodeList :
public CSequence<CAircraftIcaoCode>, public CSequence<CAircraftIcaoCode>,
public BlackMisc::IDatastoreObjectList<CAircraftIcaoCode, CAircraftIcaoCodeList, int>, public BlackMisc::Db::IDatastoreObjectList<CAircraftIcaoCode, CAircraftIcaoCodeList, int>,
public BlackMisc::Mixin::MetaType<CAircraftIcaoCodeList> public BlackMisc::Mixin::MetaType<CAircraftIcaoCodeList>
{ {
public: public:

2
src/blackmisc/aviation/airlineicaocode.cpp
View File

@@ -9,7 +9,7 @@
#include "blackmisc/aviation/airlineicaocode.h" #include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/comparefunctions.h" #include "blackmisc/comparefunctions.h"
#include "blackmisc/datastoreutility.h" #include "blackmisc/db/datastoreutility.h"
#include "blackmisc/icons.h" #include "blackmisc/icons.h"
#include "blackmisc/logcategory.h" #include "blackmisc/logcategory.h"
#include "blackmisc/logcategorylist.h" #include "blackmisc/logcategorylist.h"

4
src/blackmisc/aviation/airlineicaocode.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/country.h" #include "blackmisc/country.h"
#include "blackmisc/datastore.h" #include "blackmisc/db/datastore.h"
#include "blackmisc/icon.h" #include "blackmisc/icon.h"
#include "blackmisc/metaclass.h" #include "blackmisc/metaclass.h"
#include "blackmisc/propertyindex.h" #include "blackmisc/propertyindex.h"
@@ -33,7 +33,7 @@ namespace BlackMisc
//! Value object for ICAO classification //! Value object for ICAO classification
class BLACKMISC_EXPORT CAirlineIcaoCode : class BLACKMISC_EXPORT CAirlineIcaoCode :
public CValueObject<CAirlineIcaoCode>, public CValueObject<CAirlineIcaoCode>,
public BlackMisc::IDatastoreObjectWithIntegerKey public BlackMisc::Db::IDatastoreObjectWithIntegerKey
{ {
public: public:
//! Properties by index //! Properties by index

4
src/blackmisc/aviation/airlineicaocodelist.h
View File

@@ -16,7 +16,7 @@
#include "blackmisc/aviation/airlineicaocode.h" #include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h" #include "blackmisc/collection.h"
#include "blackmisc/datastoreobjectlist.h" #include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/sequence.h" #include "blackmisc/sequence.h"
#include "blackmisc/variant.h" #include "blackmisc/variant.h"
@@ -33,7 +33,7 @@ namespace BlackMisc
//! Value object encapsulating a list of ICAO codes. //! Value object encapsulating a list of ICAO codes.
class BLACKMISC_EXPORT CAirlineIcaoCodeList : class BLACKMISC_EXPORT CAirlineIcaoCodeList :
public CSequence<CAirlineIcaoCode>, public CSequence<CAirlineIcaoCode>,
public BlackMisc::IDatastoreObjectList<CAirlineIcaoCode, CAirlineIcaoCodeList, int>, public BlackMisc::Db::IDatastoreObjectList<CAirlineIcaoCode, CAirlineIcaoCodeList, int>,
public BlackMisc::Mixin::MetaType<CAirlineIcaoCodeList> public BlackMisc::Mixin::MetaType<CAirlineIcaoCodeList>
{ {

2
src/blackmisc/aviation/livery.cpp
View File

@@ -10,7 +10,7 @@
#include "blackmisc/aviation/livery.h" #include "blackmisc/aviation/livery.h"
#include "blackmisc/compare.h" #include "blackmisc/compare.h"
#include "blackmisc/comparefunctions.h" #include "blackmisc/comparefunctions.h"
#include "blackmisc/datastoreutility.h" #include "blackmisc/db/datastoreutility.h"
#include "blackmisc/logcategory.h" #include "blackmisc/logcategory.h"
#include "blackmisc/logcategorylist.h" #include "blackmisc/logcategorylist.h"
#include "blackmisc/propertyindex.h" #include "blackmisc/propertyindex.h"

4
src/blackmisc/aviation/livery.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/aviation/airlineicaocode.h" #include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/datastore.h" #include "blackmisc/db/datastore.h"
#include "blackmisc/metaclass.h" #include "blackmisc/metaclass.h"
#include "blackmisc/propertyindex.h" #include "blackmisc/propertyindex.h"
#include "blackmisc/rgbcolor.h" #include "blackmisc/rgbcolor.h"
@@ -33,7 +33,7 @@ namespace BlackMisc
//! Value object encapsulating information about an airpot. //! Value object encapsulating information about an airpot.
class BLACKMISC_EXPORT CLivery : class BLACKMISC_EXPORT CLivery :
public CValueObject<CLivery>, public CValueObject<CLivery>,
public BlackMisc::IDatastoreObjectWithIntegerKey public BlackMisc::Db::IDatastoreObjectWithIntegerKey
{ {
public: public:
//! Properties by index //! Properties by index

4
src/blackmisc/aviation/liverylist.h
View File

@@ -16,7 +16,7 @@
#include "blackmisc/aviation/livery.h" #include "blackmisc/aviation/livery.h"
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h" #include "blackmisc/collection.h"
#include "blackmisc/datastoreobjectlist.h" #include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/sequence.h" #include "blackmisc/sequence.h"
#include "blackmisc/variant.h" #include "blackmisc/variant.h"
@@ -31,7 +31,7 @@ namespace BlackMisc
//! Value object for a list of airports. //! Value object for a list of airports.
class BLACKMISC_EXPORT CLiveryList : class BLACKMISC_EXPORT CLiveryList :
public CSequence<CLivery>, public CSequence<CLivery>,
public BlackMisc::IDatastoreObjectList<CLivery, CLiveryList, int>, public BlackMisc::Db::IDatastoreObjectList<CLivery, CLiveryList, int>,
public BlackMisc::Mixin::MetaType<CLiveryList> public BlackMisc::Mixin::MetaType<CLiveryList>
{ {
public: public:

4
src/blackmisc/country.h
View File

@@ -13,7 +13,7 @@
#define BLACKMISC_COUNTRY_H #define BLACKMISC_COUNTRY_H
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/datastore.h" #include "blackmisc/db/datastore.h"
#include "blackmisc/icon.h" #include "blackmisc/icon.h"
#include "blackmisc/metaclass.h" #include "blackmisc/metaclass.h"
#include "blackmisc/propertyindex.h" #include "blackmisc/propertyindex.h"
@@ -24,6 +24,8 @@
#include <QMetaType> #include <QMetaType>
#include <QString> #include <QString>
using namespace BlackMisc::Db;
namespace BlackMisc namespace BlackMisc
{ {
/*! /*!

4
src/blackmisc/countrylist.h
View File

@@ -12,10 +12,10 @@
#ifndef BLACKMISC_COUNTRYLIST_H #ifndef BLACKMISC_COUNTRYLIST_H
#define BLACKMISC_COUNTRYLIST_H #define BLACKMISC_COUNTRYLIST_H
#include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h" #include "blackmisc/collection.h"
#include "blackmisc/country.h" #include "blackmisc/country.h"
#include "blackmisc/datastoreobjectlist.h"
#include "blackmisc/sequence.h" #include "blackmisc/sequence.h"
#include "blackmisc/variant.h" #include "blackmisc/variant.h"
@@ -31,7 +31,7 @@ namespace BlackMisc
//! \remark: I do not use CCollection as I want to sort per column //! \remark: I do not use CCollection as I want to sort per column
class BLACKMISC_EXPORT CCountryList : class BLACKMISC_EXPORT CCountryList :
public CSequence<CCountry>, public CSequence<CCountry>,
public BlackMisc::IDatastoreObjectList<CCountry, CCountryList, QString>, public BlackMisc::Db::IDatastoreObjectList<CCountry, CCountryList, QString>,
public BlackMisc::Mixin::MetaType<CCountryList> public BlackMisc::Mixin::MetaType<CCountryList>
{ {
public: public:

4
src/blackmisc/network/authenticateduser.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/country.h" #include "blackmisc/country.h"
#include "blackmisc/datastore.h" #include "blackmisc/db/datastore.h"
#include "blackmisc/icon.h" #include "blackmisc/icon.h"
#include "blackmisc/metaclass.h" #include "blackmisc/metaclass.h"
#include "blackmisc/network/rolelist.h" #include "blackmisc/network/rolelist.h"
@@ -37,7 +37,7 @@ namespace BlackMisc
*/ */
class BLACKMISC_EXPORT CAuthenticatedUser : class BLACKMISC_EXPORT CAuthenticatedUser :
public CValueObject<CAuthenticatedUser>, public CValueObject<CAuthenticatedUser>,
public BlackMisc::IDatastoreObjectWithIntegerKey public BlackMisc::Db::IDatastoreObjectWithIntegerKey
{ {
public: public:
//! Properties by index //! Properties by index

4
src/blackmisc/network/role.h
View File

@@ -13,7 +13,7 @@
#define BLACKMISC_NETWORK_ROLE_H #define BLACKMISC_NETWORK_ROLE_H
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/datastore.h" #include "blackmisc/db/datastore.h"
#include "blackmisc/metaclass.h" #include "blackmisc/metaclass.h"
#include "blackmisc/propertyindex.h" #include "blackmisc/propertyindex.h"
#include "blackmisc/valueobject.h" #include "blackmisc/valueobject.h"
@@ -32,7 +32,7 @@ namespace BlackMisc
*/ */
class BLACKMISC_EXPORT CRole : class BLACKMISC_EXPORT CRole :
public CValueObject<CRole>, public CValueObject<CRole>,
public IDatastoreObjectWithIntegerKey public BlackMisc::Db::IDatastoreObjectWithIntegerKey
{ {
public: public:
//! Properties by index //! Properties by index

2
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -9,7 +9,7 @@
#include "blackmisc/compare.h" #include "blackmisc/compare.h"
#include "blackmisc/comparefunctions.h" #include "blackmisc/comparefunctions.h"
#include "blackmisc/datastoreutility.h" #include "blackmisc/db/datastoreutility.h"
#include "blackmisc/icon.h" #include "blackmisc/icon.h"
#include "blackmisc/iconlist.h" #include "blackmisc/iconlist.h"
#include "blackmisc/icons.h" #include "blackmisc/icons.h"

4
src/blackmisc/simulation/aircraftmodel.h
View File

@@ -17,7 +17,7 @@
#include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/livery.h" #include "blackmisc/aviation/livery.h"
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/datastore.h" #include "blackmisc/db/datastore.h"
#include "blackmisc/dictionary.h" #include "blackmisc/dictionary.h"
#include "blackmisc/metaclass.h" #include "blackmisc/metaclass.h"
#include "blackmisc/metaclassprivate.h" #include "blackmisc/metaclassprivate.h"
@@ -52,7 +52,7 @@ namespace BlackMisc
//! \remarks Simulator independent class, supposed to be common denominator //! \remarks Simulator independent class, supposed to be common denominator
class BLACKMISC_EXPORT CAircraftModel : class BLACKMISC_EXPORT CAircraftModel :
public CValueObject<CAircraftModel>, public CValueObject<CAircraftModel>,
public BlackMisc::IDatastoreObjectWithIntegerKey, public BlackMisc::Db::IDatastoreObjectWithIntegerKey,
public BlackMisc::IOrderable public BlackMisc::IOrderable
{ {
public: public:

4
src/blackmisc/simulation/aircraftmodellist.h
View File

@@ -15,7 +15,7 @@
#include "blackmisc/aviation/airlineicaocode.h" #include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h" #include "blackmisc/collection.h"
#include "blackmisc/datastoreobjectlist.h" #include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/orderablelist.h" #include "blackmisc/orderablelist.h"
#include "blackmisc/sequence.h" #include "blackmisc/sequence.h"
#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodel.h"
@@ -46,7 +46,7 @@ namespace BlackMisc
//! Value object encapsulating a list of aircraft models //! Value object encapsulating a list of aircraft models
class BLACKMISC_EXPORT CAircraftModelList : class BLACKMISC_EXPORT CAircraftModelList :
public BlackMisc::CSequence<CAircraftModel>, public BlackMisc::CSequence<CAircraftModel>,
public BlackMisc::IDatastoreObjectList<CAircraftModel, CAircraftModelList, int>, public BlackMisc::Db::IDatastoreObjectList<CAircraftModel, CAircraftModelList, int>,
public BlackMisc::IOrderableList<CAircraftModel, CAircraftModelList>, public BlackMisc::IOrderableList<CAircraftModel, CAircraftModelList>,
public BlackMisc::Mixin::MetaType<CAircraftModelList> public BlackMisc::Mixin::MetaType<CAircraftModelList>
{ {

4
src/blackmisc/simulation/distributor.h
View File

@@ -13,7 +13,7 @@
#define BLACKMISC_SIMULATION_DISTRIBUTOR_H #define BLACKMISC_SIMULATION_DISTRIBUTOR_H
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/datastore.h" #include "blackmisc/db/datastore.h"
#include "blackmisc/metaclass.h" #include "blackmisc/metaclass.h"
#include "blackmisc/orderable.h" #include "blackmisc/orderable.h"
#include "blackmisc/propertyindex.h" #include "blackmisc/propertyindex.h"
@@ -33,7 +33,7 @@ namespace BlackMisc
//! Value object encapsulating information of software distributor. //! Value object encapsulating information of software distributor.
class BLACKMISC_EXPORT CDistributor : class BLACKMISC_EXPORT CDistributor :
public BlackMisc::CValueObject<CDistributor>, public BlackMisc::CValueObject<CDistributor>,
public BlackMisc::IDatastoreObjectWithStringKey, public BlackMisc::Db::IDatastoreObjectWithStringKey,
public BlackMisc::IOrderable public BlackMisc::IOrderable
{ {
public: public:

4
src/blackmisc/simulation/distributorlist.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h" #include "blackmisc/collection.h"
#include "blackmisc/datastoreobjectlist.h" #include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/orderablelist.h" #include "blackmisc/orderablelist.h"
#include "blackmisc/sequence.h" #include "blackmisc/sequence.h"
#include "blackmisc/simulation/distributor.h" #include "blackmisc/simulation/distributor.h"
@@ -32,7 +32,7 @@ namespace BlackMisc
//! Value object encapsulating a list of distributors. //! Value object encapsulating a list of distributors.
class BLACKMISC_EXPORT CDistributorList : class BLACKMISC_EXPORT CDistributorList :
public BlackMisc::CSequence<CDistributor>, public BlackMisc::CSequence<CDistributor>,
public BlackMisc::IDatastoreObjectList<CDistributor, CDistributorList, QString>, public BlackMisc::Db::IDatastoreObjectList<CDistributor, CDistributorList, QString>,
public BlackMisc::IOrderableList<CDistributor, CDistributorList>, public BlackMisc::IOrderableList<CDistributor, CDistributorList>,
public BlackMisc::Mixin::MetaType<CDistributorList> public BlackMisc::Mixin::MetaType<CDistributorList>
{ {

11
src/blackmisc/simulation/simulatorinfo.cpp
View File

@@ -9,7 +9,7 @@
#include "blackconfig/buildconfig.h" #include "blackconfig/buildconfig.h"
#include "blackmisc/comparefunctions.h" #include "blackmisc/comparefunctions.h"
#include "blackmisc/datastoreutility.h" #include "blackmisc/db/datastoreutility.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h" #include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/simulatorinfo.h" #include "blackmisc/simulation/simulatorinfo.h"
#include <QJsonValue> #include <QJsonValue>
@@ -18,6 +18,7 @@
using namespace BlackConfig; using namespace BlackConfig;
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Db;
using namespace BlackMisc::Simulation::FsCommon; using namespace BlackMisc::Simulation::FsCommon;
namespace BlackMisc namespace BlackMisc
@@ -210,10 +211,10 @@ namespace BlackMisc
CSimulatorInfo CSimulatorInfo::fromDatabaseJson(const QJsonObject &json, const QString prefix) CSimulatorInfo CSimulatorInfo::fromDatabaseJson(const QJsonObject &json, const QString prefix)
{ {
bool fsx = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simfsx").toString()); const bool fsx = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simfsx").toString());
bool fs9 = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simfs9").toString()); const bool fs9 = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simfs9").toString());
bool xp = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simxplane").toString()); const bool xp = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simxplane").toString());
bool p3d = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simp3d").toString()); const bool p3d = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simp3d").toString());
const CSimulatorInfo simInfo(fsx, fs9, xp, p3d); const CSimulatorInfo simInfo(fsx, fs9, xp, p3d);
return simInfo; return simInfo;

3
src/plugins/simulator/fsx/simulatorfsx.cpp
View File

@@ -30,7 +30,6 @@ using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo; using namespace BlackMisc::Geo;
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::FsCommon; using namespace BlackMisc::Simulation::FsCommon;
using namespace BlackMisc::Simulation::Fsx; using namespace BlackMisc::Simulation::Fsx;
using namespace BlackMisc::Weather; using namespace BlackMisc::Weather;
@@ -128,7 +127,7 @@ namespace BlackSimPlugin
return true; return true;
} }
bool CSimulatorFsx::physicallyAddRemoteAircraft(const Simulation::CSimulatedAircraft &newRemoteAircraft) bool CSimulatorFsx::physicallyAddRemoteAircraft(const CSimulatedAircraft &newRemoteAircraft)
{ {
CCallsign callsign(newRemoteAircraft.getCallsign()); CCallsign callsign(newRemoteAircraft.getCallsign());
Q_ASSERT_X(CThreadUtils::isCurrentThreadObjectThread(this), Q_FUNC_INFO, "thread"); Q_ASSERT_X(CThreadUtils::isCurrentThreadObjectThread(this), Q_FUNC_INFO, "thread");

29
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -146,10 +146,10 @@ namespace BlackSimPlugin
m_service->getTransponderIdentAsync(&m_xplaneData.xpdrIdent); m_service->getTransponderIdentAsync(&m_xplaneData.xpdrIdent);
m_service->getAllWheelsOnGroundAsync(&m_xplaneData.onGroundAll); m_service->getAllWheelsOnGroundAsync(&m_xplaneData.onGroundAll);
Aviation::CAircraftSituation situation; CAircraftSituation situation;
situation.setPosition({ m_xplaneData.latitude, m_xplaneData.longitude, 0 }); situation.setPosition({ m_xplaneData.latitude, m_xplaneData.longitude, 0 });
situation.setAltitude({ m_xplaneData.altitude, Aviation::CAltitude::MeanSeaLevel, CLengthUnit::m() }); situation.setAltitude({ m_xplaneData.altitude, CAltitude::MeanSeaLevel, CLengthUnit::m() });
situation.setHeading({ m_xplaneData.trueHeading, Aviation::CHeading::True, CAngleUnit::deg() }); situation.setHeading({ m_xplaneData.trueHeading, CHeading::True, CAngleUnit::deg() });
situation.setPitch({ m_xplaneData.pitch, CAngleUnit::deg() }); situation.setPitch({ m_xplaneData.pitch, CAngleUnit::deg() });
situation.setBank({ m_xplaneData.roll, CAngleUnit::deg() }); situation.setBank({ m_xplaneData.roll, CAngleUnit::deg() });
situation.setGroundSpeed({ m_xplaneData.groundspeed, CSpeedUnit::m_s() }); situation.setGroundSpeed({ m_xplaneData.groundspeed, CSpeedUnit::m_s() });
@@ -158,14 +158,14 @@ namespace BlackSimPlugin
updateOwnIcaoCodes(m_xplaneData.aircraftIcaoCode, CAirlineIcaoCode()); updateOwnIcaoCodes(m_xplaneData.aircraftIcaoCode, CAirlineIcaoCode());
updateOwnSituation(situation); updateOwnSituation(situation);
updateCockpit( updateCockpit(
Aviation::CComSystem::getCom1System({ m_xplaneData.com1Active, CFrequencyUnit::kHz() }, { m_xplaneData.com1Standby, CFrequencyUnit::kHz() }), CComSystem::getCom1System({ m_xplaneData.com1Active, CFrequencyUnit::kHz() }, { m_xplaneData.com1Standby, CFrequencyUnit::kHz() }),
Aviation::CComSystem::getCom2System({ m_xplaneData.com2Active, CFrequencyUnit::kHz() }, { m_xplaneData.com2Standby, CFrequencyUnit::kHz() }), CComSystem::getCom2System({ m_xplaneData.com2Active, CFrequencyUnit::kHz() }, { m_xplaneData.com2Standby, CFrequencyUnit::kHz() }),
Aviation::CTransponder::getStandardTransponder(m_xplaneData.xpdrCode, xpdrMode(m_xplaneData.xpdrMode, m_xplaneData.xpdrIdent)), CTransponder::getStandardTransponder(m_xplaneData.xpdrCode, xpdrMode(m_xplaneData.xpdrMode, m_xplaneData.xpdrIdent)),
identifier() identifier()
); );
const auto currentPosition = CCoordinateGeodetic { situation.latitude(), situation.longitude(), {0} }; const auto currentPosition = CCoordinateGeodetic { situation.latitude(), situation.longitude(), {0} };
if (calculateGreatCircleDistance(m_lastWeatherPosition, currentPosition).value(CLengthUnit::mi()) > 20 ) if (calculateGreatCircleDistance(m_lastWeatherPosition, currentPosition).value(CLengthUnit::mi()) > 20)
{ {
m_lastWeatherPosition = currentPosition; m_lastWeatherPosition = currentPosition;
const auto weatherGrid = CWeatherGrid { { "", currentPosition } }; const auto weatherGrid = CWeatherGrid { { "", currentPosition } };
@@ -199,7 +199,7 @@ namespace BlackSimPlugin
engines.push_back(engine); engines.push_back(engine);
} }
Aviation::CAircraftParts parts { { CAircraftParts parts { {
m_xplaneData.strobeLightsOn, m_xplaneData.landingLightsOn, m_xplaneData.taxiLightsOn, m_xplaneData.strobeLightsOn, m_xplaneData.landingLightsOn, m_xplaneData.taxiLightsOn,
m_xplaneData.beaconLightsOn, m_xplaneData.navLightsOn, false m_xplaneData.beaconLightsOn, m_xplaneData.navLightsOn, false
}, },
@@ -420,9 +420,9 @@ namespace BlackSimPlugin
{ {
Q_ASSERT(isConnected()); Q_ASSERT(isConnected());
if (originator == this->identifier()) { return false; } if (originator == this->identifier()) { return false; }
auto com1 = Aviation::CComSystem::getCom1System({ m_xplaneData.com1Active, CFrequencyUnit::kHz() }, { m_xplaneData.com1Standby, CFrequencyUnit::kHz() }); auto com1 = CComSystem::getCom1System({ m_xplaneData.com1Active, CFrequencyUnit::kHz() }, { m_xplaneData.com1Standby, CFrequencyUnit::kHz() });
auto com2 = Aviation::CComSystem::getCom2System({ m_xplaneData.com2Active, CFrequencyUnit::kHz() }, { m_xplaneData.com2Standby, CFrequencyUnit::kHz() }); auto com2 = CComSystem::getCom2System({ m_xplaneData.com2Active, CFrequencyUnit::kHz() }, { m_xplaneData.com2Standby, CFrequencyUnit::kHz() });
auto xpdr = Aviation::CTransponder::getStandardTransponder(m_xplaneData.xpdrCode, xpdrMode(m_xplaneData.xpdrMode, m_xplaneData.xpdrIdent)); auto xpdr = CTransponder::getStandardTransponder(m_xplaneData.xpdrCode, xpdrMode(m_xplaneData.xpdrMode, m_xplaneData.xpdrIdent));
if (aircraft.hasChangedCockpitData(com1, com2, xpdr)) if (aircraft.hasChangedCockpitData(com1, com2, xpdr))
{ {
m_xplaneData.com1Active = aircraft.getCom1System().getFrequencyActive().valueRounded(CFrequencyUnit::kHz(), 0); m_xplaneData.com1Active = aircraft.getCom1System().getFrequencyActive().valueRounded(CFrequencyUnit::kHz(), 0);
@@ -587,7 +587,7 @@ namespace BlackSimPlugin
int top = cloudLayer.getTop().value(CLengthUnit::m()); int top = cloudLayer.getTop().value(CLengthUnit::m());
int coverage = 0; int coverage = 0;
switch(cloudLayer.getCoverage()) switch (cloudLayer.getCoverage())
{ {
case CCloudLayer::None: coverage = 0; break; case CCloudLayer::None: coverage = 0; break;
case CCloudLayer::Few: coverage = 2; break; case CCloudLayer::Few: coverage = 2; break;
@@ -599,7 +599,7 @@ namespace BlackSimPlugin
// Clear = 0, High Cirrus = 1, Scattered = 2, Broken = 3, Overcast = 4, Stratus = 5 // Clear = 0, High Cirrus = 1, Scattered = 2, Broken = 3, Overcast = 4, Stratus = 5
int type = 0; int type = 0;
switch(cloudLayer.getClouds()) switch (cloudLayer.getClouds())
{ {
case CCloudLayer::NoClouds: type = 0; break; case CCloudLayer::NoClouds: type = 0; break;
case CCloudLayer::Cirrus: type = 1; break; case CCloudLayer::Cirrus: type = 1; break;
@@ -697,7 +697,8 @@ namespace BlackSimPlugin
void CSimulatorXPlaneListener::ps_xbusServerSettingChanged() void CSimulatorXPlaneListener::ps_xbusServerSettingChanged()
{ {
// user changed settings, restart the listener // user changed settings, restart the listener
if (m_watcher) { if (m_watcher)
{
stop(); stop();
start(); start();
} }

12
tests/blackcore/testreaders.cpp
View File

@@ -14,8 +14,8 @@
#include "testreaders.h" #include "testreaders.h"
#include "blackcore/application.h" #include "blackcore/application.h"
#include "blackcore/data/globalsetup.h" #include "blackcore/data/globalsetup.h"
#include "blackcore/icaodatareader.h" #include "blackcore/db/icaodatareader.h"
#include "blackcore/modeldatareader.h" #include "blackcore/db/modeldatareader.h"
#include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/aircrafticaocodelist.h" #include "blackmisc/aviation/aircrafticaocodelist.h"
#include "blackmisc/aviation/airlineicaocode.h" #include "blackmisc/aviation/airlineicaocode.h"
@@ -32,18 +32,20 @@
#include <QString> #include <QString>
#include <QtDebug> #include <QtDebug>
using namespace BlackCore;
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
using namespace BlackMisc::Db;
using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation;
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
using namespace BlackCore;
using namespace BlackCore::Db;
namespace BlackCoreTest namespace BlackCoreTest
{ {
CTestReaders::CTestReaders(QObject *parent) : CTestReaders::CTestReaders(QObject *parent) :
QObject(parent), QObject(parent),
m_icaoReader(new CIcaoDataReader(this)), m_icaoReader(new CIcaoDataReader(this, CDatabaseReaderConfigList::allDirectDbAccess())),
m_modelReader(new CModelDataReader(this)) m_modelReader(new CModelDataReader(this, CDatabaseReaderConfigList::allDirectDbAccess()))
{ } { }
CTestReaders::~CTestReaders() CTestReaders::~CTestReaders()

8
tests/blackcore/testreaders.h
View File

@@ -15,14 +15,16 @@
//! \ingroup testblackcore //! \ingroup testblackcore
#include "blackmisc/network/url.h" #include "blackmisc/network/url.h"
#include <stdbool.h> #include <stdbool.h>
#include <QObject> #include <QObject>
namespace BlackCore namespace BlackCore
{ {
namespace Db
{
class CIcaoDataReader; class CIcaoDataReader;
class CModelDataReader; class CModelDataReader;
}
} }
namespace BlackCoreTest namespace BlackCoreTest
@@ -49,8 +51,8 @@ namespace BlackCoreTest
void readModelData(); void readModelData();
private: private:
BlackCore::CIcaoDataReader *m_icaoReader = nullptr; BlackCore::Db::CIcaoDataReader *m_icaoReader = nullptr;
BlackCore::CModelDataReader *m_modelReader = nullptr; BlackCore::Db::CModelDataReader *m_modelReader = nullptr;
//! Test if server is available //! Test if server is available
static bool pingServer(const BlackMisc::Network::CUrl &url); static bool pingServer(const BlackMisc::Network::CUrl &url);