Issue #77 Move all methods of CLogUtilities to other classes

This commit is contained in:
Mat Sutcliffe
2020-11-10 23:27:57 +00:00
parent b2ae19111f
commit 2c66e2215e
19 changed files with 270 additions and 347 deletions

View File

@@ -9,6 +9,7 @@
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/mixin/mixincompare.h"
#include "blackmisc/stringutils.h"
#include "blackmisc/statusmessagelist.h"
#include <QRegularExpression>
#include <QRegularExpressionMatch>
@@ -101,6 +102,20 @@ namespace BlackMisc
CCallsign::atcSuffixToIcon(callsign.getSuffix());
}
CStatusMessage CCallsign::logMessage(const CCallsign &callsign, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s)
{
static const CLogCategoryList cats({ CLogCategories::aviation() });
const CStatusMessage m(cats.with(CLogCategoryList::fromQStringList(extraCategories)), s, callsign.isEmpty() ? message.trimmed() : callsign.toQString() + ": " + message.trimmed());
return m;
}
void CCallsign::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(logMessage(callsign, message, extraCategories, s));
}
const CIcon &CCallsign::atcSuffixToIcon(const QString &suffix)
{
if (suffix.length() < 3) { return CIcon::iconByIndex(CIcons::NetworkRoleUnknown); }