mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-31 12:55:33 +08:00
Fixed status message verification/validation
slack discussion MS/KB
This commit is contained in:
@@ -120,16 +120,17 @@ namespace BlackMisc
|
|||||||
static const QList<CLogCategory> cats
|
static const QList<CLogCategory> cats
|
||||||
{
|
{
|
||||||
uncategorized(),
|
uncategorized(),
|
||||||
services(),
|
|
||||||
validation(),
|
|
||||||
context(),
|
context(),
|
||||||
contextSlot(),
|
contextSlot(),
|
||||||
guiComponent(),
|
|
||||||
download(),
|
download(),
|
||||||
webservice(),
|
guiComponent(),
|
||||||
mapping(),
|
mapping(),
|
||||||
matching(),
|
matching(),
|
||||||
swiftDbWebservice(),
|
swiftDbWebservice(),
|
||||||
|
services(),
|
||||||
|
validation(),
|
||||||
|
verification(),
|
||||||
|
webservice()
|
||||||
};
|
};
|
||||||
return cats;
|
return cats;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,13 +96,13 @@ namespace BlackMisc
|
|||||||
m_severity = severity;
|
m_severity = severity;
|
||||||
}
|
}
|
||||||
|
|
||||||
CStatusMessage::CStatusMessage(const CLogCategoryList &categories, StatusSeverity severity, const QString &message, bool verification)
|
CStatusMessage::CStatusMessage(const CLogCategoryList &categories, StatusSeverity severity, const QString &message, bool validation)
|
||||||
: CStatusMessage(severity, message)
|
: CStatusMessage(severity, message)
|
||||||
{
|
{
|
||||||
m_categories = categories;
|
m_categories = categories;
|
||||||
if (verification)
|
if (validation)
|
||||||
{
|
{
|
||||||
this->addVerificationCategory();
|
this->addValidationCategory();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,14 +231,13 @@ namespace BlackMisc
|
|||||||
return this->m_handledByObjects.contains(quintptr(object));
|
return this->m_handledByObjects.contains(quintptr(object));
|
||||||
}
|
}
|
||||||
|
|
||||||
void CStatusMessage::addVerificationCategory()
|
void CStatusMessage::addValidationCategory()
|
||||||
{
|
{
|
||||||
this->addCategory(CLogCategory::verification());
|
this->addCategory(CLogCategory::validation());
|
||||||
}
|
}
|
||||||
|
|
||||||
QString CStatusMessage::convertToQString(bool /** i18n */) const
|
QString CStatusMessage::convertToQString(bool /** i18n */) const
|
||||||
{
|
{
|
||||||
|
|
||||||
QString s("Category: ");
|
QString s("Category: ");
|
||||||
s.append(this->m_categories.toQString());
|
s.append(this->m_categories.toQString());
|
||||||
|
|
||||||
|
|||||||
@@ -170,8 +170,8 @@ namespace BlackMisc
|
|||||||
//! Constructor
|
//! Constructor
|
||||||
CStatusMessage(StatusSeverity severity, const QString &message);
|
CStatusMessage(StatusSeverity severity, const QString &message);
|
||||||
|
|
||||||
//! Constructor, also a verification messsage can be directly created
|
//! Constructor, also a validation messsage can be directly created
|
||||||
CStatusMessage(const CLogCategoryList &categories, StatusSeverity severity, const QString &message, bool verification = false);
|
CStatusMessage(const CLogCategoryList &categories, StatusSeverity severity, const QString &message, bool validation = false);
|
||||||
|
|
||||||
//! Construct from a Qt logging triple
|
//! Construct from a Qt logging triple
|
||||||
//! \sa QtMessageHandler
|
//! \sa QtMessageHandler
|
||||||
@@ -249,8 +249,8 @@ namespace BlackMisc
|
|||||||
//! Add category
|
//! Add category
|
||||||
void addCategory(const CLogCategory &category) { this->m_categories.push_back(category); }
|
void addCategory(const CLogCategory &category) { this->m_categories.push_back(category); }
|
||||||
|
|
||||||
//! Adds verification as category
|
//! Adds validation as category
|
||||||
void addVerificationCategory();
|
void addValidationCategory();
|
||||||
|
|
||||||
//! Add categories
|
//! Add categories
|
||||||
void addCategories(const CLogCategoryList &categories) { this->m_categories.push_back(categories); }
|
void addCategories(const CLogCategoryList &categories) { this->m_categories.push_back(categories); }
|
||||||
|
|||||||
Reference in New Issue
Block a user