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

Formatting

Browse Source
This commit is contained in:
Klaus Basan
2017-07-09 01:04:14 +02:00
committed by Mathew Sutcliffe
parent 847fcfbb71
commit 291af98770
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/db/icaodatareader.h
View File

@@ -138,10 +138,10 @@ namespace BlackCore
//! Airlines have been read
void ps_parseAirlineIcaoData(QNetworkReply *nwReply);
//! Airlines have been read
//! Countries have been read
void ps_parseCountryData(QNetworkReply *nwReply);
//! Read / re-read data file
//! Read / re-read data
void ps_read(BlackMisc::Network::CEntityFlags::Entity entities,
BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan);

18
src/blackcore/db/modeldatareader.cpp
View File

@@ -262,10 +262,10 @@ namespace BlackCore
if (res.isRestricted())
{
// create full list if it was just incremental
const CLiveryList incLiveries(CLiveryList::fromDatabaseJson(res));
if (incLiveries.isEmpty()) { return; } // currenty ignored
const CLiveryList incrementalLiveries(CLiveryList::fromDatabaseJson(res));
if (incrementalLiveries.isEmpty()) { return; } // currenty ignored
liveries = this->getLiveries();
liveries.replaceOrAddObjectsByKey(incLiveries);
liveries.replaceOrAddObjectsByKey(incrementalLiveries);
}
else
{
@@ -304,10 +304,10 @@ namespace BlackCore
if (res.isRestricted())
{
// create full list if it was just incremental
const CDistributorList incDistributors(CDistributorList::fromDatabaseJson(res));
if (incDistributors.isEmpty()) { return; } // currently ignored
const CDistributorList incrementalDistributors(CDistributorList::fromDatabaseJson(res));
if (incrementalDistributors.isEmpty()) { return; } // currently ignored
distributors = this->getDistributors();
distributors.replaceOrAddObjectsByKey(incDistributors);
distributors.replaceOrAddObjectsByKey(incrementalDistributors);
}
else
{
@@ -346,10 +346,10 @@ namespace BlackCore
if (res.isRestricted())
{
// create full list if it was just incremental
const CAircraftModelList incModels(CAircraftModelList::fromDatabaseJson(res));
if (incModels.isEmpty()) { return; } // currently ignored
const CAircraftModelList incrementalModels(CAircraftModelList::fromDatabaseJson(res));
if (incrementalModels.isEmpty()) { return; } // currently ignored
models = this->getModels();
models.replaceOrAddObjectsByKey(incModels);
models.replaceOrAddObjectsByKey(incrementalModels);
}
else
{

2
src/blackmisc/db/datastoreobjectlist.h
View File

@@ -60,9 +60,11 @@ namespace BlackMisc
QDateTime oldestDbTimestamp() const;
//! From DB JSON with default prefixes
//! \remark Specialized classes might have their own fromDatabaseJson implementation
static CONTAINER fromDatabaseJson(const QJsonArray &array);
//! From DB JSON
//! \remark Specialized classes might have their own fromDatabaseJson implementation
static CONTAINER fromDatabaseJson(const QJsonArray &array, const QString &prefix);
protected: