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

improved string to severity enum (for core log levels)

Browse Source
This commit is contained in:
Klaus Basan
2014-11-29 20:14:10 +00:00
committed by Roland Winklmeier
parent d3a4795845
commit 350b5a0bfa
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/blackmisc/statusmessage.cpp
View File

@@ -41,7 +41,7 @@ namespace BlackMisc
auto categories = CLogMessageHelper::stripFlags(context.category);
m_categories = CLogCategoryList::fromQString(categories);
switch(type)
switch (type)
{
default:
case QtDebugMsg:
@@ -145,27 +145,24 @@ namespace BlackMisc
*/
CStatusMessage::StatusSeverity CStatusMessage::stringToSeverity(const QString &severity)
{
if (severity.compare(severityToString(SeverityDebug), Qt::CaseInsensitive) == 0)
{
return SeverityDebug;
}
else if (severity.compare(severityToString(SeverityInfo), Qt::CaseInsensitive) == 0)
{
return SeverityInfo;
}
else if (severity.compare(severityToString(SeverityWarning), Qt::CaseInsensitive) == 0)
{
return SeverityWarning;
}
else if (severity.compare(severityToString(SeverityError), Qt::CaseInsensitive) == 0)
{
return SeverityError;
}
else
{
qFatal("Unknown severity string");
return SeverityError;
}
// pre-check
QString severityString(severity.trimmed().toLower());
if (severityString.isEmpty()) { return SeverityInfo; }
// hard check
if (severityString.compare(severityToString(SeverityDebug), Qt::CaseInsensitive) == 0) { return SeverityDebug; }
if (severityString.compare(severityToString(SeverityInfo), Qt::CaseInsensitive) == 0) { return SeverityInfo; }
if (severityString.compare(severityToString(SeverityWarning), Qt::CaseInsensitive) == 0) { return SeverityWarning; }
if (severityString.compare(severityToString(SeverityError), Qt::CaseInsensitive) == 0) { return SeverityError; }
// not found yet, lenient checks
QChar s = severityString.at(0);
if (s == 'd') { return SeverityDebug; }
if (s == 'i') { return SeverityInfo; }
if (s == 'w') { return SeverityWarning; }
if (s == 'e') { return SeverityError; }
return SeverityInfo;
}
/*

4
src/blackmisc/statusmessage.h
View File

@@ -102,8 +102,8 @@ namespace BlackMisc
//! Severity as string
static const QString &severityToString(StatusSeverity severity);
//! Severity as string
static StatusSeverity stringToSeverity(const QString &severityString);
//! Severity as string, if not possible to convert \sa CSeverityInfo
static StatusSeverity stringToSeverity(const QString &severity);
//! Severities as strings
static const QStringList &allSeverityStrings();