mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-20 04:25:42 +08:00
Style, typo
This commit is contained in:
committed by
Mat Sutcliffe
parent
530bd38f00
commit
b57003c4e8
@@ -1025,7 +1025,7 @@ namespace BlackCore
|
|||||||
if (details.isEmpty()) { return m; }
|
if (details.isEmpty()) { return m; }
|
||||||
|
|
||||||
static const QString addDetails(" details: '%1'");
|
static const QString addDetails(" details: '%1'");
|
||||||
return m + addDetails.arg(details);
|
return m % addDetails.arg(details);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ISimulator::finishUpdateRemoteAircraftAndSetStatistics(qint64 startTime, bool limited)
|
void ISimulator::finishUpdateRemoteAircraftAndSetStatistics(qint64 startTime, bool limited)
|
||||||
|
|||||||
@@ -467,7 +467,7 @@ namespace BlackCore
|
|||||||
return emptyEntities;
|
return emptyEntities;
|
||||||
}
|
}
|
||||||
|
|
||||||
CEntityFlags::Entity CWebDataServices::getSychronizedEntitiesWithNewerSharedFileOrEmpty(bool syncData, CEntityFlags::Entity entities)
|
CEntityFlags::Entity CWebDataServices::getSynchronizedEntitiesWithNewerSharedFileOrEmpty(bool syncData, CEntityFlags::Entity entities)
|
||||||
{
|
{
|
||||||
CEntityFlags::Entity loadEntities = this->getEntitiesWithNewerSharedFile(entities);
|
CEntityFlags::Entity loadEntities = this->getEntitiesWithNewerSharedFile(entities);
|
||||||
const CEntityFlags::Entity checkForEmptyEntities = CEntityFlags::entityFlagToEntity(CEntityFlags::AllDbEntitiesNoInfoObjects) & ~loadEntities;
|
const CEntityFlags::Entity checkForEmptyEntities = CEntityFlags::entityFlagToEntity(CEntityFlags::AllDbEntitiesNoInfoObjects) & ~loadEntities;
|
||||||
|
|||||||
@@ -440,7 +440,7 @@ namespace BlackCore
|
|||||||
//! Synchronized entities either empty or with newer shared file
|
//! Synchronized entities either empty or with newer shared file
|
||||||
//! \remark will synchronize entities
|
//! \remark will synchronize entities
|
||||||
//! \threadsafe
|
//! \threadsafe
|
||||||
BlackMisc::Network::CEntityFlags::Entity getSychronizedEntitiesWithNewerSharedFileOrEmpty(bool syncData = true, BlackMisc::Network::CEntityFlags::Entity entities = BlackMisc::Network::CEntityFlags::AllDbEntities);
|
BlackMisc::Network::CEntityFlags::Entity getSynchronizedEntitiesWithNewerSharedFileOrEmpty(bool syncData = true, BlackMisc::Network::CEntityFlags::Entity entities = BlackMisc::Network::CEntityFlags::AllDbEntities);
|
||||||
|
|
||||||
//! Cache count for entity
|
//! Cache count for entity
|
||||||
//! \threadsafe
|
//! \threadsafe
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ namespace BlackGui
|
|||||||
BlackMisc::Simulation::CAircraftModel defaultModel() const;
|
BlackMisc::Simulation::CAircraftModel defaultModel() const;
|
||||||
|
|
||||||
QScopedPointer<Ui::CModelMatcherComponent> ui;
|
QScopedPointer<Ui::CModelMatcherComponent> ui;
|
||||||
CSettingsMatchingDialog *m_settingsDialog = nullptr;
|
CSettingsMatchingDialog *m_settingsDialog = nullptr; //!< matching settings as dialog
|
||||||
BlackCore::CAircraftMatcher m_matcher { this }; //!< used matcher
|
BlackCore::CAircraftMatcher m_matcher { this }; //!< used matcher
|
||||||
};
|
};
|
||||||
} // ns
|
} // ns
|
||||||
|
|||||||
@@ -11,8 +11,8 @@
|
|||||||
#ifndef BLACKMISC_SIMULATION_AIRCRAFTMODEL_H
|
#ifndef BLACKMISC_SIMULATION_AIRCRAFTMODEL_H
|
||||||
#define BLACKMISC_SIMULATION_AIRCRAFTMODEL_H
|
#define BLACKMISC_SIMULATION_AIRCRAFTMODEL_H
|
||||||
|
|
||||||
#include "blackmisc/simulation/distributor.h"
|
|
||||||
#include "blackmisc/simulation/distributorlist.h"
|
#include "blackmisc/simulation/distributorlist.h"
|
||||||
|
#include "blackmisc/simulation/distributor.h"
|
||||||
#include "blackmisc/simulation/simulatorinfo.h"
|
#include "blackmisc/simulation/simulatorinfo.h"
|
||||||
#include "blackmisc/aviation/aircrafticaocode.h"
|
#include "blackmisc/aviation/aircrafticaocode.h"
|
||||||
#include "blackmisc/aviation/airlineicaocode.h"
|
#include "blackmisc/aviation/airlineicaocode.h"
|
||||||
|
|||||||
@@ -458,7 +458,7 @@ void SwiftGuiStd::checkDbDataLoaded()
|
|||||||
if (!sGui || sGui->isShuttingDown()) { return; }
|
if (!sGui || sGui->isShuttingDown()) { return; }
|
||||||
Q_ASSERT_X(sGui->hasWebDataServices(), Q_FUNC_INFO, "Missing web services");
|
Q_ASSERT_X(sGui->hasWebDataServices(), Q_FUNC_INFO, "Missing web services");
|
||||||
Q_ASSERT_X(CThreadUtils::isCurrentThreadApplicationThread(), Q_FUNC_INFO, "Wrong thread, needs to run in main thread");
|
Q_ASSERT_X(CThreadUtils::isCurrentThreadApplicationThread(), Q_FUNC_INFO, "Wrong thread, needs to run in main thread");
|
||||||
CEntityFlags::Entity loadEntities = sGui->getWebDataServices()->getSychronizedEntitiesWithNewerSharedFileOrEmpty(!m_dbDataLoading);
|
const CEntityFlags::Entity loadEntities = sGui->getWebDataServices()->getSynchronizedEntitiesWithNewerSharedFileOrEmpty(!m_dbDataLoading);
|
||||||
if (loadEntities == CEntityFlags::NoEntity)
|
if (loadEntities == CEntityFlags::NoEntity)
|
||||||
{
|
{
|
||||||
m_dbDataLoading = false;
|
m_dbDataLoading = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user