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

Issue #77 getLogCategories returns a simple QStringList instead of our own class

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-10-28 16:48:31 +00:00
parent 05d28017e7
commit 63e8de8f00
156 changed files with 862 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ namespace BlackMisc
CStatusMessageList CAircraftIcaoCode::validate() const
{
static const CLogCategoryList cats({ CLogCategory("swift.blackmisc.aircrafticao"), CLogCategory::validation()});
static const CLogCategoryList cats({ CLogCategory("swift.blackmisc.aircrafticao"), CLogCategories::validation()});
CStatusMessageList msg;
if (this->isLoadedFromDb())
{

4
src/blackmisc/aviation/airlineicaocodelist.cpp
View File

@@ -20,9 +20,9 @@ namespace BlackMisc
{
namespace Aviation
{
const CLogCategoryList &CAirlineIcaoCodeList::getLogCategories()
const QStringList &CAirlineIcaoCodeList::getLogCategories()
{
static const CLogCategoryList cats(CLogCategory::aviation());
static const QStringList cats(CLogCategories::aviation());
return cats;
}

2
src/blackmisc/aviation/airlineicaocodelist.h
View File

@@ -40,7 +40,7 @@ namespace BlackMisc
using CSequence::CSequence;
//! Categories
static const CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Default constructor.
CAirlineIcaoCodeList();

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

@@ -202,9 +202,9 @@ namespace BlackMisc
return r.isEmpty() ? newRemark : r % u" " % newRemark;
}
const CLogCategoryList &CFlightPlan::getLogCategories()
const QStringList &CFlightPlan::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::flightPlan() };
static const QStringList cats { CLogCategories::flightPlan() };
return cats;
}
@@ -643,14 +643,14 @@ namespace BlackMisc
QFileInfo fi(fileName);
if (fileName.isEmpty())
{
if (msgs) { msgs->push_back(CStatusMessage(getLogCategories()).validationError(u"No file name")); }
if (msgs) { msgs->push_back(CStatusMessage(static_cast<CFlightPlan *>(nullptr)).validationError(u"No file name")); }
return CFlightPlan();
}
else
{
if (!fi.exists())
{
if (msgs) { msgs->push_back(CStatusMessage(getLogCategories()).validationError(u"File '%1' does not exist") << fileName); }
if (msgs) { msgs->push_back(CStatusMessage(static_cast<CFlightPlan *>(nullptr)).validationError(u"File '%1' does not exist") << fileName); }
return CFlightPlan();
}
}
@@ -658,7 +658,7 @@ namespace BlackMisc
const QString data = CFileUtils::readFileToString(fileName);
if (data.isEmpty())
{
if (msgs) { msgs->push_back(CStatusMessage(getLogCategories()).validationError(u"File '%1' does not contain data") << fileName); }
if (msgs) { msgs->push_back(CStatusMessage(static_cast<CFlightPlan *>(nullptr)).validationError(u"File '%1' does not contain data") << fileName); }
return CFlightPlan();
}
@@ -671,7 +671,7 @@ namespace BlackMisc
CStatusMessage m;
if (!Json::looksLikeSwiftJson(data))
{
m = CStatusMessage(getLogCategories(), CStatusMessage::SeverityWarning, u"Reading '%1' yields no data", true) << fileName;
m = CStatusMessage(static_cast<CFlightPlan *>(nullptr), CStatusMessage::SeverityWarning, u"Reading '%1' yields no data", true) << fileName;
if (msgs) { msgs->push_back(m); }
break;
}
@@ -691,7 +691,7 @@ namespace BlackMisc
}
else
{
m = CStatusMessage(getLogCategories(), CStatusMessage::SeverityWarning, u"Wrong format for flight plan in '%1'") << fileName;
m = CStatusMessage(static_cast<CFlightPlan *>(nullptr), CStatusMessage::SeverityWarning, u"Wrong format for flight plan in '%1'") << fileName;
if (msgs) { msgs->push_back(m); }
}
}
@@ -703,7 +703,7 @@ namespace BlackMisc
}
catch (const CJsonException &ex)
{
m = CStatusMessage::fromJsonException(ex, getLogCategories(), "Parse error in " + fileName);
m = CStatusMessage::fromJsonException(ex, static_cast<CFlightPlan *>(nullptr), "Parse error in " + fileName);
if (msgs) { msgs->push_back(m); }
break;
}
@@ -717,7 +717,7 @@ namespace BlackMisc
{
if (msgs)
{
msgs->push_back(CStatusMessage::fromJsonException(ex, getLogCategories(), QStringLiteral("Parsing flight plan from '%1' failed.").arg(fileName)));
msgs->push_back(CStatusMessage::fromJsonException(ex, static_cast<CFlightPlan *>(nullptr), QStringLiteral("Parsing flight plan from '%1' failed.").arg(fileName)));
}
}
return CFlightPlan();

2
src/blackmisc/aviation/flightplan.h
View File

@@ -156,7 +156,7 @@ namespace BlackMisc
{
public:
//! The log. catgeories
static const CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Flight rules (VFR or IFR)
enum FlightRules

22
src/blackmisc/aviation/logutils.cpp
View File

@@ -12,53 +12,53 @@ namespace BlackMisc
{
namespace Aviation
{
void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CCallsign &callsign, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s)
void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CCallsign &callsign, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s)
{
if (!log) { return; }
if (message.isEmpty()) { return; }
log->push_back(CLogUtilities::logMessage(callsign, message, extraCategories, s));
}
void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CAircraftIcaoCode &icao, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s)
void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CAircraftIcaoCode &icao, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s)
{
if (!log) { return; }
if (message.isEmpty()) { return; }
log->push_back(CLogUtilities::logMessage(icao, message, extraCategories, s));
}
void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CAirlineIcaoCode &icao, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s)
void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CAirlineIcaoCode &icao, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s)
{
if (!log) { return; }
if (message.isEmpty()) { return; }
log->push_back(CLogUtilities::logMessage(icao, message, extraCategories, s));
}
void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CLivery &livery, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s)
void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CLivery &livery, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s)
{
if (!log) { return; }
if (message.isEmpty()) { return; }
log->push_back(CLogUtilities::logMessage(livery, message, extraCategories, s));
}
CStatusMessage CLogUtilities::logMessage(const CCallsign &callsign, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s)
CStatusMessage CLogUtilities::logMessage(const CCallsign &callsign, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s)
{
const CStatusMessage m(categories(extraCategories), s, callsign.isEmpty() ? message.trimmed() : callsign.toQString() + ": " + message.trimmed());
return m;
}
CStatusMessage CLogUtilities::logMessage(const CAircraftIcaoCode &icaoCode, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s)
CStatusMessage CLogUtilities::logMessage(const CAircraftIcaoCode &icaoCode, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s)
{
const CStatusMessage m(categories(extraCategories), s, icaoCode.hasDesignator() ? icaoCode.getDesignatorDbKey() + ": " + message.trimmed() : message.trimmed());
return m;
}
CStatusMessage CLogUtilities::logMessage(const CAirlineIcaoCode &icaoCode, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s)
CStatusMessage CLogUtilities::logMessage(const CAirlineIcaoCode &icaoCode, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s)
{
const CStatusMessage m(categories(extraCategories), s, icaoCode.hasValidDesignator() ? icaoCode.getVDesignatorDbKey() + ": " + message.trimmed() : message.trimmed());
return m;
}
CStatusMessage CLogUtilities::logMessage(const CLivery &livery, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s)
CStatusMessage CLogUtilities::logMessage(const CLivery &livery, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s)
{
const CStatusMessage m(categories(extraCategories), s, livery.hasCombinedCode() ? livery.getCombinedCodePlusInfoAndId() + ": " + message.trimmed() : message.trimmed());
return m;
@@ -66,15 +66,15 @@ namespace BlackMisc
const CLogCategoryList &CLogUtilities::defaultCategories()
{
static const CLogCategoryList cats({ CLogCategory::aviation() });
static const CLogCategoryList cats({ CLogCategories::aviation() });
return cats;
}
CLogCategoryList CLogUtilities::categories(const CLogCategoryList &extraCategories)
CLogCategoryList CLogUtilities::categories(const QStringList &extraCategories)
{
if (extraCategories.isEmpty()) { return defaultCategories(); }
CLogCategoryList cats(defaultCategories());
cats.push_back(extraCategories);
cats.push_back(CLogCategoryList::fromQStringList(extraCategories));
return cats;
}
} // ns

18
src/blackmisc/aviation/logutils.h
View File

@@ -33,53 +33,53 @@ namespace BlackMisc
//! Specialized log for matching / reverse lookup
//! \threadsafe
static void addLogDetailsToList(CStatusMessageList *log, const CCallsign &callsign,
const QString &message, const CLogCategoryList &extraCategories = {},
const QString &message, const QStringList &extraCategories = {},
CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo);
//! Specialized log for matching / reverse lookup
//! \threadsafe
static void addLogDetailsToList(CStatusMessageList *log, const CAircraftIcaoCode &icao,
const QString &message, const CLogCategoryList &extraCategories = {},
const QString &message, const QStringList &extraCategories = {},
CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo);
//! Specialized log for matching / reverse lookup
//! \threadsafe
static void addLogDetailsToList(CStatusMessageList *log, const CAirlineIcaoCode &icao,
const QString &message, const CLogCategoryList &extraCategories = {},
const QString &message, const QStringList &extraCategories = {},
CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo);
//! Specialized log for matching / reverse lookup
//! \threadsafe
static void addLogDetailsToList(CStatusMessageList *log, const CLivery &livery,
const QString &message, const CLogCategoryList &extraCategories = {},
const QString &message, const QStringList &extraCategories = {},
CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo);
//! Specialized log message for matching / reverse lookup
//! \threadsafe
static CStatusMessage logMessage(
const CCallsign &callsign,
const QString &message, const CLogCategoryList &extraCategories = {},
const QString &message, const QStringList &extraCategories = {},
CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo);
//! Specialized log message for matching / reverse lookup
//! \threadsafe
static CStatusMessage logMessage(
const CAircraftIcaoCode &icaoCode,
const QString &message, const CLogCategoryList &extraCategories = {},
const QString &message, const QStringList &extraCategories = {},
CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo);
//! Specialized log message for matching / reverse lookup
//! \threadsafe
static CStatusMessage logMessage(
const CAirlineIcaoCode &icaoCode,
const QString &message, const CLogCategoryList &extraCategories = {},
const QString &message, const QStringList &extraCategories = {},
CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo);
//! Specialized log message for matching / reverse lookup
//! \threadsafe
static CStatusMessage logMessage(
const CLivery &livery,
const QString &message, const CLogCategoryList &extraCategories = {},
const QString &message, const QStringList &extraCategories = {},
CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo);
private:
@@ -87,7 +87,7 @@ namespace BlackMisc
static const CLogCategoryList &defaultCategories();
//! Categories
static CLogCategoryList categories(const CLogCategoryList &extraCategories);
static CLogCategoryList categories(const QStringList &extraCategories);
};
} // ns
} // ns

4
src/blackmisc/aviation/simbriefdata.cpp
View File

@@ -16,9 +16,9 @@ namespace BlackMisc
{
namespace Aviation
{
const CLogCategoryList &CSimBriefData::getLogCategories()
const QStringList &CSimBriefData::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::flightPlan() };
static const QStringList cats { CLogCategories::flightPlan() };
return cats;
}

2
src/blackmisc/aviation/simbriefdata.h
View File

@@ -29,7 +29,7 @@ namespace BlackMisc
{
public:
//! The log. catgeories
static const CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Default constructor
CSimBriefData();