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

Ref T201, formatting

Browse Source
This commit is contained in:
Klaus Basan
2017-11-23 03:26:06 +01:00
parent 961ef9e4ed
commit 909342e172
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackcore/db/infodatareader.cpp
View File

@@ -83,15 +83,13 @@ namespace BlackCore
CEntityFlags::Entity CInfoDataReader::getEntitiesWithCacheCount() const
{
CEntityFlags::Entity entities = CEntityFlags::NoEntity;
return entities;
return CEntityFlags::NoEntity;
}
CEntityFlags::Entity CInfoDataReader::getEntitiesWithCacheTimestampNewerThan(const QDateTime &threshold) const
{
Q_UNUSED(threshold);
CEntityFlags::Entity entities = CEntityFlags::NoEntity;
return entities;
return CEntityFlags::NoEntity;
}
bool CInfoDataReader::hasChangedUrl(CEntityFlags::Entity entity, CUrl &oldUrlInfo, CUrl &newUrlInfo) const
@@ -144,7 +142,7 @@ namespace BlackCore
if (res.hasErrorMessage())
{
CLogMessage::preformatted(res.lastWarningOrAbove());
emit dataRead(this->getEntityForMode(), CEntityFlags::ReadFailed, 0);
emit this->dataRead(this->getEntityForMode(), CEntityFlags::ReadFailed, 0);
return;
}
@@ -154,8 +152,8 @@ namespace BlackCore
// this part needs to be synchronized
{
QWriteLocker wl(&this->m_lockInfoObjects);
this->m_infoObjects = infoObjects;
QWriteLocker wl(&m_lockInfoObjects);
m_infoObjects = infoObjects;
}
this->emitAndLogDataRead(this->getEntityForMode(), n, res);
@@ -173,8 +171,8 @@ namespace BlackCore
CEntityFlags::EntityFlag CInfoDataReader::getEntityForMode() const
{
if (this->m_mode == CDbFlags::DbReading) return CEntityFlags::DbInfoObjectEntity;
if (this->m_mode == CDbFlags::Shared) return CEntityFlags::SharedInfoObjectEntity;
if (m_mode == CDbFlags::DbReading) return CEntityFlags::DbInfoObjectEntity;
if (m_mode == CDbFlags::Shared) return CEntityFlags::SharedInfoObjectEntity;
qFatal("Wrong mode");
return CEntityFlags::NoEntity;
}

2
src/blackmisc/aviation/aircrafticaocode.cpp
View File

@@ -379,7 +379,7 @@ namespace BlackMisc
void CAircraftIcaoCode::setMilitary(bool military)
{
m_military = military;
m_military = military;
}
void CAircraftIcaoCode::setRealWorld(bool realWorld)

2
src/blackmisc/db/dbflags.cpp
View File

@@ -48,7 +48,7 @@ namespace BlackMisc
if (mode.testFlag(DbReading)) list << "Direct DB access";
if (mode.testFlag(Shared)) list << "Shared data";
if (mode.testFlag(Cached)) list << "Cached data";
return list.join(',');
return list.join(", ");
}
CDbFlags::DataRetrievalModeFlag CDbFlags::modeToModeFlag(DataRetrievalMode mode)

6
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -909,9 +909,9 @@ namespace BlackMisc
QJsonArray array = value.toArray();
CAircraftModel::MemoHelper::CUnmemoizer helper;
QJsonValue aircraftIcaos = json.value("aircraftIcaos");
QJsonValue liveries = json.value("liveries");
QJsonValue distributors = json.value("distributors");
const QJsonValue aircraftIcaos = json.value("aircraftIcaos");
const QJsonValue liveries = json.value("liveries");
const QJsonValue distributors = json.value("distributors");
if (aircraftIcaos.isUndefined()) { throw CJsonException("Missing 'aircraftIcaos'"); }
if (liveries.isUndefined()) { throw CJsonException("Missing 'liveries'"); }
if (distributors.isUndefined()) { throw CJsonException("Missing 'distributors'"); }