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

refs #800 QtInfoMsg severity was added in Qt 5.5, we can remove the category suffix workaround.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-11-10 00:50:45 +00:00
committed by Klaus Basan
parent af066be740
commit 95a82f37a0
4 changed files with 16 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/blackmisc/statusmessage.cpp
View File

@@ -127,15 +127,16 @@ namespace BlackMisc
CStatusMessage::CStatusMessage(QtMsgType type, const QMessageLogContext &context, const QString &message)
: CStatusMessage(message.trimmed())
{
bool debug = CLogMessageHelper::hasDebugFlag(context.category);
auto categories = CLogMessageHelper::stripFlags(context.category);
m_categories = CLogCategoryList::fromQString(categories);
m_categories = CLogCategoryList::fromQString(context.category);
switch (type)
{
default:
case QtDebugMsg:
this->m_severity = debug ? SeverityDebug : SeverityInfo;
this->m_severity = SeverityDebug;
break;
case QtInfoMsg:
this->m_severity = SeverityInfo;
break;
case QtWarningMsg:
this->m_severity = SeverityWarning;
@@ -149,22 +150,18 @@ namespace BlackMisc
void CStatusMessage::toQtLogTriple(QtMsgType *o_type, QString *o_category, QString *o_message) const
{
auto category = m_categories.toQString();
if (this->m_severity == SeverityDebug && ! category.isEmpty())
{
category = CLogMessageHelper::addDebugFlag(category);
}
*o_category = category;
*o_category = this->m_categories.toQString();
*o_message = this->getMessage();
switch (this->m_severity)
{
default:
case SeverityDebug:
case SeverityInfo:
*o_type = QtDebugMsg;
break;
case SeverityInfo:
*o_type = QtInfoMsg;
break;
case SeverityWarning:
*o_type = QtWarningMsg;
break;