Issue #77 getLogCategories returns a simple QStringList instead of our own class

This commit is contained in:
Mat Sutcliffe
2020-10-28 16:48:31 +00:00
parent 05d28017e7
commit 63e8de8f00
156 changed files with 862 additions and 833 deletions

View File

@@ -15,22 +15,22 @@ namespace BlackMisc
{
namespace Simulation
{
void CMatchingUtils::addLogDetailsToList(CStatusMessageList *log, const CSimulatedAircraft &remoteAircraft, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s)
void CMatchingUtils::addLogDetailsToList(CStatusMessageList *log, const CSimulatedAircraft &remoteAircraft, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s)
{
CLogUtilities::addLogDetailsToList(log, remoteAircraft.getCallsign(), message, extraCategories, s);
}
const CLogCategoryList &CMatchingUtils::defaultCategories()
{
static const CLogCategoryList cats({ CLogCategory::matching() });
static const CLogCategoryList cats({ CLogCategories::matching() });
return cats;
}
CLogCategoryList CMatchingUtils::categories(const CLogCategoryList &extraCategories)
CLogCategoryList CMatchingUtils::categories(const QStringList &extraCategories)
{
if (extraCategories.isEmpty()) { return defaultCategories(); }
CLogCategoryList cats(defaultCategories());
cats.push_back(extraCategories);
cats.push_back(CLogCategoryList::fromQStringList(extraCategories));
return cats;
}
} // ns