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

refs #538, Formatting, minor tweaks, comments

Browse Source 
* new slot syntax in ATC station component
* formatting, comments
* tab order
* utility function for severity in status message
* null checks in threadutils
* invalidKey function in datastore
* changed data object keys (cached objets)
* added missing value object compare cases
* renamed timer in context network
* finder function for model list
* renamed getContainer to container (as it is just a reference)
This commit is contained in:
Klaus Basan
2015-12-05 16:39:54 +01:00
parent 66ff1803cf
commit 8f85c54989
24 changed files with 90 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/contextnetworkimpl.cpp
View File

@@ -52,9 +52,9 @@ namespace BlackCore
connect(this->m_network, &INetwork::textMessageSent, this, &CContextNetwork::textMessageSent);
// 2. Update timer for data (network data such as frequency)
this->m_dataUpdateTimer = new QTimer(this);
connect(this->m_dataUpdateTimer, &QTimer::timeout, this, &CContextNetwork::requestDataUpdates);
this->m_dataUpdateTimer->start(30 * 1000);
this->m_networkDataUpdateTimer = new QTimer(this);
connect(this->m_networkDataUpdateTimer, &QTimer::timeout, this, &CContextNetwork::requestDataUpdates);
this->m_networkDataUpdateTimer->start(30 * 1000);
// 3. data reader, start reading when setup is synced with xx delay
this->m_webDataReader = new CWebDataServices(CWebReaderFlags::AllReaders, 1000, this);

2
src/blackcore/contextnetworkimpl.h
View File

@@ -241,7 +241,7 @@ namespace BlackCore
CWebDataServices *m_webDataReader = nullptr; //!< web service readers
QList<QMetaObject::Connection> m_webReaderSignalConnections;
INetwork::ConnectionStatus m_currentStatus = INetwork::Disconnected; //!< used to detect pending connections
QTimer *m_dataUpdateTimer = nullptr; //!< general updates such as ATIS, frequencies, see requestDataUpdates()
QTimer *m_networkDataUpdateTimer = nullptr; //!< general updates such as ATIS, frequencies, see requestDataUpdates()
// Digest signals, only sending after some time
BlackMisc::CDigestSignal m_dsAtcStationsBookedChanged { this, &IContextNetwork::changedAtcStationsBooked, &IContextNetwork::changedAtcStationsBookedDigest, 750, 2 };

1
src/blackcore/contextownaircraftimpl.h
View File

@@ -70,7 +70,6 @@ namespace BlackCore
virtual bool updateOwnParts(const BlackMisc::Aviation::CAircraftParts &parts) override;
public slots:
//! \copydoc IContextOwnAircraft::getOwnAircraft()
//! \ingroup ownaircraftprovider
virtual BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const override;

2
src/blackcore/data/globalsetup.h
View File

@@ -149,7 +149,7 @@ namespace BlackCore
struct GlobalSetup : public BlackCore::CDataTrait<CGlobalSetup>
{
//! Key in data cache
static const char *key() { return "readers/global/setup"; }
static const char *key() { return "readers/setup"; }
//! Default value
static const CGlobalSetup &defaultValue()

2
src/blackcore/data/updateinfo.h
View File

@@ -106,7 +106,7 @@ namespace BlackCore
struct UpdateInfo : public BlackCore::CDataTrait<CUpdateInfo>
{
//! Key in data cache
static const char *key() { return "readers/global/updateinfo"; }
static const char *key() { return "readers/updateinfo"; }
//! Default value
static const CUpdateInfo &defaultValue()