refs #288, convenience methods in log message

This commit is contained in:
Klaus Basan
2014-11-10 20:52:21 +01:00
committed by Roland Winklmeier
parent d6cc6e3dd3
commit 159dbe9f5a
2 changed files with 24 additions and 2 deletions

View File

@@ -40,6 +40,24 @@ namespace BlackMisc
return *this; return *this;
} }
CLogMessage &CLogMessage::statusMessage(const CStatusMessage &statusMessage)
{
switch (statusMessage.getSeverity())
{
case CStatusMessage::SeverityDebug:
this->m_message = statusMessage.getMessage();
return debug();
case CStatusMessage::SeverityInfo:
return info(statusMessage.getMessage());
case CStatusMessage::SeverityWarning:
return warning(statusMessage.getMessage());
case CStatusMessage::SeverityError:
return error(statusMessage.getMessage());
default:
return info(statusMessage.getMessage());
}
}
CLogMessage &CLogMessage::validationInfo(QString format) CLogMessage &CLogMessage::validationInfo(QString format)
{ {
m_categories.remove(CLogCategory::uncategorized()); m_categories.remove(CLogCategory::uncategorized());
@@ -69,9 +87,9 @@ namespace BlackMisc
case CStatusMessage::SeverityInfo: case CStatusMessage::SeverityInfo:
return validationInfo(statusMessage.getMessage()); return validationInfo(statusMessage.getMessage());
case CStatusMessage::SeverityWarning: case CStatusMessage::SeverityWarning:
return validation(statusMessage.getMessage()); return validationWarning(statusMessage.getMessage());
case CStatusMessage::SeverityError: case CStatusMessage::SeverityError:
return error(statusMessage.getMessage()); return validationError(statusMessage.getMessage());
default: default:
return validationInfo(statusMessage.getMessage()); return validationInfo(statusMessage.getMessage());
} }
@@ -179,6 +197,7 @@ namespace BlackMisc
{ {
return category.section("/", 1, -1).split("/").contains(flag); return category.section("/", 1, -1).split("/").contains(flag);
} }
QString addFlag(QString category, const QString &flag) QString addFlag(QString category, const QString &flag)
{ {
if (category.isEmpty() || hasFlag(category, flag)) return category; if (category.isEmpty() || hasFlag(category, flag)) return category;

View File

@@ -111,6 +111,9 @@ namespace BlackMisc
//! Set the severity to error, providing a format string. //! Set the severity to error, providing a format string.
CLogMessage &error(QString format); CLogMessage &error(QString format);
//! Log message by status message
CLogMessage &statusMessage(const CStatusMessage &statusMessage);
//! Set the severity to info, providing a format string, and adding the validation category. //! Set the severity to info, providing a format string, and adding the validation category.
CLogMessage &validationInfo(QString format); CLogMessage &validationInfo(QString format);