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

Style, typo

Browse Source
This commit is contained in:
Klaus Basan
2019-03-01 19:15:40 +01:00
committed by Mat Sutcliffe
parent 530bd38f00
commit b57003c4e8
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackcore/aircraftmatcher.h
View File

@@ -303,13 +303,13 @@ namespace BlackCore
//! Use pseudo family
static bool constexpr UsePseudoFamily = true;
BlackMisc::Simulation::CAircraftMatcherSetup m_setup; //!< setup
BlackMisc::Simulation::CAircraftModel m_defaultModel; //!< model to be used as default model
BlackMisc::Simulation::CAircraftModelList m_modelSet; //!< models used for model matching
BlackMisc::Simulation::CAircraftModelList m_disabledModels; //!< disabled models for matching
BlackMisc::Simulation::CSimulatorInfo m_simulator; //!< simulator (optional)
BlackMisc::Simulation::CMatchingStatistics m_statistics; //!< matching statistics
QString m_modelSetInfo; //!< info string
BlackMisc::Simulation::CAircraftMatcherSetup m_setup; //!< setup
BlackMisc::Simulation::CAircraftModel m_defaultModel; //!< model to be used as default model
BlackMisc::Simulation::CAircraftModelList m_modelSet; //!< models used for model matching
BlackMisc::Simulation::CAircraftModelList m_disabledModels; //!< disabled models for matching
BlackMisc::Simulation::CSimulatorInfo m_simulator; //!< simulator (optional)
BlackMisc::Simulation::CMatchingStatistics m_statistics; //!< matching statistics
QString m_modelSetInfo; //!< info string
};
} // namespace

2
src/blackcore/simulator.cpp
View File

@@ -1025,7 +1025,7 @@ namespace BlackCore
if (details.isEmpty()) { return m; }
static const QString addDetails(" details: '%1'");
return m + addDetails.arg(details);
return m % addDetails.arg(details);
}
void ISimulator::finishUpdateRemoteAircraftAndSetStatistics(qint64 startTime, bool limited)

2
src/blackcore/webdataservices.cpp
View File

@@ -467,7 +467,7 @@ namespace BlackCore
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);
const CEntityFlags::Entity checkForEmptyEntities = CEntityFlags::entityFlagToEntity(CEntityFlags::AllDbEntitiesNoInfoObjects) & ~loadEntities;

2
src/blackcore/webdataservices.h
View File

@@ -440,7 +440,7 @@ namespace BlackCore
//! Synchronized entities either empty or with newer shared file
//! \remark will synchronize entities
//! \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
//! \threadsafe

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

@@ -81,8 +81,8 @@ namespace BlackGui
BlackMisc::Simulation::CAircraftModel defaultModel() const;
QScopedPointer<Ui::CModelMatcherComponent> ui;
CSettingsMatchingDialog *m_settingsDialog = nullptr;
BlackCore::CAircraftMatcher m_matcher { this }; //!< used matcher
CSettingsMatchingDialog *m_settingsDialog = nullptr; //!< matching settings as dialog
BlackCore::CAircraftMatcher m_matcher { this }; //!< used matcher
};
} // ns
} // ns

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

@@ -11,8 +11,8 @@
#ifndef BLACKMISC_SIMULATION_AIRCRAFTMODEL_H
#define BLACKMISC_SIMULATION_AIRCRAFTMODEL_H
#include "blackmisc/simulation/distributor.h"
#include "blackmisc/simulation/distributorlist.h"
#include "blackmisc/simulation/distributor.h"
#include "blackmisc/simulation/simulatorinfo.h"
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/airlineicaocode.h"

2
src/swiftguistandard/swiftguistd.cpp
View File

@@ -458,7 +458,7 @@ void SwiftGuiStd::checkDbDataLoaded()
if (!sGui || sGui->isShuttingDown()) { return; }
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");
CEntityFlags::Entity loadEntities = sGui->getWebDataServices()->getSychronizedEntitiesWithNewerSharedFileOrEmpty(!m_dbDataLoading);
const CEntityFlags::Entity loadEntities = sGui->getWebDataServices()->getSynchronizedEntitiesWithNewerSharedFileOrEmpty(!m_dbDataLoading);
if (loadEntities == CEntityFlags::NoEntity)
{
m_dbDataLoading = false;