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

Ref T108, avoid duplicates in status message categories

Browse Source 
and using string builder in CStatusMessage::convertToQString
This commit is contained in:
Klaus Basan
2017-07-12 23:26:56 +02:00
committed by Mathew Sutcliffe
parent 0f59a123ae
commit 224c61c7e9
2 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/blackmisc/statusmessage.h
View File

@@ -53,16 +53,16 @@ namespace BlackMisc
CMessageBase() {}
//! Construct a message with some specific category.
explicit CMessageBase(const CLogCategory &category) : m_categories({ category }) {}
explicit CMessageBase(const CLogCategory &category) : m_categories( { category }) {}
//! Construct a message with some specific categories.
explicit CMessageBase(const CLogCategoryList &categories) : m_categories(categories) {}
//! Construct a message with some specific categories.
CMessageBase(const CLogCategoryList &categories, const CLogCategory &extra) : CMessageBase(categories) { m_categories.push_back(extra); }
CMessageBase(const CLogCategoryList &categories, const CLogCategory &extra) : CMessageBase(categories) { this->addIfNotExisting(extra); }
//! Construct a message with some specific categories.
CMessageBase(const CLogCategoryList &categories, const CLogCategoryList &extra) : CMessageBase(categories) { m_categories.push_back(extra); }
CMessageBase(const CLogCategoryList &categories, const CLogCategoryList &extra) : CMessageBase(categories) { this->addIfNotExisting(extra); }
//! Set the severity to debug.
Derived &debug() { return setSeverityAndMessage(SeverityDebug, ""); }
@@ -107,12 +107,35 @@ namespace BlackMisc
//! @}
private:
void setValidation() { m_categories.remove(CLogCategory::uncategorized()); m_categories.push_back(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 &derived() { return static_cast<Derived &>(*this); }
protected:
//! Add category if not already existing
void addIfNotExisting(const CLogCategory &category)
{
if (this->m_categories.contains(category)) { return; }
this->m_categories.push_back(category);
}
//! Add categories if not already existing
void addIfNotExisting(const CLogCategoryList &categories)
{
if (this->m_categories.isEmpty())
{
this->m_categories.push_back(categories);
}
else
{
for (const CLogCategory &cat : categories)
{
this->addIfNotExisting(cat);
}
}
}
//! \private
//! @{
QString m_message;
@@ -266,14 +289,14 @@ namespace BlackMisc
//! Severity
void setSeverity(StatusSeverity severity) { this->m_severity = severity; }
//! Add category
void addCategory(const CLogCategory &category) { this->m_categories.push_back(category); }
//! Add category, avoids duplicates
void addCategory(const CLogCategory &category) { this->addIfNotExisting(category); }
//! Adds validation as category
void addValidationCategory();
void addValidationCategory() { this->addCategory(CLogCategory::validation()); }
//! Add categories
void addCategories(const CLogCategoryList &categories) { this->m_categories.push_back(categories); }
//! Add categories, avoids duplicates
void addCategories(const CLogCategoryList &categories) { this->addIfNotExisting(categories); }
//! Reset category
void setCategory(const CLogCategory &category) { this->m_categories = CLogCategoryList { category }; }