diff --git a/src/blackmisc/logcategory.h b/src/blackmisc/logcategory.h index 68695c420..c6e5c520d 100644 --- a/src/blackmisc/logcategory.h +++ b/src/blackmisc/logcategory.h @@ -120,16 +120,17 @@ namespace BlackMisc static const QList cats { uncategorized(), - services(), - validation(), context(), contextSlot(), - guiComponent(), download(), - webservice(), + guiComponent(), mapping(), matching(), swiftDbWebservice(), + services(), + validation(), + verification(), + webservice() }; return cats; } diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp index 112b0e4bf..83fd9e5e5 100644 --- a/src/blackmisc/statusmessage.cpp +++ b/src/blackmisc/statusmessage.cpp @@ -96,13 +96,13 @@ namespace BlackMisc 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) { m_categories = categories; - if (verification) + if (validation) { - this->addVerificationCategory(); + this->addValidationCategory(); } } @@ -231,14 +231,13 @@ namespace BlackMisc 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 s("Category: "); s.append(this->m_categories.toQString()); diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h index e77984368..689a00e82 100644 --- a/src/blackmisc/statusmessage.h +++ b/src/blackmisc/statusmessage.h @@ -170,8 +170,8 @@ namespace BlackMisc //! Constructor CStatusMessage(StatusSeverity severity, const QString &message); - //! Constructor, also a verification messsage can be directly created - CStatusMessage(const CLogCategoryList &categories, StatusSeverity severity, const QString &message, bool verification = false); + //! Constructor, also a validation messsage can be directly created + CStatusMessage(const CLogCategoryList &categories, StatusSeverity severity, const QString &message, bool validation = false); //! Construct from a Qt logging triple //! \sa QtMessageHandler @@ -249,8 +249,8 @@ namespace BlackMisc //! Add category void addCategory(const CLogCategory &category) { this->m_categories.push_back(category); } - //! Adds verification as category - void addVerificationCategory(); + //! Adds validation as category + void addValidationCategory(); //! Add categories void addCategories(const CLogCategoryList &categories) { this->m_categories.push_back(categories); }