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

Ref T732, renamed to CFsdClient adjustments

Browse Source
This commit is contained in:
Klaus Basan
2019-09-19 11:03:47 +02:00
committed by Mat Sutcliffe
parent a24d948acd
commit 5e3b758e44
8 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,12 +68,12 @@ namespace BlackCore
CContextNetwork::registerHelp();
// 1. Init by "network driver"
m_fsdClient = new FSDClient(this, this->getRuntime()->getCContextOwnAircraft(), this, this);
connect(m_fsdClient, &FSDClient::connectionStatusChanged, this, &CContextNetwork::onFsdConnectionStatusChanged);
connect(m_fsdClient, &FSDClient::killRequestReceived, this, &CContextNetwork::kicked);
connect(m_fsdClient, &FSDClient::textMessagesReceived, this, &CContextNetwork::textMessagesReceived);
m_fsdClient = new CFSDClient(this, this->getRuntime()->getCContextOwnAircraft(), this, this);
connect(m_fsdClient, &CFSDClient::connectionStatusChanged, this, &CContextNetwork::onFsdConnectionStatusChanged);
connect(m_fsdClient, &CFSDClient::killRequestReceived, this, &CContextNetwork::kicked);
connect(m_fsdClient, &CFSDClient::textMessagesReceived, this, &CContextNetwork::textMessagesReceived);
// connect(m_fsdClient, &FSDClient::textMessagesReceived, this, &CContextNetwork::checkForSupervisiorTextMessage);
connect(m_fsdClient, &FSDClient::textMessageSent, this, &CContextNetwork::textMessageSent);
connect(m_fsdClient, &CFSDClient::textMessageSent, this, &CContextNetwork::textMessageSent);
// 2. Update timer for data (network data such as frequency)
// we use 2 timers so we can query at different times (not too many queirs at once)
@@ -1201,7 +1201,7 @@ namespace BlackCore
// bind does not allow to define connection type, so we use receiver as workaround
const QMetaObject::Connection uc; // unconnected
const QMetaObject::Connection c = rawFsdMessageReceivedSlot ? connect(m_fsdClient, &FSDClient::rawFsdMessage, receiver, rawFsdMessageReceivedSlot) : uc;
const QMetaObject::Connection c = rawFsdMessageReceivedSlot ? connect(m_fsdClient, &CFSDClient::rawFsdMessage, receiver, rawFsdMessageReceivedSlot) : uc;
Q_ASSERT_X(c || !rawFsdMessageReceivedSlot, Q_FUNC_INFO, "connect failed");
return c;
}

4
src/blackcore/context/contextnetworkimpl.h
View File

@@ -150,7 +150,7 @@ namespace BlackCore
//! \remarks public so values can be logged/monitored
//! @{
//! Network library
Fsd::FSDClient *fsdClient() const { return m_fsdClient; }
Fsd::CFSDClient *fsdClient() const { return m_fsdClient; }
//! Airspace
CAirspaceMonitor *airspace() const { return m_airspace; }
@@ -293,7 +293,7 @@ namespace BlackCore
private:
CAirspaceMonitor *m_airspace = nullptr;
Fsd::FSDClient *m_fsdClient = nullptr;
Fsd::CFSDClient *m_fsdClient = nullptr;
BlackMisc::Network::CLoginMode m_currentMode = BlackMisc::Network::CLoginMode::Pilot; //!< current modeM
QTimer *m_requestAircraftDataTimer = nullptr; //!< general updates such as frequencies, see requestAircraftDataUpdates()
QTimer *m_requestAtisTimer = nullptr; //!< general updates such as ATIS