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

Ref T525 Avoid directly calling getLogCategories.

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-01-29 16:07:35 +00:00
parent a627752d44
commit 077fd8c35a
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackmisc/aviation/flightplan.cpp
View File

@@ -416,7 +416,7 @@ namespace BlackMisc
}
catch (const CJsonException &ex)
{
const CStatusMessage m = ex.toStatusMessage(getLogCategories(), QString("Parsing flight plan from failed."));
const CStatusMessage m = ex.toStatusMessage(&fp, QString("Parsing flight plan from failed."));
Q_UNUSED(m);
}
return fp;
@@ -457,7 +457,7 @@ namespace BlackMisc
CStatusMessage m;
if (!Json::looksLikeSwiftJson(data))
{
m = CStatusMessage(CFlightPlan::getLogCategories(), CStatusMessage::SeverityWarning, u"Reading '%1' yields no data", true) << fileName;
m = CStatusMessage(getLogCategories(), CStatusMessage::SeverityWarning, u"Reading '%1' yields no data", true) << fileName;
if (msgs) { msgs->push_back(m); }
break;
}
@@ -477,7 +477,7 @@ namespace BlackMisc
}
else
{
m = CStatusMessage(CFlightPlan::getLogCategories(), CStatusMessage::SeverityWarning, u"Wrong format for flight plan in '%1'") << fileName;
m = CStatusMessage(getLogCategories(), CStatusMessage::SeverityWarning, u"Wrong format for flight plan in '%1'") << fileName;
if (msgs) { msgs->push_back(m); }
}
}
@@ -489,7 +489,7 @@ namespace BlackMisc
}
catch (const CJsonException &ex)
{
m = ex.toStatusMessage(CFlightPlan::getLogCategories(), "Parse error in " + fileName);
m = ex.toStatusMessage(getLogCategories(), "Parse error in " + fileName);
if (msgs) { msgs->push_back(m); }
break;
}

4
src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
View File

@@ -231,7 +231,7 @@ namespace BlackMisc
QFile file(fnFixed); // includes path
if (!file.open(QFile::ReadOnly | QFile::Text))
{
const CStatusMessage m = CStatusMessage(getLogCategories()).warning(u"Unable to read file '%1'") << fnFixed;
const CStatusMessage m = CStatusMessage(static_cast<CAircraftCfgParser *>(nullptr)).warning(u"Unable to read file '%1'") << fnFixed;
msgs.push_back(m);
return CAircraftCfgEntriesList();
}
@@ -371,7 +371,7 @@ namespace BlackMisc
{
if (e.getTitle().isEmpty())
{
const CStatusMessage m = CStatusMessage(getLogCategories()).info(u"FS model in %1, index %2 has no title") << fileName << e.getIndex();
const CStatusMessage m = CStatusMessage(static_cast<CAircraftCfgParser *>(nullptr)).info(u"FS model in %1, index %2 has no title") << fileName << e.getIndex();
msgs.push_back(m);
continue;
}

2
src/blackmisc/simulation/remoteaircraftprovider.cpp
View File

@@ -443,7 +443,7 @@ namespace BlackMisc
{
const QJsonDocument doc(jsonObject);
const QString partsAsString = doc.toJson(QJsonDocument::Compact);
const CStatusMessage message(getLogCategories(), CStatusMessage::SeverityInfo, callsign.isEmpty() ? callsign.toQString() + ": " + partsAsString.trimmed() : partsAsString.trimmed());
const CStatusMessage message(this, CStatusMessage::SeverityInfo, callsign.isEmpty() ? callsign.toQString() + ": " + partsAsString.trimmed() : partsAsString.trimmed());
QReadLocker l(&m_lockPartsHistory);
if (m_aircraftPartsMessages.contains(callsign))