refs #642, as proposed by MS

https://dev.vatsim-germany.org/issues/642#note-4
This commit is contained in:
Klaus Basan
2016-04-23 13:55:42 +02:00
parent 32caa3f8f4
commit 8da559a186
5 changed files with 6 additions and 6 deletions

View File

@@ -111,7 +111,7 @@ namespace BlackCore
if (cacheAvailable && readMsgs.isFailure())
{
// error but cache is available, we can continue
readMsgs.clipSeverity(CStatusMessage::SeverityWarning);
readMsgs.clampSeverity(CStatusMessage::SeverityWarning);
msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityWarning, "Loading setup failed, but cache is available, will continue"));
msgs.push_back(readMsgs);
}

View File

@@ -197,7 +197,7 @@ namespace BlackMisc
return c.isEmpty() ? this->getCategoriesAsString() : c;
}
bool CStatusMessage::clipSeverity(CStatusMessage::StatusSeverity severity)
bool CStatusMessage::clampSeverity(CStatusMessage::StatusSeverity severity)
{
if (this->getSeverity() <= severity) { return false; }
this->setSeverity(severity);

View File

@@ -206,7 +206,7 @@ namespace BlackMisc
StatusSeverity getSeverity() const { return this->m_severity; }
//! Clip/reduce severity if higher (more critical)
bool clipSeverity(StatusSeverity severity);
bool clampSeverity(StatusSeverity severity);
//! Info or debug, no warning or error
bool isSeverityInfoOrLess() const { return this->m_severity == SeverityInfo || this->m_severity == SeverityDebug; }

View File

@@ -103,11 +103,11 @@ namespace BlackMisc
}
}
void CStatusMessageList::clipSeverity(CStatusMessage::StatusSeverity severity)
void CStatusMessageList::clampSeverity(CStatusMessage::StatusSeverity severity)
{
for (auto &msg : *this)
{
msg.clipSeverity(severity);
msg.clampSeverity(severity);
}
}

View File

@@ -80,7 +80,7 @@ namespace BlackMisc
void setCategories(const CLogCategoryList &categories);
//! And higher (more critical) severity will be clipped to given severity
void clipSeverity(CStatusMessage::StatusSeverity severity);
void clampSeverity(CStatusMessage::StatusSeverity severity);
//! Remove warnings and below
void removeWarningsAndBelow();