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

Provide CMessageBase::log for logging with severity configurable as parameter

Browse Source 
Summary: Ref T198

Reviewers: kbasan, #swift_developers

Reviewed By: kbasan

Subscribers: jenkins

Tags: #swift_pilot_client

Maniphest Tasks: T198

Differential Revision: https://dev.swift-project.org/D64
This commit is contained in:
Mathew Sutcliffe
2017-11-23 22:15:46 +00:00
parent c5a3db49b0
commit 047b9279b6
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackmisc/statusmessage.h
View File

@@ -64,29 +64,32 @@ namespace BlackMisc
//! Construct a message with some specific categories. //! Construct a message with some specific categories.
CMessageBase(const CLogCategoryList &categories, const CLogCategoryList &extra) : CMessageBase(categories) { this->addIfNotExisting(extra); } CMessageBase(const CLogCategoryList &categories, const CLogCategoryList &extra) : CMessageBase(categories) { this->addIfNotExisting(extra); }
//! Set the severity and format string.
Derived &log(StatusSeverity s, const QString &m) { m_message = m; m_severity = s; return derived(); }
//! Set the severity to debug. //! Set the severity to debug.
Derived &debug() { return setSeverityAndMessage(SeverityDebug, ""); } Derived &debug() { return log(SeverityDebug, ""); }
//! Set the severity to debug, providing a format string. //! Set the severity to debug, providing a format string.
Derived &debug(const QString &format) { return setSeverityAndMessage(SeverityDebug, format); } Derived &debug(const QString &format) { return log(SeverityDebug, format); }
//! Set the severity to info, providing a format string. //! Set the severity to info, providing a format string.
Derived &info(const QString &format) { return setSeverityAndMessage(SeverityInfo, format); } Derived &info(const QString &format) { return log(SeverityInfo, format); }
//! Set the severity to warning, providing a format string. //! Set the severity to warning, providing a format string.
Derived &warning(const QString &format) { return setSeverityAndMessage(SeverityWarning, format); } Derived &warning(const QString &format) { return log(SeverityWarning, format); }
//! Set the severity to error, providing a format string. //! Set the severity to error, providing a format string.
Derived &error(const QString &format) { return setSeverityAndMessage(SeverityError, format); } Derived &error(const QString &format) { return log(SeverityError, format); }
//! 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.
Derived &validationInfo(const QString &format) { setValidation(); return setSeverityAndMessage(SeverityInfo, format); } Derived &validationInfo(const QString &format) { setValidation(); return log(SeverityInfo, format); }
//! Set the severity to warning, providing a format string, and adding the validation category. //! Set the severity to warning, providing a format string, and adding the validation category.
Derived &validationWarning(const QString &format) { setValidation(); return setSeverityAndMessage(SeverityWarning, format); } Derived &validationWarning(const QString &format) { setValidation(); return log(SeverityWarning, format); }
//! Set the severity to error, providing a format string, and adding the validation category. //! Set the severity to error, providing a format string, and adding the validation category.
Derived &validationError(const QString &format) { setValidation(); return setSeverityAndMessage(SeverityError, format); } Derived &validationError(const QString &format) { setValidation(); return log(SeverityError, format); }
//! Streaming operators. //! Streaming operators.
//! \details If the format string is empty, the message will consist of all streamed values separated by spaces. //! \details If the format string is empty, the message will consist of all streamed values separated by spaces.
@@ -111,7 +114,6 @@ namespace BlackMisc
private: private:
void setValidation() { m_categories.remove(CLogCategory::uncategorized()); this->addIfNotExisting(CLogCategory::validation()); } void setValidation() { m_categories.remove(CLogCategory::uncategorized()); this->addIfNotExisting(CLogCategory::validation()); }
Derived &setSeverityAndMessage(StatusSeverity s, const QString &m) { m_message = m; m_severity = s; return derived(); }
Derived &arg(const QString &value) { m_args.push_back(value); return derived(); } Derived &arg(const QString &value) { m_args.push_back(value); return derived(); }
Derived &derived() { return static_cast<Derived &>(*this); } Derived &derived() { return static_cast<Derived &>(*this); }