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

Ref T219, removed unused signal webServiceDataRead

Browse Source 
Remark: Can be directly used from web data services
This commit is contained in:
Klaus Basan
2018-01-07 03:11:59 +01:00
parent fea8ed6802
commit 9f79923848
4 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/context/contextnetwork.cpp
View File

@@ -25,10 +25,8 @@ namespace BlackCore
switch (mode) switch (mode)
{ {
case CCoreFacadeConfig::Local: case CCoreFacadeConfig::Local:
case CCoreFacadeConfig::LocalInDBusServer: case CCoreFacadeConfig::LocalInDBusServer: return (new CContextNetwork(mode, runtime))->registerWithDBus(server);
return (new CContextNetwork(mode, runtime))->registerWithDBus(server); case CCoreFacadeConfig::Remote: return new CContextNetworkProxy(CDBusServer::coreServiceName(connection), connection, mode, runtime);
case CCoreFacadeConfig::Remote:
return new CContextNetworkProxy(CDBusServer::coreServiceName(connection), connection, mode, runtime);
case CCoreFacadeConfig::NotUsed: case CCoreFacadeConfig::NotUsed:
default: default:
return new CContextNetworkEmpty(runtime); return new CContextNetworkEmpty(runtime);

6
src/blackcore/context/contextnetwork.h
View File

@@ -156,12 +156,6 @@ namespace BlackCore
//! Text message sent (by me) //! Text message sent (by me)
void textMessageSent(const BlackMisc::Network::CTextMessage &sentMessage); void textMessageSent(const BlackMisc::Network::CTextMessage &sentMessage);
// --------------------------- data readers -------------------------------
//! Web serice data read
// void webServiceDataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number);
void webServiceDataRead(int entity, int state, int number);
public slots: public slots:
//! Reload bookings from booking service //! Reload bookings from booking service
virtual void requestAtcBookingsUpdate() const = 0; virtual void requestAtcBookingsUpdate() const = 0;

8
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -77,11 +77,7 @@ namespace BlackCore
connect(m_networkDataUpdateTimer, &QTimer::timeout, this, &CContextNetwork::requestDataUpdates); connect(m_networkDataUpdateTimer, &QTimer::timeout, this, &CContextNetwork::requestDataUpdates);
m_networkDataUpdateTimer->start(30 * 1000); m_networkDataUpdateTimer->start(30 * 1000);
// 3. data reader, start reading when setup is synced with xx delay // 3. Airspace contents
Q_ASSERT_X(sApp->hasWebDataServices(), Q_FUNC_INFO, "Missing web data services");
connect(sApp->getWebDataServices(), &CWebDataServices::dataRead, this, &CContextNetwork::webServiceDataRead);
// 4. Airspace contents
Q_ASSERT_X(this->getRuntime()->getCContextOwnAircraft(), Q_FUNC_INFO, "this and own aircraft context must be local"); Q_ASSERT_X(this->getRuntime()->getCContextOwnAircraft(), Q_FUNC_INFO, "this and own aircraft context must be local");
m_airspace = new CAirspaceMonitor(this->getRuntime()->getCContextOwnAircraft(), m_network, this); m_airspace = new CAirspaceMonitor(this->getRuntime()->getCContextOwnAircraft(), m_network, this);
connect(m_airspace, &CAirspaceMonitor::changedAtcStationsOnline, this, &CContextNetwork::changedAtcStationsOnline); connect(m_airspace, &CAirspaceMonitor::changedAtcStationsOnline, this, &CContextNetwork::changedAtcStationsOnline);
@@ -157,7 +153,7 @@ namespace BlackCore
{ {
if (this->isDebugEnabled()) {CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } if (this->isDebugEnabled()) {CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
QString msg; QString msg;
if (!server.getUser().isValid()) if (!server.getUser().hasCredentials())
{ {
return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, "Invalid user credentials"); return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, "Invalid user credentials");
} }

4
src/blackcore/context/contextnetworkproxy.cpp
View File

@@ -81,10 +81,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(int, int, int)));
Q_ASSERT(s);
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
"changedRemoteAircraftEnabled", this, SIGNAL(changedRemoteAircraftEnabled(BlackMisc::Simulation::CSimulatedAircraft))); "changedRemoteAircraftEnabled", this, SIGNAL(changedRemoteAircraftEnabled(BlackMisc::Simulation::CSimulatedAircraft)));
Q_ASSERT(s); Q_ASSERT(s);