mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-18 11:25:33 +08:00
Formatting, typos
This commit is contained in:
committed by
Mathew Sutcliffe
parent
6d11ea2435
commit
fe01a9d4aa
@@ -826,23 +826,23 @@ namespace BlackCore
|
|||||||
|
|
||||||
// dev. system
|
// dev. system
|
||||||
m_cmdDevelopment = QCommandLineOption({ "dev", "development" },
|
m_cmdDevelopment = QCommandLineOption({ "dev", "development" },
|
||||||
QCoreApplication::translate("application", "Dev. system features?"));
|
QCoreApplication::translate("application", "Dev. system features?"));
|
||||||
this->addParserOption(m_cmdDevelopment);
|
this->addParserOption(m_cmdDevelopment);
|
||||||
|
|
||||||
// can read a local bootstrap file
|
// can read a local bootstrap file
|
||||||
m_cmdSharedDir = QCommandLineOption({ "shared", "shareddir" },
|
m_cmdSharedDir = QCommandLineOption({ "shared", "shareddir" },
|
||||||
QCoreApplication::translate("application", "Local shared directory."),
|
QCoreApplication::translate("application", "Local shared directory."),
|
||||||
"shared");
|
"shared");
|
||||||
this->addParserOption(m_cmdSharedDir);
|
this->addParserOption(m_cmdSharedDir);
|
||||||
|
|
||||||
// reset caches upfront
|
// reset caches upfront
|
||||||
m_cmdClearCache = QCommandLineOption({ "ccache", "clearcache" },
|
m_cmdClearCache = QCommandLineOption({ "ccache", "clearcache" },
|
||||||
QCoreApplication::translate("application", "Clear (reset) the caches."));
|
QCoreApplication::translate("application", "Clear (reset) the caches."));
|
||||||
this->addParserOption(m_cmdClearCache);
|
this->addParserOption(m_cmdClearCache);
|
||||||
|
|
||||||
// test crashpad upload
|
// test crashpad upload
|
||||||
m_cmdTestCrashpad = QCommandLineOption({ "testcp", "testcrashpad" },
|
m_cmdTestCrashpad = QCommandLineOption({ "testcp", "testcrashpad" },
|
||||||
QCoreApplication::translate("application", "Simulate crashpad situation."));
|
QCoreApplication::translate("application", "Simulate crashpad situation."));
|
||||||
this->addParserOption(m_cmdTestCrashpad);
|
this->addParserOption(m_cmdTestCrashpad);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1007,8 +1007,8 @@ namespace BlackCore
|
|||||||
void CApplication::addDBusAddressOption()
|
void CApplication::addDBusAddressOption()
|
||||||
{
|
{
|
||||||
m_cmdDBusAddress = QCommandLineOption({ "dbus", "dbusaddress" },
|
m_cmdDBusAddress = QCommandLineOption({ "dbus", "dbusaddress" },
|
||||||
QCoreApplication::translate("application", "DBus address (session, system, P2P IP e.g. 192.168.23.5)"),
|
QCoreApplication::translate("application", "DBus address (session, system, P2P IP e.g. 192.168.23.5)"),
|
||||||
"dbusaddress");
|
"dbusaddress");
|
||||||
this->addParserOption(m_cmdDBusAddress);
|
this->addParserOption(m_cmdDBusAddress);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -252,9 +252,9 @@ namespace BlackCore
|
|||||||
//! \return all cache files
|
//! \return all cache files
|
||||||
static QStringList clearCaches();
|
static QStringList clearCaches();
|
||||||
|
|
||||||
// ----------------------- parsing ----------------------------------------
|
// ----------------------- cmd line args / parsing ----------------------------------------
|
||||||
|
|
||||||
//! \name parsing of command line options
|
//! \name cmd line args and parsing of command line options
|
||||||
//! @{
|
//! @{
|
||||||
|
|
||||||
//! \copydoc QCommandLineParser::addOption
|
//! \copydoc QCommandLineParser::addOption
|
||||||
@@ -318,10 +318,12 @@ namespace BlackCore
|
|||||||
|
|
||||||
//! Init the contexts part and start core facade
|
//! Init the contexts part and start core facade
|
||||||
//! \sa coreFacadeStarted
|
//! \sa coreFacadeStarted
|
||||||
|
//! \remark requires setup loaded
|
||||||
BlackMisc::CStatusMessageList useContexts(const CCoreFacadeConfig &coreConfig);
|
BlackMisc::CStatusMessageList useContexts(const CCoreFacadeConfig &coreConfig);
|
||||||
|
|
||||||
//! Init web data services and start them
|
//! Init web data services and start them
|
||||||
//! \sa webDataServicesStarted
|
//! \sa webDataServicesStarted
|
||||||
|
//! \remark requires setup loaded
|
||||||
BlackMisc::CStatusMessageList useWebDataServices(const CWebReaderFlags::WebReader webReader, const BlackCore::Db::CDatabaseReaderConfigList &dbReaderConfig);
|
BlackMisc::CStatusMessageList useWebDataServices(const CWebReaderFlags::WebReader webReader, const BlackCore::Db::CDatabaseReaderConfigList &dbReaderConfig);
|
||||||
|
|
||||||
//! Get the facade
|
//! Get the facade
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ namespace BlackCore
|
|||||||
BlackMisc::Simulation::Data::CModelSetCaches m_modelSetCaches { false, this }; //!< caches
|
BlackMisc::Simulation::Data::CModelSetCaches m_modelSetCaches { false, this }; //!< caches
|
||||||
QMap<QString, QDateTime> m_dbModelsLatestChange;
|
QMap<QString, QDateTime> m_dbModelsLatestChange;
|
||||||
|
|
||||||
//! Do the udpate checks
|
//! Do the update checks
|
||||||
void doWork();
|
void doWork();
|
||||||
|
|
||||||
//! Read of new DB data
|
//! Read of new DB data
|
||||||
|
|||||||
@@ -230,7 +230,7 @@ namespace BlackCore
|
|||||||
QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
|
QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
|
||||||
if (!this->doWorkCheck()) { return; }
|
if (!this->doWorkCheck()) { return; }
|
||||||
|
|
||||||
CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data());
|
const CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data());
|
||||||
if (res.hasErrorMessage())
|
if (res.hasErrorMessage())
|
||||||
{
|
{
|
||||||
CLogMessage::preformatted(res.lastWarningOrAbove());
|
CLogMessage::preformatted(res.lastWarningOrAbove());
|
||||||
@@ -280,7 +280,7 @@ namespace BlackCore
|
|||||||
QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
|
QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
|
||||||
if (!this->doWorkCheck()) { return; }
|
if (!this->doWorkCheck()) { return; }
|
||||||
|
|
||||||
CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data());
|
const CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data());
|
||||||
if (res.hasErrorMessage())
|
if (res.hasErrorMessage())
|
||||||
{
|
{
|
||||||
CLogMessage::preformatted(res.lastWarningOrAbove());
|
CLogMessage::preformatted(res.lastWarningOrAbove());
|
||||||
@@ -328,7 +328,7 @@ namespace BlackCore
|
|||||||
void CIcaoDataReader::ps_parseCountryData(QNetworkReply *nwReplyPtr)
|
void CIcaoDataReader::ps_parseCountryData(QNetworkReply *nwReplyPtr)
|
||||||
{
|
{
|
||||||
QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
|
QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
|
||||||
CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data());
|
const CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data());
|
||||||
if (res.hasErrorMessage())
|
if (res.hasErrorMessage())
|
||||||
{
|
{
|
||||||
CLogMessage::preformatted(res.lastWarningOrAbove());
|
CLogMessage::preformatted(res.lastWarningOrAbove());
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ namespace BlackGui
|
|||||||
Q_ASSERT_X(sGui, Q_FUNC_INFO, "missing sGui");
|
Q_ASSERT_X(sGui, Q_FUNC_INFO, "missing sGui");
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
//! \fixme KB 201709 It is hard to judgte if it is a good idea to trigger cache admit in a UI component
|
//! \fixme KB 201709 It is hard to judge if it is a good idea to trigger cache admit in a UI component
|
||||||
// althought admit happens in background, this component might trigger cache reads not needed (though it is not very likely)
|
// althought admit happens in background, this component might trigger cache reads not needed (though it is not very likely)
|
||||||
this->admitCaches();
|
this->admitCaches();
|
||||||
|
|
||||||
@@ -272,6 +272,7 @@ namespace BlackGui
|
|||||||
|
|
||||||
void CDbLoadOverviewComponent::admitCaches()
|
void CDbLoadOverviewComponent::admitCaches()
|
||||||
{
|
{
|
||||||
|
// remark admit only triggers, it does not wait like synchronize
|
||||||
if (!sGui->hasWebDataServices()) { return; }
|
if (!sGui->hasWebDataServices()) { return; }
|
||||||
sGui->getWebDataServices()->admitDbCaches(CEntityFlags::AllDbEntities);
|
sGui->getWebDataServices()->admitDbCaches(CEntityFlags::AllDbEntities);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ namespace BlackMisc
|
|||||||
if (flag.testFlag(NoEntity)) list << "no data";
|
if (flag.testFlag(NoEntity)) list << "no data";
|
||||||
if (flag.testFlag(VatsimDataFile)) list << "VATSIM data file";
|
if (flag.testFlag(VatsimDataFile)) list << "VATSIM data file";
|
||||||
if (flag.testFlag(VatsimStatusFile)) list << "VATSIM status file";
|
if (flag.testFlag(VatsimStatusFile)) list << "VATSIM status file";
|
||||||
return list.join(',');
|
return list.join(", ");
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CEntityFlags::isSingleEntity(BlackMisc::Network::CEntityFlags::Entity flag)
|
bool CEntityFlags::isSingleEntity(BlackMisc::Network::CEntityFlags::Entity flag)
|
||||||
|
|||||||
Reference in New Issue
Block a user