diff --git a/src/blackcore/afv/audio/receiversampleprovider.cpp b/src/blackcore/afv/audio/receiversampleprovider.cpp index 7296f4a42..4e03b5ee5 100644 --- a/src/blackcore/afv/audio/receiversampleprovider.cpp +++ b/src/blackcore/afv/audio/receiversampleprovider.cpp @@ -28,9 +28,9 @@ namespace BlackCore { namespace Audio { - const CLogCategoryList &CReceiverSampleProvider::getLogCategories() + const QStringList &CReceiverSampleProvider::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::audio(), CLogCategory::vatsimSpecific() }; + static const QStringList cats { CLogCategories::audio(), CLogCategories::vatsimSpecific() }; return cats; } diff --git a/src/blackcore/afv/audio/receiversampleprovider.h b/src/blackcore/afv/audio/receiversampleprovider.h index ad77196eb..98a4689cf 100644 --- a/src/blackcore/afv/audio/receiversampleprovider.h +++ b/src/blackcore/afv/audio/receiversampleprovider.h @@ -43,7 +43,7 @@ namespace BlackCore public: //! Log.categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Ctor CReceiverSampleProvider(const QAudioFormat &audioFormat, quint16 id, int voiceInputNumber, QObject *parent = nullptr); diff --git a/src/blackcore/afv/clients/afvclient.cpp b/src/blackcore/afv/clients/afvclient.cpp index e03356eda..129944f0f 100644 --- a/src/blackcore/afv/clients/afvclient.cpp +++ b/src/blackcore/afv/clients/afvclient.cpp @@ -49,9 +49,9 @@ namespace BlackCore constexpr double CAfvClient::MaxDbOut; constexpr quint32 CAfvClient::UniCom; - const CLogCategoryList &CAfvClient::getLogCategories() + const QStringList &CAfvClient::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::audio(), CLogCategory::vatsimSpecific() }; + static const QStringList cats { CLogCategories::audio(), CLogCategories::vatsimSpecific() }; return cats; } diff --git a/src/blackcore/afv/clients/afvclient.h b/src/blackcore/afv/clients/afvclient.h index 836117a22..1b472d536 100644 --- a/src/blackcore/afv/clients/afvclient.h +++ b/src/blackcore/afv/clients/afvclient.h @@ -60,7 +60,7 @@ namespace BlackCore public: //! Categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Connection status enum ConnectionStatus { Disconnected, Connected }; diff --git a/src/blackcore/afv/connection/apiserverconnection.cpp b/src/blackcore/afv/connection/apiserverconnection.cpp index e9e96e616..25d265947 100644 --- a/src/blackcore/afv/connection/apiserverconnection.cpp +++ b/src/blackcore/afv/connection/apiserverconnection.cpp @@ -32,9 +32,9 @@ namespace BlackCore { namespace Connection { - const CLogCategoryList &CApiServerConnection::getLogCategories() + const QStringList &CApiServerConnection::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::audio(), CLogCategory::vatsimSpecific() }; + static const QStringList cats { CLogCategories::audio(), CLogCategories::vatsimSpecific() }; return cats; } diff --git a/src/blackcore/afv/connection/apiserverconnection.h b/src/blackcore/afv/connection/apiserverconnection.h index be376f836..755017b2e 100644 --- a/src/blackcore/afv/connection/apiserverconnection.h +++ b/src/blackcore/afv/connection/apiserverconnection.h @@ -50,7 +50,7 @@ namespace BlackCore }; //! Categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor CApiServerConnection(const QString &address, QObject *parent = nullptr); diff --git a/src/blackcore/afv/connection/clientconnectiondata.cpp b/src/blackcore/afv/connection/clientconnectiondata.cpp index 2dc1ffd57..de3f41b4b 100644 --- a/src/blackcore/afv/connection/clientconnectiondata.cpp +++ b/src/blackcore/afv/connection/clientconnectiondata.cpp @@ -19,9 +19,9 @@ namespace BlackCore { namespace Connection { - const CLogCategoryList &CClientConnectionData::getLogCategories() + const QStringList &CClientConnectionData::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::audio(), CLogCategory::vatsimSpecific() }; + static const QStringList cats { CLogCategories::audio(), CLogCategories::vatsimSpecific() }; return cats; } diff --git a/src/blackcore/afv/connection/clientconnectiondata.h b/src/blackcore/afv/connection/clientconnectiondata.h index 20dabbf09..03837ee3d 100644 --- a/src/blackcore/afv/connection/clientconnectiondata.h +++ b/src/blackcore/afv/connection/clientconnectiondata.h @@ -32,7 +32,7 @@ namespace BlackCore { public: //! Categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Ctor CClientConnectionData() = default; diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp index 353b0a128..cdc67aeff 100644 --- a/src/blackcore/aircraftmatcher.cpp +++ b/src/blackcore/aircraftmatcher.cpp @@ -40,9 +40,9 @@ using namespace BlackMisc::Simulation; namespace BlackCore { - const CLogCategoryList &CAircraftMatcher::getLogCategories() + const QStringList &CAircraftMatcher::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::matching() }; + static const QStringList cats { CLogCategories::matching() }; return cats; } @@ -594,7 +594,7 @@ namespace BlackCore if (ms.isError()) { const QString msg = QStringLiteral("Matching script error: %1 '%2'").arg(ms.property("lineNumber").toInt()).arg(ms.toString()); - CLogMessage(getLogCategories()).warning(msg); + CLogMessage(static_cast(nullptr)).warning(msg); if (log) { CLogUtilities::addLogDetailsToList(log, callsign, msg); } } else diff --git a/src/blackcore/aircraftmatcher.h b/src/blackcore/aircraftmatcher.h index 31bd81211..cd4604dda 100644 --- a/src/blackcore/aircraftmatcher.h +++ b/src/blackcore/aircraftmatcher.h @@ -52,7 +52,7 @@ namespace BlackCore public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor CAircraftMatcher(const BlackMisc::Simulation::CAircraftMatcherSetup &setup, QObject *parent = nullptr); diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index 6cb323587..c20907fad 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -152,9 +152,9 @@ namespace BlackCore return r; } - const CLogCategoryList &CAirspaceMonitor::getLogCategories() + const QStringList &CAirspaceMonitor::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::matching(), CLogCategory::network() }; + static const QStringList cats { CLogCategories::matching(), CLogCategories::network() }; return cats; } diff --git a/src/blackcore/airspacemonitor.h b/src/blackcore/airspacemonitor.h index c100466c5..0f6c7221d 100644 --- a/src/blackcore/airspacemonitor.h +++ b/src/blackcore/airspacemonitor.h @@ -72,7 +72,7 @@ namespace BlackCore public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor CAirspaceMonitor(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 85060424d..90819878d 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -1337,9 +1337,9 @@ namespace BlackCore return e; } - const BlackMisc::CLogCategoryList &CApplication::getLogCategories() + const QStringList &CApplication::getLogCategories() { - static const CLogCategoryList l({ CLogCategory("swift.application"), CLogCategory("swift." + executable())}); + static const QStringList l({ "swift.application", "swift." % executable()}); return l; } diff --git a/src/blackcore/application.h b/src/blackcore/application.h index 89a72e319..d606a0805 100644 --- a/src/blackcore/application.h +++ b/src/blackcore/application.h @@ -103,7 +103,7 @@ namespace BlackCore static CApplication *instance(); //! Own log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor CApplication(BlackMisc::CApplicationInfo::Application application, bool init = true); diff --git a/src/blackcore/context/context.cpp b/src/blackcore/context/context.cpp index 0dc90de2d..8e4ad964f 100644 --- a/src/blackcore/context/context.cpp +++ b/src/blackcore/context/context.cpp @@ -16,9 +16,9 @@ namespace BlackCore { namespace Context { - const CLogCategoryList &IContext::getLogCategories() + const QStringList &IContext::getLogCategories() { - static const CLogCategoryList cats { BlackMisc::CLogCategory::context() }; + static const QStringList cats { BlackMisc::CLogCategories::context() }; return cats; } diff --git a/src/blackcore/context/context.h b/src/blackcore/context/context.h index 1ec64861f..f5750dc96 100644 --- a/src/blackcore/context/context.h +++ b/src/blackcore/context/context.h @@ -45,7 +45,7 @@ namespace BlackCore virtual ~IContext() override {} //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Using local implementing object? bool isUsingImplementingObject() const @@ -159,7 +159,7 @@ namespace BlackCore //! Empty context called void logEmptyContextWarning(const QString &functionName) const { - BlackMisc::CLogMessage(this, BlackMisc::CLogCategory::contextSlot()).warning(u"Empty context called, details: %1") << functionName; + BlackMisc::CLogMessage(this, BlackMisc::CLogCategories::contextSlot()).warning(u"Empty context called, details: %1") << functionName; } //! Called when shutdown is about to be called diff --git a/src/blackcore/context/contextapplicationimpl.cpp b/src/blackcore/context/contextapplicationimpl.cpp index f43cbd025..b88419613 100644 --- a/src/blackcore/context/contextapplicationimpl.cpp +++ b/src/blackcore/context/contextapplicationimpl.cpp @@ -46,19 +46,19 @@ namespace BlackCore BlackMisc::CValueCachePacket CContextApplication::getAllSettings() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return CSettingsCache::instance()->getAllValuesWithTimestamps(); } QStringList CContextApplication::getUnsavedSettingsKeys() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return CSettingsCache::instance()->getAllUnsavedKeys(); } CSettingsDictionary CContextApplication::getUnsavedSettingsKeysDescribed() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } const QStringList keys = CSettingsCache::instance()->getAllUnsavedKeys(); CSettingsDictionary result; for (const QString &key : keys) { result.insert(key, CSettingsCache::instance()->getHumanReadableName(key)); } @@ -72,19 +72,19 @@ namespace BlackCore BlackMisc::CStatusMessage CContextApplication::saveSettings(const QString &keyPrefix) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << keyPrefix; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << keyPrefix; } return CSettingsCache::instance()->saveToStore(keyPrefix); } BlackMisc::CStatusMessage CContextApplication::saveSettingsByKey(const QStringList &keys) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << keys.join(", "); } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << keys.join(", "); } return CSettingsCache::instance()->saveToStore(keys); } BlackMisc::CStatusMessage CContextApplication::loadSettings() { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return CSettingsCache::instance()->loadFromStore(); } @@ -114,7 +114,7 @@ namespace BlackCore bool CContextApplication::writeToFile(const QString &fileName, const QString &content) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << fileName << content.left(25); } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << fileName << content.left(25); } if (fileName.isEmpty()) { return false; } QFile file(fileName); if (file.open(QIODevice::WriteOnly | QIODevice::Text)) @@ -128,7 +128,7 @@ namespace BlackCore CIdentifier CContextApplication::registerApplication(const CIdentifier &application) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << application; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << application; } if (!m_registeredApplications.contains(application)) { @@ -143,7 +143,7 @@ namespace BlackCore void CContextApplication::unregisterApplication(const CIdentifier &application) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << application; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << application; } int r = m_registeredApplications.remove(application); this->cleanupRegisteredApplications(); if (r > 0) { emit registrationChanged(); } @@ -157,7 +157,7 @@ namespace BlackCore CIdentifierList CContextApplication::getRegisteredApplications() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } //static const int outdatedMs = qRound(1.5 * PingIdentifiersMs); //return m_registeredApplications.findAfterNowMinusOffset(outdatedMs); return m_registeredApplications; @@ -165,13 +165,13 @@ namespace BlackCore CIdentifier CContextApplication::getApplicationIdentifier() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return this->identifier(); } QString CContextApplication::readFromFile(const QString &fileName) const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << fileName; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << fileName; } QFile file(fileName); QString content; if (fileName.isEmpty()) return content; @@ -186,14 +186,14 @@ namespace BlackCore bool CContextApplication::removeFile(const QString &fileName) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << fileName; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << fileName; } if (fileName.isEmpty()) { return false; } return QFile::remove(fileName); } bool CContextApplication::existsFile(const QString &fileName) const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << fileName; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << fileName; } if (fileName.isEmpty()) return false; return QFile::exists(fileName); } diff --git a/src/blackcore/context/contextapplicationproxy.cpp b/src/blackcore/context/contextapplicationproxy.cpp index ede9d2a0e..e8a1017ce 100644 --- a/src/blackcore/context/contextapplicationproxy.cpp +++ b/src/blackcore/context/contextapplicationproxy.cpp @@ -205,7 +205,7 @@ namespace BlackCore { if (!sApp || origin.isFromLocalMachine()) { return; } sApp->getInputManager()->callFunctionsBy(action, argument); - CLogMessage(this, CLogCategory::contextSlot()).debug() << "Calling function" << action << "from origin" << origin.getMachineName(); + CLogMessage(this, CLogCategories::contextSlot()).debug() << "Calling function" << action << "from origin" << origin.getMachineName(); } } // namespace } // namespace diff --git a/src/blackcore/context/contextaudio.cpp b/src/blackcore/context/contextaudio.cpp index acaf75e1e..6bcea3222 100644 --- a/src/blackcore/context/contextaudio.cpp +++ b/src/blackcore/context/contextaudio.cpp @@ -498,7 +498,7 @@ namespace BlackCore void CContextAudioBase::playNotification(CNotificationSounds::NotificationFlag notification, bool considerSettings, int volume) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << notification; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << notification; } const CSettings settings = m_audioSettings.getThreadLocal(); const bool play = !considerSettings || settings.isNotificationFlagSet(notification); diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index bc7ab6139..d8259d6b9 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -240,15 +240,15 @@ namespace BlackCore CStatusMessage CContextNetwork::connectToNetwork(const CServer &server, const QString &extraLiveryString, bool sendLivery, const QString &extraModelString, bool sendModelString, const CCallsign &partnerCallsign, CLoginMode mode) { - if (!this->canUseFsd()) { return { CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityInfo, u"Invalid FSD state (shutdown)") }; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (!this->canUseFsd()) { return { CStatusMessage({ CLogCategories::validation() }, CStatusMessage::SeverityInfo, u"Invalid FSD state (shutdown)") }; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } QString msg; - if (!server.getUser().hasCredentials()) { return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, u"Invalid user credentials"); } - if (!this->ownAircraft().getAircraftIcaoCode().hasDesignator()) { return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, u"Invalid ICAO data for own aircraft"); } + if (!server.getUser().hasCredentials()) { return CStatusMessage({ CLogCategories::validation() }, CStatusMessage::SeverityError, u"Invalid user credentials"); } + if (!this->ownAircraft().getAircraftIcaoCode().hasDesignator()) { return CStatusMessage({ CLogCategories::validation() }, CStatusMessage::SeverityError, u"Invalid ICAO data for own aircraft"); } if (!CNetworkUtils::canConnect(server, msg, 5000)) { return CStatusMessage(CStatusMessage::SeverityError, msg); } - if (m_fsdClient->isConnected()) { return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, u"Already connected"); } - if (this->isPendingConnection()) { return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, u"Pending connection, please wait"); } + if (m_fsdClient->isConnected()) { return CStatusMessage({ CLogCategories::validation() }, CStatusMessage::SeverityError, u"Already connected"); } + if (this->isPendingConnection()) { return CStatusMessage({ CLogCategories::validation() }, CStatusMessage::SeverityError, u"Pending connection, please wait"); } this->getIContextOwnAircraft()->updateOwnAircraftPilot(server.getUser()); const CSimulatedAircraft ownAircraft(this->ownAircraft()); @@ -300,7 +300,7 @@ namespace BlackCore m_fsdClient->setAtcRating(AtcRating::Observer); m_fsdClient->connectToServer(); - return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityInfo, u"Connection pending " % server.getAddress() % u' ' % QString::number(server.getPort())); + return CStatusMessage({ CLogCategories::validation() }, CStatusMessage::SeverityInfo, u"Connection pending " % server.getAddress() % u' ' % QString::number(server.getPort())); } CServer CContextNetwork::getConnectedServer() const @@ -312,29 +312,29 @@ namespace BlackCore CLoginMode CContextNetwork::getLoginMode() const { if (!this->canUseFsd()) { return {}; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_fsdClient->getLoginMode(); } CStatusMessage CContextNetwork::disconnectFromNetwork() { - if (!this->canUseFsd()) { return { CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityInfo, u"Invalid FSD state (shutdown)") }; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (!this->canUseFsd()) { return { CStatusMessage({ CLogCategories::validation() }, CStatusMessage::SeverityInfo, u"Invalid FSD state (shutdown)") }; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (m_fsdClient->isConnected() || m_fsdClient->isPendingConnection()) { m_fsdClient->disconnectFromServer(); - return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityInfo, u"Connection terminating"); + return CStatusMessage({ CLogCategories::validation() }, CStatusMessage::SeverityInfo, u"Connection terminating"); } else { - return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityWarning, u"Already disconnected"); + return CStatusMessage({ CLogCategories::validation() }, CStatusMessage::SeverityWarning, u"Already disconnected"); } } bool CContextNetwork::isConnected() const { if (!this->canUseFsd()) { return false; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_fsdClient->isConnected(); } @@ -558,13 +558,13 @@ namespace BlackCore void CContextNetwork::sendTextMessages(const CTextMessageList &textMessages) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << textMessages; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << textMessages; } m_fsdClient->sendTextMessages(textMessages); } void CContextNetwork::sendFlightPlan(const CFlightPlan &flightPlan) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << flightPlan; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << flightPlan; } m_fsdClient->sendFlightPlan(flightPlan); m_fsdClient->sendClientQueryFlightPlan(this->ownAircraft().getCallsign()); } @@ -572,27 +572,27 @@ namespace BlackCore CFlightPlan CContextNetwork::loadFlightPlanFromNetwork(const CCallsign &callsign) const { if (!this->canUseFsd()) { return {}; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->loadFlightPlanFromNetwork(callsign); } CUserList CContextNetwork::getUsers() const { if (!this->canUseAirspaceMonitor()) { return {}; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->getUsers(); } CUserList CContextNetwork::getUsersForCallsigns(const CCallsignSet &callsigns) const { if (!this->canUseAirspaceMonitor() || callsigns.isEmpty()) { return {}; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->getUsersForCallsigns(callsigns); } CUser CContextNetwork::getUserForCallsign(const CCallsign &callsign) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } CCallsignSet callsigns; callsigns.push_back(callsign); const CUserList users = this->getUsersForCallsigns(callsigns); @@ -603,21 +603,21 @@ namespace BlackCore CClientList CContextNetwork::getClients() const { if (!this->canUseAirspaceMonitor()) { return {}; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->getClients(); } CClientList CContextNetwork::getClientsForCallsigns(const CCallsignSet &callsigns) const { if (!this->canUseAirspaceMonitor()) { return {}; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->getClientsForCallsigns(callsigns); } bool CContextNetwork::setOtherClient(const CClient &client) { if (!this->canUseAirspaceMonitor()) { return false; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->setOtherClient(client); } @@ -653,20 +653,20 @@ namespace BlackCore CServerList CContextNetwork::getVatsimFsdServers() const { Q_ASSERT_X(sApp->getWebDataServices(), Q_FUNC_INFO, "Missing data reader"); - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return sApp->getWebDataServices()->getVatsimFsdServers(); } CServerList CContextNetwork::getVatsimVoiceServers() const { Q_ASSERT_X(sApp->getWebDataServices(), Q_FUNC_INFO, "Missing data reader"); - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return sApp->getWebDataServices()->getVatsimVoiceServers(); } void CContextNetwork::onFsdConnectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to) { - // if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << from << to; } + // if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << from << to; } if (to.isDisconnected()) { @@ -759,7 +759,7 @@ namespace BlackCore void CContextNetwork::updateMetars(const CMetarList &metars) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } CLogMessage(this).info(u"%1 METARs updated") << metars.size(); } @@ -880,7 +880,7 @@ namespace BlackCore CAtcStationList CContextNetwork::getAtcStationsOnline(bool recalculateDistance) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } CAtcStationList stations = m_airspace->getAtcStationsOnline(); if (!recalculateDistance || !this->getIContextOwnAircraft()) { return stations; } stations.calculcateAndUpdateRelativeDistanceAndBearing(this->getIContextOwnAircraft()->getOwnAircraftSituation()); @@ -897,7 +897,7 @@ namespace BlackCore CAtcStationList CContextNetwork::getAtcStationsBooked(bool recalculateDistance) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } CAtcStationList stations = m_airspace->getAtcStationsBooked(); if (!recalculateDistance || !this->getIContextOwnAircraft()) { return stations; } stations.calculcateAndUpdateRelativeDistanceAndBearing(this->getIContextOwnAircraft()->getOwnAircraftSituation()); @@ -906,61 +906,61 @@ namespace BlackCore CSimulatedAircraftList CContextNetwork::getAircraftInRange() const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->getAircraftInRange(); } CCallsignSet CContextNetwork::getAircraftInRangeCallsigns() const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->getAircraftInRangeCallsigns(); } int CContextNetwork::getAircraftInRangeCount() const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->getAircraftInRangeCount(); } bool CContextNetwork::isAircraftInRange(const CCallsign &callsign) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->isAircraftInRange(callsign); } bool CContextNetwork::isVtolAircraft(const CCallsign &callsign) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->isVtolAircraft(callsign); } CSimulatedAircraft CContextNetwork::getAircraftInRangeForCallsign(const CCallsign &callsign) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign; } return m_airspace->getAircraftInRangeForCallsign(callsign); } CAircraftModel CContextNetwork::getAircraftInRangeModelForCallsign(const CCallsign &callsign) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign; } return m_airspace->getAircraftInRangeModelForCallsign(callsign); } CStatusMessageList CContextNetwork::getReverseLookupMessages(const CCallsign &callsign) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign; } return m_airspace->getReverseLookupMessages(callsign); } ReverseLookupLogging CContextNetwork::isReverseLookupMessagesEnabled() const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->isReverseLookupMessagesEnabled(); } void CContextNetwork::enableReverseLookupMessages(ReverseLookupLogging enable) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << enable; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << enable; } const ReverseLookupLogging revEnabled = m_airspace->isReverseLookupMessagesEnabled(); if (revEnabled == enable) { return; } m_airspace->enableReverseLookupMessages(enable); @@ -969,76 +969,76 @@ namespace BlackCore CStatusMessageList CContextNetwork::getAircraftPartsHistory(const CCallsign &callsign) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign; } return m_airspace->getAircraftPartsHistory(callsign); } CAircraftPartsList CContextNetwork::getRemoteAircraftParts(const CCallsign &callsign) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign; } return m_airspace->remoteAircraftParts(callsign); } int CContextNetwork::getRemoteAircraftSupportingPartsCount() const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->getRemoteAircraftSupportingPartsCount(); } bool CContextNetwork::isAircraftPartsHistoryEnabled() const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->isAircraftPartsHistoryEnabled(); } void CContextNetwork::enableAircraftPartsHistory(bool enabled) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << enabled; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << enabled; } m_airspace->enableAircraftPartsHistory(enabled); emit IContext::changedLogOrDebugSettings(); } int CContextNetwork::aircraftSituationsAdded() const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->aircraftSituationsAdded(); } int CContextNetwork::aircraftPartsAdded() const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->aircraftPartsAdded(); } qint64 CContextNetwork::situationsLastModified(const CCallsign &callsign) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->situationsLastModified(callsign); } qint64 CContextNetwork::partsLastModified(const CCallsign &callsign) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->partsLastModified(callsign); } QString CContextNetwork::getNetworkStatistics(bool reset, const QString &separator) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_fsdClient) { return QString(); } return m_fsdClient->getNetworkStatisticsAsText(reset, separator); } bool CContextNetwork::setNetworkStatisticsEnable(bool enabled) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_fsdClient) { return false; } return m_fsdClient->setStatisticsEnable(enabled); } bool CContextNetwork::testAddAltitudeOffset(const CCallsign &callsign, const CLength &offset) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->testAddAltitudeOffset(callsign, offset); } @@ -1050,26 +1050,26 @@ namespace BlackCore CAtcStation CContextNetwork::getOnlineStationForCallsign(const CCallsign &callsign) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign; } return m_airspace->getAtcStationsOnline().findFirstByCallsign(callsign); } CAtcStationList CContextNetwork::getOnlineStationsForFrequency(const CFrequency &frequency, CComSystem::ChannelSpacing channelSpacing) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->getAtcStationsOnline().findIfFrequencyIsWithinSpacing(frequency, channelSpacing); } bool CContextNetwork::isOnlineStation(const CCallsign &callsign) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign; } return m_airspace->getAtcStationsOnline().containsCallsign(callsign); } void CContextNetwork::requestAircraftDataUpdates() { if (!canUseAirspaceMonitor()) { return; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!this->isConnected()) { return; } m_airspace->requestAircraftDataUpdates(); @@ -1079,7 +1079,7 @@ namespace BlackCore void CContextNetwork::requestAtisUpdates() { if (!canUseAirspaceMonitor()) { return; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!this->isConnected()) { return; } m_airspace->requestAtisUpdates(); @@ -1089,7 +1089,7 @@ namespace BlackCore bool CContextNetwork::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRendering) { if (!canUseAirspaceMonitor()) { return false; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enabledForRendering; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign << enabledForRendering; } const bool c = m_airspace->updateAircraftEnabled(callsign, enabledForRendering); if (c) { @@ -1103,14 +1103,14 @@ namespace BlackCore bool CContextNetwork::setAircraftEnabledFlag(const CCallsign &callsign, bool enabledForRendering) { if (!canUseAirspaceMonitor()) { return false; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign; } return m_airspace->setAircraftEnabledFlag(callsign, enabledForRendering); } bool CContextNetwork::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator) { if (!canUseAirspaceMonitor()) { return false; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << model; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign << model; } const bool c = m_airspace->updateAircraftModel(callsign, model, originator); if (c) { @@ -1124,7 +1124,7 @@ namespace BlackCore bool CContextNetwork::updateAircraftNetworkModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator) { if (!canUseAirspaceMonitor()) { return false; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << model; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign << model; } const bool c = m_airspace->updateAircraftNetworkModel(callsign, model, originator); if (c) { @@ -1137,7 +1137,7 @@ namespace BlackCore bool CContextNetwork::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates) { if (!canUseAirspaceMonitor()) { return false; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enableFastPositonUpdates; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign << enableFastPositonUpdates; } const bool c = m_airspace->updateFastPositionEnabled(callsign, enableFastPositonUpdates); if (c) { @@ -1150,7 +1150,7 @@ namespace BlackCore bool CContextNetwork::updateAircraftSupportingGndFLag(const CCallsign &callsign, bool supportGndFlag) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << supportGndFlag; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign << supportGndFlag; } const bool c = m_airspace->setClientGndCapability(callsign, supportGndFlag); if (c) { @@ -1164,7 +1164,7 @@ namespace BlackCore bool CContextNetwork::updateCG(const Aviation::CCallsign &callsign, const CLength &cg) { if (!canUseAirspaceMonitor()) { return false; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << cg.valueRoundedWithUnit(1); } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign << cg.valueRoundedWithUnit(1); } const bool c = m_airspace->updateCG(callsign, cg); return c; } @@ -1172,7 +1172,7 @@ namespace BlackCore CCallsignSet CContextNetwork::updateCGForModel(const QString &modelString, const CLength &cg) { if (!canUseAirspaceMonitor()) { return {}; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << modelString << cg.valueRoundedWithUnit(1); } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << modelString << cg.valueRoundedWithUnit(1); } const CCallsignSet set = m_airspace->updateCGForModel(modelString, cg); return set; } @@ -1180,7 +1180,7 @@ namespace BlackCore bool CContextNetwork::updateCGAndModelString(const CCallsign &callsign, const CLength &cg, const QString &modelString) { if (!canUseAirspaceMonitor()) { return false; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << cg.valueRoundedWithUnit(1) << modelString; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign << cg.valueRoundedWithUnit(1) << modelString; } const bool c = m_airspace->updateCGAndModelString(callsign, cg, modelString); return c; } @@ -1188,7 +1188,7 @@ namespace BlackCore void CContextNetwork::requestAtcBookingsUpdate() const { if (!canUseAirspaceMonitor()) { return; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } m_airspace->requestAtcBookingsUpdate(); } @@ -1252,7 +1252,7 @@ namespace BlackCore int CContextNetwork::reInitializeAllAircraft() { if (!canUseAirspaceMonitor()) { return 0; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_airspace->reInitializeAllAircraft(); } @@ -1304,14 +1304,14 @@ namespace BlackCore void CContextNetwork::setFastPositionEnabledCallsigns(CCallsignSet &callsigns) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsigns; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsigns; } Q_ASSERT(m_fsdClient); m_fsdClient->setInterimPositionReceivers(callsigns); } CCallsignSet CContextNetwork::getFastPositionEnabledCallsigns() const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } Q_ASSERT(m_fsdClient); return m_fsdClient->getInterimPositionReceivers(); } @@ -1319,55 +1319,55 @@ namespace BlackCore QString CContextNetwork::getLibraryInfo(bool detailed) const { if (!this->canUseFsd()) { return QString(); } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << detailed; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << detailed; } return ""; } void CContextNetwork::testRequestAircraftConfig(const CCallsign &callsign) { if (!this->canUseFsd()) { return; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign; } m_fsdClient->sendClientQueryAircraftConfig(callsign); } void CContextNetwork::testCreateDummyOnlineAtcStations(int number) { if (!this->canUseAirspaceMonitor()) { return; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << number; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << number; } m_airspace->testCreateDummyOnlineAtcStations(number); } void CContextNetwork::testAddAircraftParts(const CCallsign &callsign, const CAircraftParts &parts, bool incremental) { if (!this->canUseAirspaceMonitor()) { return; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << parts << incremental; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << parts << incremental; } m_airspace->testAddAircraftParts(callsign, parts, incremental); } void CContextNetwork::testReceivedAtisMessage(const CCallsign &callsign, const CInformationMessage &msg) { if (!this->canUseFsd()) { return; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign.asString(); } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign.asString(); } emit this->fsdClient()->atisReplyReceived(callsign, msg); } void CContextNetwork::testReceivedTextMessages(const CTextMessageList &textMessages) { if (!this->canUseFsd()) { return; } - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << textMessages.toQString(); } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << textMessages.toQString(); } emit this->fsdClient()->textMessagesReceived(textMessages); } CMetar CContextNetwork::getMetarForAirport(const CAirportIcaoCode &airportIcaoCode) const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << airportIcaoCode; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << airportIcaoCode; } if (!sApp || !sApp->getWebDataServices()) { return {}; } return sApp->getWebDataServices()->getMetarForAirport(airportIcaoCode); } CAtcStationList CContextNetwork::getSelectedAtcStations() const { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } CAtcStation com1Station = m_airspace->getAtcStationForComUnit(this->ownAircraft().getCom1System()); CAtcStation com2Station = m_airspace->getAtcStationForComUnit(this->ownAircraft().getCom2System()); diff --git a/src/blackcore/context/contextownaircraftimpl.cpp b/src/blackcore/context/contextownaircraftimpl.cpp index 825205dce..cd59d5d2e 100644 --- a/src/blackcore/context/contextownaircraftimpl.cpp +++ b/src/blackcore/context/contextownaircraftimpl.cpp @@ -89,21 +89,21 @@ namespace BlackCore CSimulatedAircraft CContextOwnAircraft::getOwnAircraft() const { - if (m_debugEnabled) {CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) {CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } QReadLocker l(&m_lockAircraft); return m_ownAircraft; } CComSystem CContextOwnAircraft::getOwnComSystem(CComSystem::ComUnit unit) const { - if (m_debugEnabled) {CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) {CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } QReadLocker l(&m_lockAircraft); return m_ownAircraft.getComSystem(unit); } CTransponder CContextOwnAircraft::getOwnTransponder() const { - if (m_debugEnabled) {CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) {CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } QReadLocker l(&m_lockAircraft); return m_ownAircraft.getTransponder(); } @@ -334,7 +334,7 @@ namespace BlackCore bool CContextOwnAircraft::updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude, const CAltitude &pressureAltitude) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << position << altitude; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << position << altitude; } QWriteLocker l(&m_lockAircraft); bool changed = (m_ownAircraft.getPosition() != position); if (changed) { m_ownAircraft.setPosition(position); } @@ -355,7 +355,7 @@ namespace BlackCore bool CContextOwnAircraft::updateCockpit(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder, const CIdentifier &originator) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << com1 << com2 << transponder; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << com1 << com2 << transponder; } bool changed; { QWriteLocker l(&m_lockAircraft); @@ -372,7 +372,7 @@ namespace BlackCore bool CContextOwnAircraft::updateTransponderMode(const CTransponder::TransponderMode &transponderMode, const CIdentifier &originator) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << transponderMode; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << transponderMode; } bool changed; { QWriteLocker l(&m_lockAircraft); @@ -476,7 +476,7 @@ namespace BlackCore void CContextOwnAircraft::setAudioOutputVolume(int outputVolume) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << outputVolume; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << outputVolume; } CContextAudioBase *audio = qobject_cast(this->getIContextAudio()); if (audio) { audio->setVoiceOutputVolume(outputVolume); } } diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index a76ee35c8..2401b7d2f 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -198,14 +198,14 @@ namespace BlackCore int CContextSimulator::checkListeners() { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_plugins) { return 0; } return m_plugins->checkAvailableListeners(); } int CContextSimulator::getSimulatorStatus() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return 0; } return m_simulatorPlugin.second->getSimulatorStatus(); } @@ -213,7 +213,7 @@ namespace BlackCore CSimulatorPluginInfo CContextSimulator::getSimulatorPluginInfo() const { static const CSimulatorPluginInfo unspecified; - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return unspecified; } if (m_simulatorPlugin.first.getSimulator().contains("emulated", Qt::CaseInsensitive)) { return m_simulatorPlugin.second->getSimulatorPluginInfo(); } return m_simulatorPlugin.first; @@ -221,14 +221,14 @@ namespace BlackCore CSimulatorInternals CContextSimulator::getSimulatorInternals() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return CSimulatorInternals(); } return m_simulatorPlugin.second->getSimulatorInternals(); } CAirportList CContextSimulator::getAirportsInRange(bool recalculateDistance) const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } // If no ISimulator object is available, return a dummy. if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return CAirportList(); } return m_simulatorPlugin.second->getAirportsInRange(recalculateDistance); @@ -236,7 +236,7 @@ namespace BlackCore CAircraftModelList CContextSimulator::getModelSet() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } const CSimulatorInfo simulator = this->getModelSetLoaderSimulator(); if (!simulator.isSingleSimulator()) { return CAircraftModelList(); } @@ -246,7 +246,7 @@ namespace BlackCore CSimulatorInfo CContextSimulator::getModelSetLoaderSimulator() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (m_simulatorPlugin.second) { if (m_simulatorPlugin.second->isConnected()) @@ -265,7 +265,7 @@ namespace BlackCore void CContextSimulator::setModelSetLoaderSimulator(const CSimulatorInfo &simulator) { Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Need single simulator"); - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (this->isSimulatorAvailable()) { return; } // if a plugin is loaded, do ignore this m_modelSetSimulator.set(simulator); const CAircraftModelList models = this->getModelSet(); // cache synced @@ -274,13 +274,13 @@ namespace BlackCore CSimulatorInfo CContextSimulator::simulatorsWithInitializedModelSet() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().simulatorsWithInitializedCache(); } CStatusMessageList CContextSimulator::verifyPrerequisites() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } CStatusMessageList msgs; if (!sApp || !sApp->isNetworkAccessible()) { @@ -296,20 +296,20 @@ namespace BlackCore QStringList CContextSimulator::getModelSetStrings() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return this->getModelSet().getModelStringList(false); } bool CContextSimulator::isKnownModelInSet(const QString &modelString) const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } const bool known = this->getModelSet().containsModelString(modelString); return known; } int CContextSimulator::removeModelsFromSet(const CAircraftModelList &removeModels) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (removeModels.isEmpty()) { return 0; } const CSimulatorInfo simulator = m_modelSetSimulator.get(); if (!simulator.isSingleSimulator()) { return 0; } @@ -326,48 +326,48 @@ namespace BlackCore QStringList CContextSimulator::getModelSetCompleterStrings(bool sorted) const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << sorted; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << sorted; } return this->getModelSet().toCompleterStrings(sorted); } int CContextSimulator::getModelSetCount() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return 0; } return this->getModelSet().size(); } void CContextSimulator::disableModelsForMatching(const CAircraftModelList &removedModels, bool incremental) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return; } m_aircraftMatcher.disableModelsForMatching(removedModels, incremental); } CAircraftModelList CContextSimulator::getDisabledModelsForMatching() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return CAircraftModelList(); } return m_aircraftMatcher.getDisabledModelsForMatching(); } void CContextSimulator::restoreDisabledModels() { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return; } m_aircraftMatcher.restoreDisabledModels(); } bool CContextSimulator::isValidationInProgress() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_validator) { return false; } return m_validator->isValidating(); } bool CContextSimulator::triggerModelSetValidation(const CSimulatorInfo &simulator) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_validator) { return false; } const QString simDir = simulator.isSingleSimulator() ? m_multiSimulatorSettings.getSimulatorDirectoryOrDefault(simulator) : ""; return m_validator->triggerValidation(simulator, simDir); @@ -375,7 +375,7 @@ namespace BlackCore CAircraftModelList CContextSimulator::getModelSetModelsStartingWith(const QString &modelString) const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << modelString; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << modelString; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return CAircraftModelList(); } return this->getModelSet().findModelsStartingWith(modelString); @@ -383,7 +383,7 @@ namespace BlackCore bool CContextSimulator::setTimeSynchronization(bool enable, const CTime &offset) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return false; } const bool c = m_simulatorPlugin.second->setTimeSynchronization(enable, offset); @@ -395,42 +395,42 @@ namespace BlackCore bool CContextSimulator::isTimeSynchronized() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return false; } return m_simulatorPlugin.second->isTimeSynchronized(); } CInterpolationAndRenderingSetupGlobal CContextSimulator::getInterpolationAndRenderingSetupGlobal() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return m_renderSettings.get(); } return m_simulatorPlugin.second->getInterpolationSetupGlobal(); } CInterpolationSetupList CContextSimulator::getInterpolationAndRenderingSetupsPerCallsign() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return CInterpolationSetupList(); } return m_simulatorPlugin.second->getInterpolationSetupsPerCallsign(); } CInterpolationAndRenderingSetupPerCallsign CContextSimulator::getInterpolationAndRenderingSetupPerCallsignOrDefault(const CCallsign &callsign) const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return CInterpolationAndRenderingSetupPerCallsign(); } return m_simulatorPlugin.second->getInterpolationSetupPerCallsignOrDefault(callsign); } bool CContextSimulator::setInterpolationAndRenderingSetupsPerCallsign(const CInterpolationSetupList &setups, bool ignoreSameAsGlobal) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return false; } return m_simulatorPlugin.second->setInterpolationSetupsPerCallsign(setups, ignoreSameAsGlobal); } void CContextSimulator::setInterpolationAndRenderingSetupGlobal(const CInterpolationAndRenderingSetupGlobal &setup) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << setup; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << setup; } // anyway save for future reference const CStatusMessage m = m_renderSettings.setAndSave(setup); @@ -443,7 +443,7 @@ namespace BlackCore CStatusMessageList CContextSimulator::getInterpolationMessages(const CCallsign &callsign) const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (callsign.isEmpty()) { return CStatusMessageList(); } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return CStatusMessageList(); } return m_simulatorPlugin.second->getInterpolationMessages(callsign); @@ -451,7 +451,7 @@ namespace BlackCore CTime CContextSimulator::getTimeSynchronizationOffset() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return CTime(0, CTimeUnit::hrmin()); } return m_simulatorPlugin.second->getTimeSynchronizationOffset(); } @@ -975,19 +975,19 @@ namespace BlackCore CStatusMessageList CContextSimulator::getMatchingMessages(const CCallsign &callsign) const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign; } return m_matchingMessages[callsign]; } MatchingLog CContextSimulator::isMatchingMessagesEnabled() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_logMatchingMessages; } void CContextSimulator::enableMatchingMessages(MatchingLog enabled) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << matchingLogToString(enabled); } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << matchingLogToString(enabled); } if (m_logMatchingMessages == enabled) { return; } m_logMatchingMessages = enabled; emit IContext::changedLogOrDebugSettings(); @@ -995,7 +995,7 @@ namespace BlackCore CMatchingStatistics CContextSimulator::getCurrentMatchingStatistics(bool missingOnly) const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << missingOnly; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << missingOnly; } const CMatchingStatistics statistics = m_aircraftMatcher.getCurrentStatistics(); return missingOnly ? statistics.findMissingOnly() : @@ -1004,7 +1004,7 @@ namespace BlackCore void CContextSimulator::setMatchingSetup(const CAircraftMatcherSetup &setup) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << setup.toQString(); } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << setup.toQString(); } m_aircraftMatcher.setSetup(setup); const CStatusMessage msg = m_matchingSettings.setAndSave(setup); CLogMessage::preformatted(msg); @@ -1012,13 +1012,13 @@ namespace BlackCore CAircraftMatcherSetup CContextSimulator::getMatchingSetup() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } return m_aircraftMatcher.getSetup(); } CStatusMessageList CContextSimulator::copyFsxTerrainProbe(const CSimulatorInfo &simulator) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << simulator.toQString(); } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << simulator.toQString(); } CStatusMessageList msgs; if (!simulator.isFsxP3DFamily()) @@ -1098,7 +1098,7 @@ namespace BlackCore else if (p1 == "parts") { rs.setEnabledAircraftParts(on); } else { return false; } this->setInterpolationAndRenderingSetupGlobal(rs); - CLogMessage(this, CLogCategory::cmdLine()).info(u"Setup is: '%1'") << rs.toQString(true); + CLogMessage(this, CLogCategories::cmdLine()).info(u"Setup is: '%1'") << rs.toQString(true); return true; } if (parser.matchesCommand("plugin") || parser.matchesCommand("drv") || parser.matchesCommand("driver")) @@ -1117,21 +1117,21 @@ namespace BlackCore void CContextSimulator::highlightAircraft(const CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const CTime &displayTime) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << aircraftToHighlight << enableHighlight << displayTime; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << aircraftToHighlight << enableHighlight << displayTime; } if (!m_simulatorPlugin.second) { return; } m_simulatorPlugin.second->highlightAircraft(aircraftToHighlight, enableHighlight, displayTime); } bool CContextSimulator::followAircraft(const CCallsign &callsign) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign; } if (!m_simulatorPlugin.second) { return false; } return m_simulatorPlugin.second->followAircraft(callsign); } void CContextSimulator::recalculateAllAircraft() { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second) { return; } m_simulatorPlugin.second->recalculateAllAircraft(); } @@ -1155,41 +1155,41 @@ namespace BlackCore bool CContextSimulator::isWeatherActivated() const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return m_isWeatherActivated; } return m_simulatorPlugin.second->isWeatherActivated(); } void CContextSimulator::setWeatherActivated(bool activated) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return; } m_simulatorPlugin.second->setWeatherActivated(activated); } void CContextSimulator::requestWeatherGrid(const CCoordinateGeodetic &position, const CIdentifier &identifier) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << identifier; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << identifier; } m_weatherManager.requestWeatherGrid(position, identifier); } bool CContextSimulator::requestElevationBySituation(const CAircraftSituation &situation) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << situation; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << situation; } if (!m_simulatorPlugin.second || !m_simulatorPlugin.second->isConnected()) { return false; } return m_simulatorPlugin.second->requestElevationBySituation(situation); } CElevationPlane CContextSimulator::findClosestElevationWithinRange(const CCoordinateGeodetic &reference, const CLength &range) const { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << reference.convertToQString(true) << range; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << reference.convertToQString(true) << range; } if (!m_simulatorPlugin.second || !m_simulatorPlugin.second->isConnected()) { return CElevationPlane::null(); } return m_simulatorPlugin.second->findClosestElevationWithinRange(reference, range); } int CContextSimulator::doMatchingsAgain() { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } const CCallsignSet callsigns = this->getAircraftInRangeCallsigns(); if (callsigns.isEmpty()) { return 0; } int delayMs = 25; @@ -1208,7 +1208,7 @@ namespace BlackCore bool CContextSimulator::doMatchingAgain(const CCallsign &callsign) { - if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign.asString(); } + if (m_debugEnabled) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << callsign.asString(); } if (!this->isAircraftInRange(callsign)) { return false; } if (!this->isSimulatorAvailable()) { return false; } diff --git a/src/blackcore/db/backgrounddataupdater.cpp b/src/blackcore/db/backgrounddataupdater.cpp index 7a14c49c9..e469e6ac1 100644 --- a/src/blackcore/db/backgrounddataupdater.cpp +++ b/src/blackcore/db/backgrounddataupdater.cpp @@ -28,9 +28,9 @@ namespace BlackCore { namespace Db { - const CLogCategoryList &CBackgroundDataUpdater::getLogCategories() + const QStringList &CBackgroundDataUpdater::getLogCategories() { - static const CLogCategoryList cats({ CLogCategory::worker(), CLogCategory::modelSetCache(), CLogCategory::modelCache() }); + static const QStringList cats({ CLogCategories::worker(), CLogCategories::modelSetCache(), CLogCategories::modelCache() }); return cats; } diff --git a/src/blackcore/db/backgrounddataupdater.h b/src/blackcore/db/backgrounddataupdater.h index bc33263d6..bfd6f901d 100644 --- a/src/blackcore/db/backgrounddataupdater.h +++ b/src/blackcore/db/backgrounddataupdater.h @@ -33,7 +33,7 @@ namespace BlackCore public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor CBackgroundDataUpdater(QObject *owner); diff --git a/src/blackcore/db/databaseauthentication.cpp b/src/blackcore/db/databaseauthentication.cpp index 51c219969..d57ebb4fb 100644 --- a/src/blackcore/db/databaseauthentication.cpp +++ b/src/blackcore/db/databaseauthentication.cpp @@ -35,9 +35,9 @@ namespace BlackCore { namespace Db { - const CLogCategoryList &CDatabaseAuthenticationService::getLogCategories() + const QStringList &CDatabaseAuthenticationService::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::swiftDbWebservice() }; + static const QStringList cats { CLogCategories::swiftDbWebservice() }; return cats; } diff --git a/src/blackcore/db/databaseauthentication.h b/src/blackcore/db/databaseauthentication.h index d9b8def7e..4ee0102dc 100644 --- a/src/blackcore/db/databaseauthentication.h +++ b/src/blackcore/db/databaseauthentication.h @@ -34,7 +34,7 @@ namespace BlackCore public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor CDatabaseAuthenticationService(QObject *parent = nullptr); diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp index 64971f88f..3ffe83872 100644 --- a/src/blackcore/db/databasereader.cpp +++ b/src/blackcore/db/databasereader.cpp @@ -710,12 +710,12 @@ namespace BlackCore return ts.toUTC().toString(Qt::ISODate); } - const CLogCategoryList &CDatabaseReader::getLogCategories() + const QStringList &CDatabaseReader::getLogCategories() { - static const CLogCategoryList cats = CThreadedReader::getLogCategories().with( + static const QStringList cats = CThreadedReader::getLogCategories() + QStringList { - CLogCategory::swiftDbWebservice(), CLogCategory::webservice() - }); + CLogCategories::swiftDbWebservice(), CLogCategories::webservice() + }; return cats; } diff --git a/src/blackcore/db/databasereader.h b/src/blackcore/db/databasereader.h index 358e8c921..51f1f0227 100644 --- a/src/blackcore/db/databasereader.h +++ b/src/blackcore/db/databasereader.h @@ -283,7 +283,7 @@ namespace BlackCore virtual bool readFromJsonFilesInBackground(const QString &dir, BlackMisc::Network::CEntityFlags::Entity whatToRead, bool overrideNewer) = 0; //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Transform JSON data to response struct data //! \private used also for samples, that`s why it is declared public diff --git a/src/blackcore/db/databaseutils.cpp b/src/blackcore/db/databaseutils.cpp index b3ef08393..35e3aa631 100644 --- a/src/blackcore/db/databaseutils.cpp +++ b/src/blackcore/db/databaseutils.cpp @@ -23,9 +23,9 @@ namespace BlackCore { namespace Db { - const CLogCategoryList &CDatabaseUtils::getLogCategories() + const QStringList &CDatabaseUtils::getLogCategories() { - static const BlackMisc::CLogCategoryList cats { CLogCategory::modelCache(), CLogCategory::modelSetCache() }; + static const QStringList cats { CLogCategories::modelCache(), CLogCategories::modelSetCache() }; return cats; } diff --git a/src/blackcore/db/databaseutils.h b/src/blackcore/db/databaseutils.h index adbac9ad7..a1c1c394f 100644 --- a/src/blackcore/db/databaseutils.h +++ b/src/blackcore/db/databaseutils.h @@ -34,7 +34,7 @@ namespace BlackCore CDatabaseUtils() = delete; //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Consolidate models with simulator model data (aka "models on disk") //! \remark kept here with the other consolidate functions, but actually DB independent diff --git a/src/blackcore/db/databasewriter.cpp b/src/blackcore/db/databasewriter.cpp index 059448862..c13f60c78 100644 --- a/src/blackcore/db/databasewriter.cpp +++ b/src/blackcore/db/databasewriter.cpp @@ -150,11 +150,11 @@ namespace BlackCore return n; } - const CLogCategoryList &CDatabaseWriter::getLogCategories() + const QStringList &CDatabaseWriter::getLogCategories() { - static const CLogCategoryList cats + static const QStringList cats { - CLogCategory::swiftDbWebservice(), CLogCategory::webservice() + CLogCategories::swiftDbWebservice(), CLogCategories::webservice() }; return cats; } @@ -208,7 +208,7 @@ namespace BlackCore void CDatabaseWriter::postedAutoPublishResponse(QNetworkReply *nwReplyPtr) { - static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::swiftDbWebservice()})); + static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategories::swiftDbWebservice()})); QScopedPointer nwReply(nwReplyPtr); if (m_shutdown || !sApp) { diff --git a/src/blackcore/db/databasewriter.h b/src/blackcore/db/databasewriter.h index 280fb55a6..092bb69d5 100644 --- a/src/blackcore/db/databasewriter.h +++ b/src/blackcore/db/databasewriter.h @@ -59,7 +59,7 @@ namespace BlackCore const BlackMisc::Network::CUrlLogList &getWriteLog() const { return m_writeLog; } //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); signals: //! Published models, the response to \sa asyncPublishModels diff --git a/src/blackcore/db/networkwatchdog.cpp b/src/blackcore/db/networkwatchdog.cpp index e9d306baa..2af2a7c2d 100644 --- a/src/blackcore/db/networkwatchdog.cpp +++ b/src/blackcore/db/networkwatchdog.cpp @@ -22,12 +22,12 @@ namespace BlackCore { namespace Db { - const CLogCategoryList &CNetworkWatchdog::getLogCategories() + const QStringList &CNetworkWatchdog::getLogCategories() { - static const CLogCategoryList cats = CContinuousWorker::getLogCategories().with( + static const QStringList cats = CContinuousWorker::getLogCategories() + QStringList { - CLogCategory::swiftDbWebservice(), CLogCategory::webservice(), CLogCategory::network() - }); + CLogCategories::swiftDbWebservice(), CLogCategories::webservice(), CLogCategories::network() + }; return cats; } diff --git a/src/blackcore/db/networkwatchdog.h b/src/blackcore/db/networkwatchdog.h index a7e7784b8..8590f0613 100644 --- a/src/blackcore/db/networkwatchdog.h +++ b/src/blackcore/db/networkwatchdog.h @@ -32,7 +32,7 @@ namespace BlackCore public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Ctor explicit CNetworkWatchdog(bool networkAccessible, QObject *owner); diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/blackcore/fsd/fsdclient.cpp index 51a2bfef7..e5a4c7ebb 100644 --- a/src/blackcore/fsd/fsdclient.cpp +++ b/src/blackcore/fsd/fsdclient.cpp @@ -82,13 +82,13 @@ namespace BlackCore return escaped; } - const CLogCategoryList &CFSDClient::getLogCategories() + const QStringList &CFSDClient::getLogCategories() { - static const CLogCategoryList cats = [] + static const QStringList cats = [] { - CLogCategoryList cl = CContinuousWorker::getLogCategories(); - cl.push_back(CLogCategory::network()); - cl.push_back(CLogCategory::fsd()); + QStringList cl = CContinuousWorker::getLogCategories(); + cl.push_back(CLogCategories::network()); + cl.push_back(CLogCategories::fsd()); return cl; }(); return cats; diff --git a/src/blackcore/fsd/fsdclient.h b/src/blackcore/fsd/fsdclient.h index 9ac38cc53..f5dd1f2bb 100644 --- a/src/blackcore/fsd/fsdclient.h +++ b/src/blackcore/fsd/fsdclient.h @@ -84,7 +84,7 @@ namespace BlackCore public: //! Categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Ctor CFSDClient(BlackMisc::Network::IClientProvider *clientProvider, diff --git a/src/blackcore/fsd/serializer.cpp b/src/blackcore/fsd/serializer.cpp index f8052bb8e..41791196a 100644 --- a/src/blackcore/fsd/serializer.cpp +++ b/src/blackcore/fsd/serializer.cpp @@ -42,7 +42,7 @@ namespace BlackCore BLACK_VERIFY_X(false, Q_FUNC_INFO, msg); } - CLogMessage(CLogCategory::fsd()).info(u"%1. Please report this to the DEVELOPERS!") << message; + CLogMessage(CLogCategories::fsd()).info(u"%1. Please report this to the DEVELOPERS!") << message; } } diff --git a/src/blackcore/setupreader.cpp b/src/blackcore/setupreader.cpp index 9fcf6c229..5dd1ed956 100644 --- a/src/blackcore/setupreader.cpp +++ b/src/blackcore/setupreader.cpp @@ -432,9 +432,9 @@ namespace BlackCore } } - const CLogCategoryList &CSetupReader::getLogCategories() + const QStringList &CSetupReader::getLogCategories() { - static const CLogCategoryList cats({ CLogCategory("swift.setupreader"), CLogCategory::webservice(), CLogCategory::startup()}); + static const QStringList cats({ "swift.setupreader", CLogCategories::webservice(), CLogCategories::startup()}); return cats; } diff --git a/src/blackcore/setupreader.h b/src/blackcore/setupreader.h index b27a0ff0f..b3d98faa9 100644 --- a/src/blackcore/setupreader.h +++ b/src/blackcore/setupreader.h @@ -50,7 +50,7 @@ namespace BlackCore public: //! Categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Has a given cmd line argument for bootstrap URL? bool hasCmdLineBootstrapUrl() const; diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index 993065908..75647140a 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -46,9 +46,9 @@ using namespace BlackCore::Db; namespace BlackCore { - const CLogCategoryList &ISimulator::getLogCategories() + const QStringList &ISimulator::getLogCategories() { - static const CLogCategoryList cats({ CLogCategory::driver(), CLogCategory::plugin() }); + static const QStringList cats({ CLogCategories::driver(), CLogCategories::plugin() }); return cats; } diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index edac99407..5f55f8e5c 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -82,7 +82,7 @@ namespace BlackCore Q_FLAG(SimulatorStatus) //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Render all aircraft if number of aircraft >= MaxAircraftInfinite const int MaxAircraftInfinite = 100; diff --git a/src/blackcore/threadedreader.cpp b/src/blackcore/threadedreader.cpp index ab50db3a1..560b6b6f7 100644 --- a/src/blackcore/threadedreader.cpp +++ b/src/blackcore/threadedreader.cpp @@ -26,9 +26,9 @@ using namespace BlackCore::Vatsim; namespace BlackCore { - const CLogCategoryList &CThreadedReader::getLogCategories() + const QStringList &CThreadedReader::getLogCategories() { - static const BlackMisc::CLogCategoryList cats { BlackMisc::CLogCategory::worker() }; + static const QStringList cats { BlackMisc::CLogCategories::worker() }; return cats; } @@ -218,7 +218,7 @@ namespace BlackCore { if (msg.isEmpty()) { return; } CStatusMessage logMsg(msg); - logMsg.addCategory(CLogCategory::dataInconsistency()); + logMsg.addCategory(CLogCategories::dataInconsistency()); if (funcInfo) { const QByteArray m(logMsg.getMessage().toLatin1()); diff --git a/src/blackcore/threadedreader.h b/src/blackcore/threadedreader.h index 42e1a9866..81a09410a 100644 --- a/src/blackcore/threadedreader.h +++ b/src/blackcore/threadedreader.h @@ -38,7 +38,7 @@ namespace BlackCore public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Destructor virtual ~CThreadedReader(); diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index 194d0b25e..1d28b2db5 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/blackcore/webdataservices.cpp @@ -1004,9 +1004,9 @@ namespace BlackCore return entities; } - const CLogCategoryList &CWebDataServices::getLogCategories() + const QStringList &CWebDataServices::getLogCategories() { - static const BlackMisc::CLogCategoryList cats { CLogCategory("swift.datareader"), CLogCategory::webservice() }; + static const QStringList cats { "swift.datareader", CLogCategories::webservice() }; return cats; } diff --git a/src/blackcore/webdataservices.h b/src/blackcore/webdataservices.h index ed910bc3f..7c604aa7f 100644 --- a/src/blackcore/webdataservices.h +++ b/src/blackcore/webdataservices.h @@ -91,7 +91,7 @@ namespace BlackCore public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor, only allowed from BlackCore::CApplication CWebDataServices(CWebReaderFlags::WebReader readerFlags, const BlackCore::Db::CDatabaseReaderConfigList &dbReaderConfig, BlackMisc::Restricted, QObject *parent = nullptr); diff --git a/src/blackgui/components/copyconfigurationcomponent.cpp b/src/blackgui/components/copyconfigurationcomponent.cpp index a61eacfde..8a72ffc27 100644 --- a/src/blackgui/components/copyconfigurationcomponent.cpp +++ b/src/blackgui/components/copyconfigurationcomponent.cpp @@ -38,9 +38,9 @@ namespace BlackGui { namespace Components { - const CLogCategoryList &CCopyConfigurationComponent::getLogCategories() + const QStringList &CCopyConfigurationComponent::getLogCategories() { - static const BlackMisc::CLogCategoryList cats { CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::guiComponent() }; return cats; } @@ -451,9 +451,9 @@ namespace BlackGui ui->tv_Source->setMinimumWidth(wView); } - const CLogCategoryList &CCopyConfigurationWizardPage::getLogCategories() + const QStringList &CCopyConfigurationWizardPage::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::wizard(), CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::wizard(), CLogCategories::guiComponent() }; return cats; } diff --git a/src/blackgui/components/copyconfigurationcomponent.h b/src/blackgui/components/copyconfigurationcomponent.h index da959b2ff..3090e8549 100644 --- a/src/blackgui/components/copyconfigurationcomponent.h +++ b/src/blackgui/components/copyconfigurationcomponent.h @@ -34,7 +34,7 @@ namespace BlackGui public: //! Log.categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor explicit CCopyConfigurationComponent(QWidget *parent = nullptr); @@ -152,7 +152,7 @@ namespace BlackGui using QWizardPage::QWizardPage; //! Log.categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Set config void setConfigComponent(CCopyConfigurationComponent *config) { m_config = config; } diff --git a/src/blackgui/components/dbautostashingcomponent.cpp b/src/blackgui/components/dbautostashingcomponent.cpp index e5fa05eef..448d3bc2f 100644 --- a/src/blackgui/components/dbautostashingcomponent.cpp +++ b/src/blackgui/components/dbautostashingcomponent.cpp @@ -48,9 +48,9 @@ namespace BlackGui { namespace Components { - const CLogCategoryList &CDbAutoStashingComponent::getLogCategories() + const QStringList &CDbAutoStashingComponent::getLogCategories() { - static const BlackMisc::CLogCategoryList cats { CLogCategory::mapping(), CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::mapping(), CLogCategories::guiComponent() }; return cats; } diff --git a/src/blackgui/components/dbautostashingcomponent.h b/src/blackgui/components/dbautostashingcomponent.h index 98fd98324..187b09085 100644 --- a/src/blackgui/components/dbautostashingcomponent.h +++ b/src/blackgui/components/dbautostashingcomponent.h @@ -54,7 +54,7 @@ namespace BlackGui }; //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor explicit CDbAutoStashingComponent(QWidget *parent = nullptr); diff --git a/src/blackgui/components/dbmodelworkbenchcomponent.cpp b/src/blackgui/components/dbmodelworkbenchcomponent.cpp index a6553479e..df6e4b453 100644 --- a/src/blackgui/components/dbmodelworkbenchcomponent.cpp +++ b/src/blackgui/components/dbmodelworkbenchcomponent.cpp @@ -61,9 +61,9 @@ namespace BlackGui // void } - const CLogCategoryList &CDbModelWorkbenchComponent::getLogCategories() + const QStringList &CDbModelWorkbenchComponent::getLogCategories() { - static const CLogCategoryList l({ CLogCategory::modelGui(), CLogCategory::guiComponent() }); + static const QStringList l({ CLogCategories::modelGui(), CLogCategories::guiComponent() }); return l; } diff --git a/src/blackgui/components/dbmodelworkbenchcomponent.h b/src/blackgui/components/dbmodelworkbenchcomponent.h index 9656f715d..915f7e678 100644 --- a/src/blackgui/components/dbmodelworkbenchcomponent.h +++ b/src/blackgui/components/dbmodelworkbenchcomponent.h @@ -55,7 +55,7 @@ namespace BlackGui virtual ~CDbModelWorkbenchComponent() override; //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Own (installed) model for given model string BlackMisc::Simulation::CAircraftModel getOwnModelForModelString(const QString &modelString) const; diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp index 6620599df..fbfe3b68e 100644 --- a/src/blackgui/components/dbownmodelscomponent.cpp +++ b/src/blackgui/components/dbownmodelscomponent.cpp @@ -97,9 +97,9 @@ namespace BlackGui // void } - const CLogCategoryList &CDbOwnModelsComponent::getLogCategories() + const QStringList &CDbOwnModelsComponent::getLogCategories() { - static const CLogCategoryList l({ CLogCategory::modelGui(), CLogCategory::guiComponent() }); + static const QStringList l({ CLogCategories::modelGui(), CLogCategories::guiComponent() }); return l; } diff --git a/src/blackgui/components/dbownmodelscomponent.h b/src/blackgui/components/dbownmodelscomponent.h index 9e7977a64..c1c470a7a 100644 --- a/src/blackgui/components/dbownmodelscomponent.h +++ b/src/blackgui/components/dbownmodelscomponent.h @@ -66,7 +66,7 @@ namespace BlackGui virtual ~CDbOwnModelsComponent() override; //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Own (installed) model for given model string BlackMisc::Simulation::CAircraftModel getOwnModelForModelString(const QString &modelString) const; diff --git a/src/blackgui/components/dbownmodelsetformdialog.cpp b/src/blackgui/components/dbownmodelsetformdialog.cpp index 5e7fc102f..1a4f94197 100644 --- a/src/blackgui/components/dbownmodelsetformdialog.cpp +++ b/src/blackgui/components/dbownmodelsetformdialog.cpp @@ -30,9 +30,9 @@ namespace BlackGui { namespace Components { - const CLogCategoryList &CDbOwnModelSetFormDialog::getLogCategories() + const QStringList &CDbOwnModelSetFormDialog::getLogCategories() { - static const CLogCategoryList cats({ CLogCategory("swift.ownmodelset"), CLogCategory::guiComponent()}); + static const QStringList cats({ "swift.ownmodelset", CLogCategories::guiComponent()}); return cats; } diff --git a/src/blackgui/components/dbownmodelsetformdialog.h b/src/blackgui/components/dbownmodelsetformdialog.h index 3fdd05afd..2745f381d 100644 --- a/src/blackgui/components/dbownmodelsetformdialog.h +++ b/src/blackgui/components/dbownmodelsetformdialog.h @@ -36,7 +36,7 @@ namespace BlackGui public: //! Categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor explicit CDbOwnModelSetFormDialog(QWidget *parent = nullptr); diff --git a/src/blackgui/components/dbquickmappingwizard.cpp b/src/blackgui/components/dbquickmappingwizard.cpp index 2a79d98d1..b09058a25 100644 --- a/src/blackgui/components/dbquickmappingwizard.cpp +++ b/src/blackgui/components/dbquickmappingwizard.cpp @@ -72,9 +72,9 @@ namespace BlackGui CDbQuickMappingWizard::~CDbQuickMappingWizard() { } - const CLogCategoryList &CDbQuickMappingWizard::getLogCategories() + const QStringList &CDbQuickMappingWizard::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::mapping(), CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::mapping(), CLogCategories::guiComponent() }; return cats; } diff --git a/src/blackgui/components/dbquickmappingwizard.h b/src/blackgui/components/dbquickmappingwizard.h index cbebf2412..b00fef9e9 100644 --- a/src/blackgui/components/dbquickmappingwizard.h +++ b/src/blackgui/components/dbquickmappingwizard.h @@ -62,7 +62,7 @@ namespace BlackGui virtual bool validateCurrentPage() override; //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); protected: //! \copydoc QWizard::keyPressEvent diff --git a/src/blackgui/components/downloadcomponent.cpp b/src/blackgui/components/downloadcomponent.cpp index cd828b3df..3da6766d1 100644 --- a/src/blackgui/components/downloadcomponent.cpp +++ b/src/blackgui/components/downloadcomponent.cpp @@ -92,7 +92,7 @@ namespace BlackGui if (downloadDir.isEmpty()) { return; } // canceled if (!QDir(downloadDir).exists()) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).warning(u"'%1' is not a valid download directory") << downloadDir; + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).warning(u"'%1' is not a valid download directory") << downloadDir; this->showOverlayMessage(msg, CDownloadComponent::OverlayMsgTimeoutMs); return; } @@ -182,7 +182,7 @@ namespace BlackGui if (!sGui || !sGui->hasWebDataServices() || sGui->isShuttingDown()) { return false; } if (!this->existsDownloadDir()) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Invalid download directory"); + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Invalid download directory"); this->showOverlayMessage(msg, CDownloadComponent::OverlayMsgTimeoutMs); return false; } @@ -190,7 +190,7 @@ namespace BlackGui const CUrl download = remoteFile.getSmartUrl(); if (download.isEmpty()) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"No download URL for file name '%1'") << remoteFile.getBaseNameAndSize(); + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"No download URL for file name '%1'") << remoteFile.getBaseNameAndSize(); this->showOverlayMessage(msg, CDownloadComponent::OverlayMsgTimeoutMs); return false; } @@ -227,7 +227,7 @@ namespace BlackGui } else { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Starting download for '%1' failed") << download.getFullUrl(); + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Starting download for '%1' failed") << download.getFullUrl(); this->showOverlayMessage(msg, CDownloadComponent::OverlayMsgTimeoutMs); } return success; diff --git a/src/blackgui/components/firstmodelsetcomponent.cpp b/src/blackgui/components/firstmodelsetcomponent.cpp index 1690a7708..f82bf12df 100644 --- a/src/blackgui/components/firstmodelsetcomponent.cpp +++ b/src/blackgui/components/firstmodelsetcomponent.cpp @@ -34,9 +34,9 @@ namespace BlackGui { namespace Components { - const CLogCategoryList &CFirstModelSetComponent::getLogCategories() + const QStringList &CFirstModelSetComponent::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::modelGui() }; + static const QStringList cats { CLogCategories::modelGui() }; return cats; } diff --git a/src/blackgui/components/firstmodelsetcomponent.h b/src/blackgui/components/firstmodelsetcomponent.h index fbafd2569..0c0d43e23 100644 --- a/src/blackgui/components/firstmodelsetcomponent.h +++ b/src/blackgui/components/firstmodelsetcomponent.h @@ -38,7 +38,7 @@ namespace BlackGui public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor explicit CFirstModelSetComponent(QWidget *parent = nullptr); diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index 375a036c5..196654d0f 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -296,9 +296,9 @@ namespace BlackGui } } - const CLogCategoryList &CFlightPlanComponent::getLogCategories() + const QStringList &CFlightPlanComponent::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::flightPlan(), CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::flightPlan(), CLogCategories::guiComponent() }; return cats; } diff --git a/src/blackgui/components/flightplancomponent.h b/src/blackgui/components/flightplancomponent.h index 3c3848dd6..f0f09234d 100644 --- a/src/blackgui/components/flightplancomponent.h +++ b/src/blackgui/components/flightplancomponent.h @@ -87,7 +87,7 @@ namespace BlackGui const BlackMisc::Aviation::CFlightPlan &getSentFlightPlan() const { return m_sentFlightPlan; } //! Log.categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); private: static constexpr int OverlayTimeoutMs = 5000; diff --git a/src/blackgui/components/installxswiftbuscomponent.cpp b/src/blackgui/components/installxswiftbuscomponent.cpp index 2df5fa5da..9fe61e959 100644 --- a/src/blackgui/components/installxswiftbuscomponent.cpp +++ b/src/blackgui/components/installxswiftbuscomponent.cpp @@ -76,7 +76,7 @@ namespace BlackGui if (xPlanePluginDir.isEmpty()) { return; } // canceled if (!QDir(xPlanePluginDir).exists()) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).warning(u"'%1' is not a valid X-Plane plugin directory") << xPlanePluginDir; + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).warning(u"'%1' is not a valid X-Plane plugin directory") << xPlanePluginDir; this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); return; } @@ -92,7 +92,7 @@ namespace BlackGui if (downloadDir.isEmpty()) { return; } // canceled if (!QDir(downloadDir).exists()) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).warning(u"'%1' is not a valid download directory") << downloadDir; + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).warning(u"'%1' is not a valid download directory") << downloadDir; this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); return; } @@ -108,7 +108,7 @@ namespace BlackGui if (!downloadFile.exists()) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Cannot read downloaded file '%1'") << downloadFileName; + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Cannot read downloaded file '%1'") << downloadFileName; this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); return; } @@ -116,7 +116,7 @@ namespace BlackGui const QString xSwiftBusDirectory = this->xSwiftBusDir(); if (xSwiftBusDirectory.isEmpty()) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"No directory to install to'"); + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"No directory to install to'"); this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); return; } @@ -124,7 +124,7 @@ namespace BlackGui const QDir installDir(xSwiftBusDirectory); if (!installDir.exists()) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Directory '%1' does not exist") << xSwiftBusDirectory; + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Directory '%1' does not exist") << xSwiftBusDirectory; this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); return; } @@ -137,7 +137,7 @@ namespace BlackGui const bool removed = destFile.remove(); if (!removed) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Cannot remove '%1'") << destFileName; + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Cannot remove '%1'") << destFileName; this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); return; } @@ -147,7 +147,7 @@ namespace BlackGui const bool copied = QFile::copy(downloadFileName, destFileName); if (!copied) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Cannot copy '%1' to '%2'") << downloadFileName << destFileName; + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Cannot copy '%1' to '%2'") << downloadFileName << destFileName; this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); return; } @@ -156,7 +156,7 @@ namespace BlackGui const QFileInfo destFile(destFileName); if (!destFile.exists()) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"XSwiftBus file '%1' does not exist") << destFileName; + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"XSwiftBus file '%1' does not exist") << destFileName; this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); return; } @@ -166,7 +166,7 @@ namespace BlackGui if (CCompressUtils::zip7Uncompress(destFile.absoluteFilePath(), xSwiftBusDirectory, &stdOutAndError)) { // capture values by copy! - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).info(u"Uncompressed XSwiftBus in '%1'") << xSwiftBusDirectory; + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).info(u"Uncompressed XSwiftBus in '%1'") << xSwiftBusDirectory; this->showOverlayMessagesWithConfirmation(msg, false, "Delete downloaded file?", [ = ] { if (!myself) { return; } @@ -179,7 +179,7 @@ namespace BlackGui } else { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).warning(u"Unzip failed: stdout '%1' stderr '%2'") << safeAt(stdOutAndError, 0) << safeAt(stdOutAndError, 1); + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).warning(u"Unzip failed: stdout '%1' stderr '%2'") << safeAt(stdOutAndError, 0) << safeAt(stdOutAndError, 1); this->showOverlayMessage(msg); } @@ -214,7 +214,7 @@ namespace BlackGui if (!this->existsDownloadDir()) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Invalid download directory"); + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Invalid download directory"); this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); return; } @@ -222,7 +222,7 @@ namespace BlackGui const CUrl download = rf.getSmartUrl(); if (download.isEmpty()) { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"No download URL for file name '%1'") << rf.getBaseNameAndSize(); + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"No download URL for file name '%1'") << rf.getBaseNameAndSize(); this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); return; } @@ -257,7 +257,7 @@ namespace BlackGui } else { - const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Starting download for '%1' failed") << download.getFullUrl(); + const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Starting download for '%1' failed") << download.getFullUrl(); this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); } } diff --git a/src/blackgui/components/interpolationlogdisplay.cpp b/src/blackgui/components/interpolationlogdisplay.cpp index 23c73c2d3..c6eb098a1 100644 --- a/src/blackgui/components/interpolationlogdisplay.cpp +++ b/src/blackgui/components/interpolationlogdisplay.cpp @@ -33,9 +33,9 @@ namespace BlackGui { namespace Components { - const CLogCategoryList &CInterpolationLogDisplay::getLogCategories() + const QStringList &CInterpolationLogDisplay::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::interpolator(), CLogCategory::driver() }; + static const QStringList cats { CLogCategories::interpolator(), CLogCategories::driver() }; return cats; } diff --git a/src/blackgui/components/interpolationlogdisplay.h b/src/blackgui/components/interpolationlogdisplay.h index 8e2965c72..dc8c46295 100644 --- a/src/blackgui/components/interpolationlogdisplay.h +++ b/src/blackgui/components/interpolationlogdisplay.h @@ -43,7 +43,7 @@ namespace BlackGui public: //! Categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Tabs enum Tab diff --git a/src/blackgui/components/loginadvcomponent.cpp b/src/blackgui/components/loginadvcomponent.cpp index 3359cd916..8b1f86a0a 100644 --- a/src/blackgui/components/loginadvcomponent.cpp +++ b/src/blackgui/components/loginadvcomponent.cpp @@ -67,9 +67,9 @@ namespace BlackGui { namespace Components { - const CLogCategoryList &CLoginAdvComponent::getLogCategories() + const QStringList &CLoginAdvComponent::getLogCategories() { - static const BlackMisc::CLogCategoryList cats { CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::guiComponent() }; return cats; } diff --git a/src/blackgui/components/loginadvcomponent.h b/src/blackgui/components/loginadvcomponent.h index 227b00b95..695ed1376 100644 --- a/src/blackgui/components/loginadvcomponent.h +++ b/src/blackgui/components/loginadvcomponent.h @@ -56,7 +56,7 @@ namespace BlackGui public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor explicit CLoginAdvComponent(QWidget *parent = nullptr); diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index 9651118dc..531a17f27 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -67,9 +67,9 @@ namespace BlackGui { namespace Components { - const CLogCategoryList &CLoginComponent::getLogCategories() + const QStringList &CLoginComponent::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::guiComponent() }; return cats; } diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h index 298388bae..b6e7f4c7c 100644 --- a/src/blackgui/components/logincomponent.h +++ b/src/blackgui/components/logincomponent.h @@ -66,7 +66,7 @@ namespace BlackGui }; //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor explicit CLoginComponent(QWidget *parent = nullptr); diff --git a/src/blackgui/components/loginoverviewcomponent.cpp b/src/blackgui/components/loginoverviewcomponent.cpp index a57071388..e5e9a6eee 100644 --- a/src/blackgui/components/loginoverviewcomponent.cpp +++ b/src/blackgui/components/loginoverviewcomponent.cpp @@ -67,9 +67,9 @@ namespace BlackGui { namespace Components { - const CLogCategoryList &CLoginOverviewComponent::getLogCategories() + const QStringList &CLoginOverviewComponent::getLogCategories() { - static const BlackMisc::CLogCategoryList cats { CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::guiComponent() }; return cats; } diff --git a/src/blackgui/components/loginoverviewcomponent.h b/src/blackgui/components/loginoverviewcomponent.h index 9bc2eccaf..6c6ae43cd 100644 --- a/src/blackgui/components/loginoverviewcomponent.h +++ b/src/blackgui/components/loginoverviewcomponent.h @@ -54,7 +54,7 @@ namespace BlackGui public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor explicit CLoginOverviewComponent(QWidget *parent = nullptr); diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp index 1241816b5..90a6bd42e 100644 --- a/src/blackgui/components/mappingcomponent.cpp +++ b/src/blackgui/components/mappingcomponent.cpp @@ -56,9 +56,9 @@ namespace BlackGui { namespace Components { - const CLogCategoryList &CMappingComponent::getLogCategories() + const QStringList &CMappingComponent::getLogCategories() { - static const CLogCategoryList cats({ CLogCategory::mapping(), CLogCategory::guiComponent() }); + static const QStringList cats({ CLogCategories::mapping(), CLogCategories::guiComponent() }); return cats; } diff --git a/src/blackgui/components/mappingcomponent.h b/src/blackgui/components/mappingcomponent.h index d68871eba..cb1599848 100644 --- a/src/blackgui/components/mappingcomponent.h +++ b/src/blackgui/components/mappingcomponent.h @@ -66,7 +66,7 @@ namespace BlackGui }; //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor explicit CMappingComponent(QWidget *parent = nullptr); diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.cpp b/src/blackgui/components/settingssimulatorbasicscomponent.cpp index ca4f1917b..62fe8b4f2 100644 --- a/src/blackgui/components/settingssimulatorbasicscomponent.cpp +++ b/src/blackgui/components/settingssimulatorbasicscomponent.cpp @@ -29,9 +29,9 @@ namespace BlackGui { namespace Components { - const CLogCategoryList &CSettingsSimulatorBasicsComponent::getLogCategories() + const QStringList &CSettingsSimulatorBasicsComponent::getLogCategories() { - static const CLogCategoryList cats({ CLogCategory::guiComponent(), CLogCategory::wizard() }); + static const QStringList cats({ CLogCategories::guiComponent(), CLogCategories::wizard() }); return cats; } diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.h b/src/blackgui/components/settingssimulatorbasicscomponent.h index 37592a0fe..9966d52da 100644 --- a/src/blackgui/components/settingssimulatorbasicscomponent.h +++ b/src/blackgui/components/settingssimulatorbasicscomponent.h @@ -34,7 +34,7 @@ namespace BlackGui public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor explicit CSettingsSimulatorBasicsComponent(QWidget *parent = nullptr); diff --git a/src/blackgui/components/settingsxswiftbuscomponent.cpp b/src/blackgui/components/settingsxswiftbuscomponent.cpp index bb0f59d1a..dc6dccd49 100644 --- a/src/blackgui/components/settingsxswiftbuscomponent.cpp +++ b/src/blackgui/components/settingsxswiftbuscomponent.cpp @@ -22,9 +22,9 @@ namespace BlackGui { namespace Components { - const CLogCategoryList &CSettingsXSwiftBusComponent::getLogCategories() + const QStringList &CSettingsXSwiftBusComponent::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::guiComponent() }; return cats; } diff --git a/src/blackgui/components/settingsxswiftbuscomponent.h b/src/blackgui/components/settingsxswiftbuscomponent.h index 33b4d7f20..6732e0444 100644 --- a/src/blackgui/components/settingsxswiftbuscomponent.h +++ b/src/blackgui/components/settingsxswiftbuscomponent.h @@ -32,7 +32,7 @@ namespace BlackGui public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor explicit CSettingsXSwiftBusComponent(QWidget *parent = nullptr); diff --git a/src/blackgui/components/simulatorcomponent.cpp b/src/blackgui/components/simulatorcomponent.cpp index b7050e3ba..e6c0454cd 100644 --- a/src/blackgui/components/simulatorcomponent.cpp +++ b/src/blackgui/components/simulatorcomponent.cpp @@ -38,9 +38,9 @@ namespace BlackGui { namespace Components { - const CLogCategoryList &CSimulatorComponent::getLogCategories() + const QStringList &CSimulatorComponent::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::guiComponent(), CLogCategory::matching() }; + static const QStringList cats { CLogCategories::guiComponent(), CLogCategories::matching() }; return cats; } diff --git a/src/blackgui/components/simulatorcomponent.h b/src/blackgui/components/simulatorcomponent.h index 333b93eba..f88ff786a 100644 --- a/src/blackgui/components/simulatorcomponent.h +++ b/src/blackgui/components/simulatorcomponent.h @@ -44,7 +44,7 @@ namespace BlackGui public: //! Categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor explicit CSimulatorComponent(QWidget *parent = nullptr); diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index fced75373..15d798a8b 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -88,9 +88,9 @@ namespace BlackGui return qobject_cast(CApplication::instance()); } - const BlackMisc::CLogCategoryList &CGuiApplication::getLogCategories() + const QStringList &CGuiApplication::getLogCategories() { - static const CLogCategoryList l(CApplication::getLogCategories().join({ CLogCategory::guiComponent() })); + static const QStringList l(CApplication::getLogCategories() + QStringList { CLogCategories::guiComponent() }); return l; } diff --git a/src/blackgui/guiapplication.h b/src/blackgui/guiapplication.h index e404e5a9c..417665ad8 100644 --- a/src/blackgui/guiapplication.h +++ b/src/blackgui/guiapplication.h @@ -80,7 +80,7 @@ namespace BlackGui static CGuiApplication *instance(); //! Own log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Organization string used for settings, is the registry key under windows static const QString &settingsOrganization(); diff --git a/src/blackgui/menus/aircraftmodelmenus.cpp b/src/blackgui/menus/aircraftmodelmenus.cpp index 00bcfae5e..d92c198d1 100644 --- a/src/blackgui/menus/aircraftmodelmenus.cpp +++ b/src/blackgui/menus/aircraftmodelmenus.cpp @@ -36,9 +36,9 @@ namespace BlackGui void IAircraftModelViewMenu::anchor() { } - const CLogCategoryList &IAircraftModelViewMenu::getLogCategories() + const QStringList &IAircraftModelViewMenu::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::guiComponent() }; return cats; } @@ -74,9 +74,9 @@ namespace BlackGui IAircraftModelViewMenu(modelView), m_messageFrame(messageFrame) { } - const CLogCategoryList &CShowSimulatorFileMenu::getLogCategories() + const QStringList &CShowSimulatorFileMenu::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::guiComponent() }; return cats; } @@ -175,9 +175,9 @@ namespace BlackGui } } - const CLogCategoryList &CConsolidateWithDbDataMenu::getLogCategories() + const QStringList &CConsolidateWithDbDataMenu::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::mapping(), CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::mapping(), CLogCategories::guiComponent() }; return cats; } @@ -280,9 +280,9 @@ namespace BlackGui } } - const CLogCategoryList &CConsolidateWithSimulatorModels::getLogCategories() + const QStringList &CConsolidateWithSimulatorModels::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::mapping(), CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::mapping(), CLogCategories::guiComponent() }; return cats; } diff --git a/src/blackgui/menus/aircraftmodelmenus.h b/src/blackgui/menus/aircraftmodelmenus.h index a4451bfc0..12158b904 100644 --- a/src/blackgui/menus/aircraftmodelmenus.h +++ b/src/blackgui/menus/aircraftmodelmenus.h @@ -38,7 +38,7 @@ namespace BlackGui {} //! Log.categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); protected: //! Model view @@ -64,7 +64,7 @@ namespace BlackGui CShowSimulatorFileMenu(Views::CAircraftModelView *modelView, COverlayMessagesFrame *messageFrame); //! Log.categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! \copydoc IMenuDelegate::customMenu virtual void customMenu(CMenuActions &menuActions) override; @@ -93,7 +93,7 @@ namespace BlackGui CConsolidateWithDbDataMenu(BlackGui::Views::CAircraftModelView *modelView, QObject *modelsTarget); //! Log.categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! \copydoc IMenuDelegate::customMenu virtual void customMenu(CMenuActions &menuActions) override; @@ -125,7 +125,7 @@ namespace BlackGui CConsolidateWithSimulatorModels(Views::CAircraftModelView *modelView, QObject *modelsTarget); //! Log.categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! \copydoc IMenuDelegate::customMenu virtual void customMenu(CMenuActions &menuActions) override; diff --git a/src/blackgui/menus/fontmenus.cpp b/src/blackgui/menus/fontmenus.cpp index 2bb7ba154..08bedee02 100644 --- a/src/blackgui/menus/fontmenus.cpp +++ b/src/blackgui/menus/fontmenus.cpp @@ -19,9 +19,9 @@ namespace BlackGui { namespace Menus { - const CLogCategoryList &CFontMenu::getLogCategories() + const QStringList &CFontMenu::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::guiComponent() }; return cats; } diff --git a/src/blackgui/menus/fontmenus.h b/src/blackgui/menus/fontmenus.h index 13e3b3c06..abefed1ed 100644 --- a/src/blackgui/menus/fontmenus.h +++ b/src/blackgui/menus/fontmenus.h @@ -35,7 +35,7 @@ namespace BlackGui CFontMenu(QWidget *widget, Qt::ShortcutContext shortcutContext = Qt::WidgetShortcut); //! Log.categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! \copydoc IMenuDelegate::customMenu virtual void customMenu(CMenuActions &menuActions) override; diff --git a/src/blackgui/menus/menudelegate.h b/src/blackgui/menus/menudelegate.h index 463e6842d..8d984d597 100644 --- a/src/blackgui/menus/menudelegate.h +++ b/src/blackgui/menus/menudelegate.h @@ -42,9 +42,9 @@ namespace BlackGui virtual ~IMenuDelegate() {} //! Log categories - const BlackMisc::CLogCategoryList &getLogCategories() + const QStringList &getLogCategories() { - static const BlackMisc::CLogCategoryList cats({BlackMisc::CLogCategory::guiComponent()}); + static const QStringList cats({BlackMisc::CLogCategories::guiComponent()}); return cats; } diff --git a/src/blackgui/models/statusmessagefilter.cpp b/src/blackgui/models/statusmessagefilter.cpp index 802db0a1b..1614a544c 100644 --- a/src/blackgui/models/statusmessagefilter.cpp +++ b/src/blackgui/models/statusmessagefilter.cpp @@ -59,7 +59,7 @@ namespace BlackGui return CVariant::from(CLogPattern::exactMatch(m_category).withSeverityAtOrAbove(m_severity)); } - CLogCategoryList categories = CLogCategory::allSpecialCategories(); + CLogCategoryList categories = CLogCategoryList::fromQStringList(CLogCategories::allSpecialCategories()); categories.removeIf([this](const CLogCategory &cat) { return this->stringMatchesFilterExpression(cat.toQString(), this->m_category); }); CSequence humanNames = CLogPattern::allHumanReadableNames(); humanNames.removeIf([this](const QString &name) { return this->stringMatchesFilterExpression(name, this->m_category); }); diff --git a/src/blackgui/stylesheetutility.cpp b/src/blackgui/stylesheetutility.cpp index 96462b445..df7a752f1 100644 --- a/src/blackgui/stylesheetutility.cpp +++ b/src/blackgui/stylesheetutility.cpp @@ -43,9 +43,9 @@ namespace BlackGui connect(&m_fileWatcher, &QFileSystemWatcher::fileChanged, this, &CStyleSheetUtility::qssDirectoryChanged); } - const CLogCategoryList &CStyleSheetUtility::getLogCategories() + const QStringList &CStyleSheetUtility::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::guiComponent() }; + static const QStringList cats { CLogCategories::guiComponent() }; return cats; } @@ -268,7 +268,7 @@ namespace BlackGui } else { - CLogMessage(getLogCategories()).warning(u"Cannot open file '%1' for writing") << fn; + CLogMessage(static_cast(nullptr)).warning(u"Cannot open file '%1' for writing") << fn; } return ok; } diff --git a/src/blackgui/stylesheetutility.h b/src/blackgui/stylesheetutility.h index 7364a7ac5..d2994146b 100644 --- a/src/blackgui/stylesheetutility.h +++ b/src/blackgui/stylesheetutility.h @@ -42,7 +42,7 @@ namespace BlackGui explicit CStyleSheetUtility(BlackMisc::Restricted, QObject *parent = nullptr); //! Log cats. - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Style for given file name QString style(const QString &fileName) const; diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp index 6df50ead5..f3d796b2c 100644 --- a/src/blackmisc/aviation/aircrafticaocode.cpp +++ b/src/blackmisc/aviation/aircrafticaocode.cpp @@ -106,7 +106,7 @@ namespace BlackMisc CStatusMessageList CAircraftIcaoCode::validate() const { - static const CLogCategoryList cats({ CLogCategory("swift.blackmisc.aircrafticao"), CLogCategory::validation()}); + static const CLogCategoryList cats({ CLogCategory("swift.blackmisc.aircrafticao"), CLogCategories::validation()}); CStatusMessageList msg; if (this->isLoadedFromDb()) { diff --git a/src/blackmisc/aviation/airlineicaocodelist.cpp b/src/blackmisc/aviation/airlineicaocodelist.cpp index b8dd0cc9a..a99baebde 100644 --- a/src/blackmisc/aviation/airlineicaocodelist.cpp +++ b/src/blackmisc/aviation/airlineicaocodelist.cpp @@ -20,9 +20,9 @@ namespace BlackMisc { namespace Aviation { - const CLogCategoryList &CAirlineIcaoCodeList::getLogCategories() + const QStringList &CAirlineIcaoCodeList::getLogCategories() { - static const CLogCategoryList cats(CLogCategory::aviation()); + static const QStringList cats(CLogCategories::aviation()); return cats; } diff --git a/src/blackmisc/aviation/airlineicaocodelist.h b/src/blackmisc/aviation/airlineicaocodelist.h index d4165260a..fb657db3e 100644 --- a/src/blackmisc/aviation/airlineicaocodelist.h +++ b/src/blackmisc/aviation/airlineicaocodelist.h @@ -40,7 +40,7 @@ namespace BlackMisc using CSequence::CSequence; //! Categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Default constructor. CAirlineIcaoCodeList(); diff --git a/src/blackmisc/aviation/flightplan.cpp b/src/blackmisc/aviation/flightplan.cpp index 13bc7f646..219bed2f3 100644 --- a/src/blackmisc/aviation/flightplan.cpp +++ b/src/blackmisc/aviation/flightplan.cpp @@ -202,9 +202,9 @@ namespace BlackMisc return r.isEmpty() ? newRemark : r % u" " % newRemark; } - const CLogCategoryList &CFlightPlan::getLogCategories() + const QStringList &CFlightPlan::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::flightPlan() }; + static const QStringList cats { CLogCategories::flightPlan() }; return cats; } @@ -643,14 +643,14 @@ namespace BlackMisc QFileInfo fi(fileName); if (fileName.isEmpty()) { - if (msgs) { msgs->push_back(CStatusMessage(getLogCategories()).validationError(u"No file name")); } + if (msgs) { msgs->push_back(CStatusMessage(static_cast(nullptr)).validationError(u"No file name")); } return CFlightPlan(); } else { if (!fi.exists()) { - if (msgs) { msgs->push_back(CStatusMessage(getLogCategories()).validationError(u"File '%1' does not exist") << fileName); } + if (msgs) { msgs->push_back(CStatusMessage(static_cast(nullptr)).validationError(u"File '%1' does not exist") << fileName); } return CFlightPlan(); } } @@ -658,7 +658,7 @@ namespace BlackMisc const QString data = CFileUtils::readFileToString(fileName); if (data.isEmpty()) { - if (msgs) { msgs->push_back(CStatusMessage(getLogCategories()).validationError(u"File '%1' does not contain data") << fileName); } + if (msgs) { msgs->push_back(CStatusMessage(static_cast(nullptr)).validationError(u"File '%1' does not contain data") << fileName); } return CFlightPlan(); } @@ -671,7 +671,7 @@ namespace BlackMisc CStatusMessage m; if (!Json::looksLikeSwiftJson(data)) { - m = CStatusMessage(getLogCategories(), CStatusMessage::SeverityWarning, u"Reading '%1' yields no data", true) << fileName; + m = CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityWarning, u"Reading '%1' yields no data", true) << fileName; if (msgs) { msgs->push_back(m); } break; } @@ -691,7 +691,7 @@ namespace BlackMisc } else { - m = CStatusMessage(getLogCategories(), CStatusMessage::SeverityWarning, u"Wrong format for flight plan in '%1'") << fileName; + m = CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityWarning, u"Wrong format for flight plan in '%1'") << fileName; if (msgs) { msgs->push_back(m); } } } @@ -703,7 +703,7 @@ namespace BlackMisc } catch (const CJsonException &ex) { - m = CStatusMessage::fromJsonException(ex, getLogCategories(), "Parse error in " + fileName); + m = CStatusMessage::fromJsonException(ex, static_cast(nullptr), "Parse error in " + fileName); if (msgs) { msgs->push_back(m); } break; } @@ -717,7 +717,7 @@ namespace BlackMisc { if (msgs) { - msgs->push_back(CStatusMessage::fromJsonException(ex, getLogCategories(), QStringLiteral("Parsing flight plan from '%1' failed.").arg(fileName))); + msgs->push_back(CStatusMessage::fromJsonException(ex, static_cast(nullptr), QStringLiteral("Parsing flight plan from '%1' failed.").arg(fileName))); } } return CFlightPlan(); diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h index 6db10a008..107553428 100644 --- a/src/blackmisc/aviation/flightplan.h +++ b/src/blackmisc/aviation/flightplan.h @@ -156,7 +156,7 @@ namespace BlackMisc { public: //! The log. catgeories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Flight rules (VFR or IFR) enum FlightRules diff --git a/src/blackmisc/aviation/logutils.cpp b/src/blackmisc/aviation/logutils.cpp index 6b801a6e9..a8584c904 100644 --- a/src/blackmisc/aviation/logutils.cpp +++ b/src/blackmisc/aviation/logutils.cpp @@ -12,53 +12,53 @@ namespace BlackMisc { namespace Aviation { - void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CCallsign &callsign, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s) + void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CCallsign &callsign, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s) { if (!log) { return; } if (message.isEmpty()) { return; } log->push_back(CLogUtilities::logMessage(callsign, message, extraCategories, s)); } - void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CAircraftIcaoCode &icao, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s) + void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CAircraftIcaoCode &icao, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s) { if (!log) { return; } if (message.isEmpty()) { return; } log->push_back(CLogUtilities::logMessage(icao, message, extraCategories, s)); } - void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CAirlineIcaoCode &icao, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s) + void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CAirlineIcaoCode &icao, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s) { if (!log) { return; } if (message.isEmpty()) { return; } log->push_back(CLogUtilities::logMessage(icao, message, extraCategories, s)); } - void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CLivery &livery, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s) + void CLogUtilities::addLogDetailsToList(CStatusMessageList *log, const CLivery &livery, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s) { if (!log) { return; } if (message.isEmpty()) { return; } log->push_back(CLogUtilities::logMessage(livery, message, extraCategories, s)); } - CStatusMessage CLogUtilities::logMessage(const CCallsign &callsign, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s) + CStatusMessage CLogUtilities::logMessage(const CCallsign &callsign, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s) { const CStatusMessage m(categories(extraCategories), s, callsign.isEmpty() ? message.trimmed() : callsign.toQString() + ": " + message.trimmed()); return m; } - CStatusMessage CLogUtilities::logMessage(const CAircraftIcaoCode &icaoCode, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s) + CStatusMessage CLogUtilities::logMessage(const CAircraftIcaoCode &icaoCode, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s) { const CStatusMessage m(categories(extraCategories), s, icaoCode.hasDesignator() ? icaoCode.getDesignatorDbKey() + ": " + message.trimmed() : message.trimmed()); return m; } - CStatusMessage CLogUtilities::logMessage(const CAirlineIcaoCode &icaoCode, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s) + CStatusMessage CLogUtilities::logMessage(const CAirlineIcaoCode &icaoCode, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s) { const CStatusMessage m(categories(extraCategories), s, icaoCode.hasValidDesignator() ? icaoCode.getVDesignatorDbKey() + ": " + message.trimmed() : message.trimmed()); return m; } - CStatusMessage CLogUtilities::logMessage(const CLivery &livery, const QString &message, const CLogCategoryList &extraCategories, CStatusMessage::StatusSeverity s) + CStatusMessage CLogUtilities::logMessage(const CLivery &livery, const QString &message, const QStringList &extraCategories, CStatusMessage::StatusSeverity s) { const CStatusMessage m(categories(extraCategories), s, livery.hasCombinedCode() ? livery.getCombinedCodePlusInfoAndId() + ": " + message.trimmed() : message.trimmed()); return m; @@ -66,15 +66,15 @@ namespace BlackMisc const CLogCategoryList &CLogUtilities::defaultCategories() { - static const CLogCategoryList cats({ CLogCategory::aviation() }); + static const CLogCategoryList cats({ CLogCategories::aviation() }); return cats; } - CLogCategoryList CLogUtilities::categories(const CLogCategoryList &extraCategories) + CLogCategoryList CLogUtilities::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 diff --git a/src/blackmisc/aviation/logutils.h b/src/blackmisc/aviation/logutils.h index 7b61b2c11..5cc7274e8 100644 --- a/src/blackmisc/aviation/logutils.h +++ b/src/blackmisc/aviation/logutils.h @@ -33,53 +33,53 @@ namespace BlackMisc //! Specialized log for matching / reverse lookup //! \threadsafe static void addLogDetailsToList(CStatusMessageList *log, const CCallsign &callsign, - const QString &message, const CLogCategoryList &extraCategories = {}, + const QString &message, const QStringList &extraCategories = {}, CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo); //! Specialized log for matching / reverse lookup //! \threadsafe static void addLogDetailsToList(CStatusMessageList *log, const CAircraftIcaoCode &icao, - const QString &message, const CLogCategoryList &extraCategories = {}, + const QString &message, const QStringList &extraCategories = {}, CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo); //! Specialized log for matching / reverse lookup //! \threadsafe static void addLogDetailsToList(CStatusMessageList *log, const CAirlineIcaoCode &icao, - const QString &message, const CLogCategoryList &extraCategories = {}, + const QString &message, const QStringList &extraCategories = {}, CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo); //! Specialized log for matching / reverse lookup //! \threadsafe static void addLogDetailsToList(CStatusMessageList *log, const CLivery &livery, - const QString &message, const CLogCategoryList &extraCategories = {}, + const QString &message, const QStringList &extraCategories = {}, CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo); //! Specialized log message for matching / reverse lookup //! \threadsafe static CStatusMessage logMessage( const CCallsign &callsign, - const QString &message, const CLogCategoryList &extraCategories = {}, + const QString &message, const QStringList &extraCategories = {}, CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo); //! Specialized log message for matching / reverse lookup //! \threadsafe static CStatusMessage logMessage( const CAircraftIcaoCode &icaoCode, - const QString &message, const CLogCategoryList &extraCategories = {}, + const QString &message, const QStringList &extraCategories = {}, CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo); //! Specialized log message for matching / reverse lookup //! \threadsafe static CStatusMessage logMessage( const CAirlineIcaoCode &icaoCode, - const QString &message, const CLogCategoryList &extraCategories = {}, + const QString &message, const QStringList &extraCategories = {}, CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo); //! Specialized log message for matching / reverse lookup //! \threadsafe static CStatusMessage logMessage( const CLivery &livery, - const QString &message, const CLogCategoryList &extraCategories = {}, + const QString &message, const QStringList &extraCategories = {}, CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo); private: @@ -87,7 +87,7 @@ namespace BlackMisc static const CLogCategoryList &defaultCategories(); //! Categories - static CLogCategoryList categories(const CLogCategoryList &extraCategories); + static CLogCategoryList categories(const QStringList &extraCategories); }; } // ns } // ns diff --git a/src/blackmisc/aviation/simbriefdata.cpp b/src/blackmisc/aviation/simbriefdata.cpp index 29bb2272f..2939bcdf8 100644 --- a/src/blackmisc/aviation/simbriefdata.cpp +++ b/src/blackmisc/aviation/simbriefdata.cpp @@ -16,9 +16,9 @@ namespace BlackMisc { namespace Aviation { - const CLogCategoryList &CSimBriefData::getLogCategories() + const QStringList &CSimBriefData::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::flightPlan() }; + static const QStringList cats { CLogCategories::flightPlan() }; return cats; } diff --git a/src/blackmisc/aviation/simbriefdata.h b/src/blackmisc/aviation/simbriefdata.h index 52d1ea42d..f6b62c78e 100644 --- a/src/blackmisc/aviation/simbriefdata.h +++ b/src/blackmisc/aviation/simbriefdata.h @@ -29,7 +29,7 @@ namespace BlackMisc { public: //! The log. catgeories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Default constructor CSimBriefData(); diff --git a/src/blackmisc/datacache.cpp b/src/blackmisc/datacache.cpp index 8b028a136..6446a6d87 100644 --- a/src/blackmisc/datacache.cpp +++ b/src/blackmisc/datacache.cpp @@ -261,9 +261,9 @@ namespace BlackMisc } } - const CLogCategoryList &CDataCacheSerializer::getLogCategories() + const QStringList &CDataCacheSerializer::getLogCategories() { - static const BlackMisc::CLogCategoryList cats { BlackMisc::CLogCategory::cache() }; + static const QStringList cats { BlackMisc::CLogCategories::cache() }; return cats; } diff --git a/src/blackmisc/datacache.h b/src/blackmisc/datacache.h index 985471219..1302aeaa8 100644 --- a/src/blackmisc/datacache.h +++ b/src/blackmisc/datacache.h @@ -209,7 +209,7 @@ namespace BlackMisc public: //! Log categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor. CDataCacheSerializer(CDataCache *owner, const QString &revisionFileName); diff --git a/src/blackmisc/db/datastoreutility.cpp b/src/blackmisc/db/datastoreutility.cpp index c28bedf7b..9e7f4b67d 100644 --- a/src/blackmisc/db/datastoreutility.cpp +++ b/src/blackmisc/db/datastoreutility.cpp @@ -29,9 +29,9 @@ namespace BlackMisc { namespace Db { - const CLogCategoryList &CDatastoreUtility::getLogCategories() + const QStringList &CDatastoreUtility::getLogCategories() { - static const CLogCategoryList cats({CLogCategory::swiftDbWebservice()}); + static const QStringList cats({CLogCategories::swiftDbWebservice()}); return cats; } @@ -86,7 +86,7 @@ namespace BlackMisc if (jsonResponse.isEmpty()) { - messages.push_back(CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, u"Empty JSON data for published models")); + messages.push_back(CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityError, u"Empty JSON data for published models")); return false; } @@ -104,7 +104,7 @@ namespace BlackMisc if (!jsonDoc.isObject()) { const QString phpError(CNetworkUtils::removeHtmlPartsFromPhpErrorMessage(jsonResponse)); - messages.push_back(CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, phpError)); + messages.push_back(CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityError, phpError)); return false; } @@ -153,7 +153,7 @@ namespace BlackMisc if (!hasData) { - messages.push_back(CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, u"Received response, but no JSON data")); + messages.push_back(CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityError, u"Received response, but no JSON data")); } return hasData; @@ -163,7 +163,7 @@ namespace BlackMisc { if (jsonResponse.isEmpty()) { - messages.push_back(CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, u"Empty JSON data for published models")); + messages.push_back(CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityError, u"Empty JSON data for published models")); return false; } @@ -181,7 +181,7 @@ namespace BlackMisc if (!jsonDoc.isObject()) { const QString phpError(CNetworkUtils::removeHtmlPartsFromPhpErrorMessage(jsonResponse)); - messages.push_back(CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, phpError)); + messages.push_back(CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityError, phpError)); return false; } diff --git a/src/blackmisc/db/datastoreutility.h b/src/blackmisc/db/datastoreutility.h index 1b4b1df9b..1958b2076 100644 --- a/src/blackmisc/db/datastoreutility.h +++ b/src/blackmisc/db/datastoreutility.h @@ -31,7 +31,7 @@ namespace BlackMisc { public: //! Log.categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! No constructor CDatastoreUtility() = delete; diff --git a/src/blackmisc/dbusserver.cpp b/src/blackmisc/dbusserver.cpp index e28c29403..c7dce4ec4 100644 --- a/src/blackmisc/dbusserver.cpp +++ b/src/blackmisc/dbusserver.cpp @@ -109,9 +109,9 @@ namespace BlackMisc return CDBusServer::isP2PConnection(connection) ? empty : CDBusServer::coreServiceName(); } - const CLogCategoryList &CDBusServer::getLogCategories() + const QStringList &CDBusServer::getLogCategories() { - static const CLogCategoryList cats({ CLogCategory::dbus() }); + static const QStringList cats({ CLogCategories::dbus() }); return cats; } diff --git a/src/blackmisc/dbusserver.h b/src/blackmisc/dbusserver.h index 523d310fb..f9c9bf661 100644 --- a/src/blackmisc/dbusserver.h +++ b/src/blackmisc/dbusserver.h @@ -47,7 +47,7 @@ namespace BlackMisc static const QString &coreServiceName(const QDBusConnection &connection); //! Log categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Server mode enum ServerMode diff --git a/src/blackmisc/geo/kmlutils.cpp b/src/blackmisc/geo/kmlutils.cpp index 1969583d8..c7510c1d3 100644 --- a/src/blackmisc/geo/kmlutils.cpp +++ b/src/blackmisc/geo/kmlutils.cpp @@ -17,9 +17,9 @@ namespace BlackMisc { namespace Geo { - const CLogCategoryList &CKmlUtils::getLogCategories() + const QStringList &CKmlUtils::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::interpolator() }; + static const QStringList cats { CLogCategories::interpolator() }; return cats; } diff --git a/src/blackmisc/geo/kmlutils.h b/src/blackmisc/geo/kmlutils.h index cf2e58cb5..0f636455d 100644 --- a/src/blackmisc/geo/kmlutils.h +++ b/src/blackmisc/geo/kmlutils.h @@ -26,7 +26,7 @@ namespace BlackMisc { public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! KML settings struct KMLSettings diff --git a/src/blackmisc/logcategories.h b/src/blackmisc/logcategories.h new file mode 100644 index 000000000..44e1a2650 --- /dev/null +++ b/src/blackmisc/logcategories.h @@ -0,0 +1,337 @@ +/* Copyright (C) 2014 + * swift Project Community / Contributors + * + * This file is part of swift Project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated, + * or distributed except according to the terms contained in the LICENSE file. + */ + +//! \file + +#ifndef BLACKMISC_LOGCATEGORIES_H +#define BLACKMISC_LOGCATEGORIES_H + +#include "blackmisc/blackmiscexport.h" + +#include +#include + +namespace BlackMisc +{ + /*! + * Predefined special log categories. + * + * \see CLogCategory + */ + class BLACKMISC_EXPORT CLogCategories + { + public: + //! Uncategorized + static const QString &uncategorized() + { + static const QString cat { "swift.uncategorized" }; + return cat; + } + + //! Verification + static const QString &verification() + { + static const QString cat { "swift.verification" }; + return cat; + } + + //! Validation + static const QString &validation() + { + static const QString cat { "swift.validation" }; + return cat; + } + + //! Core/base services such as caching etc. + static const QString &services() + { + static const QString cat { "swift.services" }; + return cat; + } + + //! Audio related + static const QString &audio() + { + static const QString cat { "swift.audio" }; + return cat; + } + + //! DBus related + static const QString &dbus() + { + static const QString cat { "swift.dbus" }; + return cat; + } + + //! Contexts + static const QString &context() + { + static const QString cat { "swift.context" }; + return cat; + } + + //! Interpolator + static const QString &interpolator() + { + static const QString cat { "swift.interpolator" }; + return cat; + } + + //! Flight plan + static const QString &flightPlan() + { + static const QString cat { "swift.flightplan" }; + return cat; + } + + //! Context slots + static const QString &contextSlot() + { + static const QString cat { "swift.context.slot" }; + return cat; + } + + //! GUI components + static const QString &guiComponent() + { + static const QString cat { "swift.gui.component" }; + return cat; + } + + //! Generic downloads + static const QString &download() + { + static const QString cat { "swift.download" }; + return cat; + } + + //! Webservice + static const QString &webservice() + { + static const QString cat { "swift.webservice" }; + return cat; + } + + //! Mapping + static const QString &mapping() + { + static const QString cat { "swift.mapping" }; + return cat; + } + + //! Matching + static const QString &matching() + { + static const QString cat { "swift.matching" }; + return cat; + } + + //! Settings + static const QString &settings() + { + static const QString cat { "swift.settings" }; + return cat; + } + + //! Cache + static const QString &cache() + { + static const QString cat { "swift.cache" }; + return cat; + } + + //! Cmd.line parsing + static const QString &cmdLine() + { + static const QString cat { "swift.cmdLine" }; + return cat; + } + + //! Driver + static const QString &driver() + { + static const QString cat { "swift.driver" }; + return cat; + } + + //! Model loader + static const QString &modelLoader() + { + static const QString cat { "swift.modelloader" }; + return cat; + } + + //! Model cache + static const QString &modelCache() + { + static const QString cat { "swift.modelcache" }; + return cat; + } + + //! Model set cache + static const QString &modelSetCache() + { + static const QString cat { "swift.modelsetcache" }; + return cat; + } + + //! Model UI + static const QString &modelGui() + { + static const QString cat { "swift.modelui" }; + return cat; + } + + //! Plugin + static const QString &plugin() + { + static const QString cat { "swift.plugin" }; + return cat; + } + + //! Wizard + static const QString &wizard() + { + static const QString cat { "swift.wizard" }; + return cat; + } + + //! Background task + static const QString &worker() + { + static const QString cat { "swift.worker" }; + return cat; + } + + //! Data inconsistency + static const QString &dataInconsistency() + { + static const QString cat { "swift.datainconsistency" }; + return cat; + } + + //! JSON and JSON conversions + static const QString &json() + { + static const QString cat { "swift.json" }; + return cat; + } + + //! Startup of application + static const QString &startup() + { + static const QString cat { "swift.startup" }; + return cat; + } + + //! Webservice with swift DB + static const QString &swiftDbWebservice() + { + static const QString cat { "swift.db.webservice" }; + return cat; + } + + //! swift GUI + static const QString &swiftPilotClient() + { + static const QString cat { "SwiftGuiStd" }; + return cat; + } + + //! swift data tool (aka mapping tool) + static const QString &swiftDataTool() + { + static const QString cat { "CSwiftData" }; + return cat; + } + + //! swift core + static const QString &swiftCore() + { + static const QString cat { "CSwiftCore" }; + return cat; + } + + //! VATSIM specific + static const QString &vatsimSpecific() + { + static const QString cat { "swift.vatsim" }; + return cat; + } + + //! Network specific, but not necessarily one specific flight network + static const QString &network() + { + static const QString cat { "swift.network" }; + return cat; + } + + //! FSD specific + static const QString &fsd() + { + static const QString cat { "swift.fsd" }; + return cat; + } + + //! Aviation specific + static const QString &aviation() + { + static const QString cat { "swift.aviation" }; + return cat; + } + + //! All predefined special categories + //! \note Human readable patterns are defined in CLogPattern::allHumanReadablePatterns + static const QStringList &allSpecialCategories() + { + static const QStringList cats + { + uncategorized(), + aviation(), + audio(), + cache(), + cmdLine(), + context(), + contextSlot(), + dbus(), + dataInconsistency(), + download(), + driver(), + flightPlan(), + fsd(), + guiComponent(), + interpolator(), + json(), + mapping(), + matching(), + modelLoader(), + modelCache(), + modelSetCache(), + modelGui(), + network(), + plugin(), + swiftDbWebservice(), + swiftCore(), + swiftDataTool(), + swiftPilotClient(), + services(), + settings(), + startup(), + validation(), + vatsimSpecific(), + verification(), + webservice(), + wizard(), + worker() + }; + return cats; + } + }; +} // ns + +#endif diff --git a/src/blackmisc/logcategory.h b/src/blackmisc/logcategory.h index f2be55c77..8d3e548ae 100644 --- a/src/blackmisc/logcategory.h +++ b/src/blackmisc/logcategory.h @@ -14,6 +14,7 @@ #include "blackmisc/metaclass.h" #include "blackmisc/valueobject.h" #include "blackmisc/blackmiscexport.h" +#include "blackmisc/logcategories.h" #include #include @@ -25,321 +26,11 @@ namespace BlackMisc * A log category is an arbitrary string tag which can be attached to log messages. * * A log handler can filter messages based on their categories. + * \see CLogCategories */ class BLACKMISC_EXPORT CLogCategory : public CValueObject { public: - //! \name Predefined special categories (public static methods) - //! @{ - - //! Uncategorized - static const CLogCategory &uncategorized() - { - static const CLogCategory cat { "swift.uncategorized" }; - return cat; - } - - //! Verification - static const CLogCategory &verification() - { - static const CLogCategory cat { "swift.verification" }; - return cat; - } - - //! Validation - static const CLogCategory &validation() - { - static const CLogCategory cat { "swift.validation" }; - return cat; - } - - //! Core/base services such as caching etc. - static const CLogCategory &services() - { - static const CLogCategory cat { "swift.services" }; - return cat; - } - - //! Audio related - static const CLogCategory &audio() - { - static const CLogCategory cat { "swift.audio" }; - return cat; - } - - //! DBus related - static const CLogCategory &dbus() - { - static const CLogCategory cat { "swift.dbus" }; - return cat; - } - - //! Contexts - static const CLogCategory &context() - { - static const CLogCategory cat { "swift.context" }; - return cat; - } - - //! Interpolator - static const CLogCategory &interpolator() - { - static const CLogCategory cat { "swift.interpolator" }; - return cat; - } - - //! Flight plan - static const CLogCategory &flightPlan() - { - static const CLogCategory cat { "swift.flightplan" }; - return cat; - } - - //! Context slots - static const CLogCategory &contextSlot() - { - static const CLogCategory cat { "swift.context.slot" }; - return cat; - } - - //! GUI components - static const CLogCategory &guiComponent() - { - static const CLogCategory cat { "swift.gui.component" }; - return cat; - } - - //! Generic downloads - static const CLogCategory &download() - { - static const CLogCategory cat { "swift.download" }; - return cat; - } - - //! Webservice - static const CLogCategory &webservice() - { - static const CLogCategory cat { "swift.webservice" }; - return cat; - } - - //! Mapping - static const CLogCategory &mapping() - { - static const CLogCategory cat { "swift.mapping" }; - return cat; - } - - //! Matching - static const CLogCategory &matching() - { - static const CLogCategory cat { "swift.matching" }; - return cat; - } - - //! Settings - static const CLogCategory &settings() - { - static const CLogCategory cat { "swift.settings" }; - return cat; - } - - //! Cache - static const CLogCategory &cache() - { - static const CLogCategory cat { "swift.cache" }; - return cat; - } - - //! Cmd.line parsing - static const CLogCategory &cmdLine() - { - static const CLogCategory cat { "swift.cmdLine" }; - return cat; - } - - //! Driver - static const CLogCategory &driver() - { - static const CLogCategory cat { "swift.driver" }; - return cat; - } - - //! Model loader - static const CLogCategory &modelLoader() - { - static const CLogCategory cat { "swift.modelloader" }; - return cat; - } - - //! Model cache - static const CLogCategory &modelCache() - { - static const CLogCategory cat { "swift.modelcache" }; - return cat; - } - - //! Model set cache - static const CLogCategory &modelSetCache() - { - static const CLogCategory cat { "swift.modelsetcache" }; - return cat; - } - - //! Model UI - static const CLogCategory &modelGui() - { - static const CLogCategory cat { "swift.modelui" }; - return cat; - } - - //! Plugin - static const CLogCategory &plugin() - { - static const CLogCategory cat { "swift.plugin" }; - return cat; - } - - //! Wizard - static const CLogCategory &wizard() - { - static const CLogCategory cat { "swift.wizard" }; - return cat; - } - - //! Background task - static const CLogCategory &worker() - { - static const CLogCategory cat { "swift.worker" }; - return cat; - } - - //! Data inconsistency - static const CLogCategory &dataInconsistency() - { - static const CLogCategory cat { "swift.datainconsistency" }; - return cat; - } - - //! JSON and JSON conversions - static const CLogCategory &json() - { - static const CLogCategory cat { "swift.json" }; - return cat; - } - - //! Startup of application - static const CLogCategory &startup() - { - static const CLogCategory cat { "swift.startup" }; - return cat; - } - - //! Webservice with swift DB - static const CLogCategory &swiftDbWebservice() - { - static const CLogCategory cat { "swift.db.webservice" }; - return cat; - } - - //! swift GUI - static const CLogCategory &swiftPilotClient() - { - static const CLogCategory cat { "SwiftGuiStd" }; - return cat; - } - - //! swift data tool (aka mapping tool) - static const CLogCategory &swiftDataTool() - { - static const CLogCategory cat { "CSwiftData" }; - return cat; - } - - //! swift core - static const CLogCategory &swiftCore() - { - static const CLogCategory cat { "CSwiftCore" }; - return cat; - } - - //! VATSIM specific - static const CLogCategory &vatsimSpecific() - { - static const CLogCategory cat { "swift.vatsim" }; - return cat; - } - - //! Network specific, but not necessarily one specific flight network - static const CLogCategory &network() - { - static const CLogCategory cat { "swift.network" }; - return cat; - } - - //! FSD specific - static const CLogCategory &fsd() - { - static const CLogCategory cat { "swift.fsd" }; - return cat; - } - - //! Aviation specific - static const CLogCategory &aviation() - { - static const CLogCategory cat { "swift.aviation" }; - return cat; - } - - //! All predefined special categories - //! \note Human readable patterns are defined in CLogPattern::allHumanReadablePatterns - static const QList &allSpecialCategories() - { - static const QList cats - { - uncategorized(), - aviation(), - audio(), - cache(), - cmdLine(), - context(), - contextSlot(), - dbus(), - dataInconsistency(), - download(), - driver(), - flightPlan(), - fsd(), - guiComponent(), - interpolator(), - json(), - mapping(), - matching(), - modelLoader(), - modelCache(), - modelSetCache(), - modelGui(), - network(), - plugin(), - swiftDbWebservice(), - swiftCore(), - swiftDataTool(), - swiftPilotClient(), - services(), - settings(), - startup(), - validation(), - vatsimSpecific(), - verification(), - webservice(), - wizard(), - worker() - }; - return cats; - } - - //! @} - //! Constructor. CLogCategory() = default; diff --git a/src/blackmisc/logcategorylist.h b/src/blackmisc/logcategorylist.h index c049721e3..ce5d6385a 100644 --- a/src/blackmisc/logcategorylist.h +++ b/src/blackmisc/logcategorylist.h @@ -75,7 +75,7 @@ namespace BlackMisc CLogCategoryList with(const CLogCategoryList &other) const { auto copy = *this; copy.push_back(other); return copy; } //! Return a copy with validation category appended. - CLogCategoryList withValidation() const { return with(CLogCategory::validation()); } + CLogCategoryList withValidation() const { return with(CLogCategories::validation()); } //! Convert each of the categories to a QString and return the result as a QStringList. QStringList toQStringList() const; @@ -118,14 +118,14 @@ namespace BlackMisc list.appendCategoriesFromMemberFunction(tag(), THasGetLogCategories()); list.appendCategoriesFromMetaType(tag(), std::integral_constant::Defined>()); list.appendCategoriesFromMetaObject(tag(), std::is_base_of()); - if (list.isEmpty()) { list.push_back(CLogCategory::uncategorized()); } + if (list.isEmpty()) { list.push_back(CLogCategories::uncategorized()); } return list; }(); return list; } template - void appendCategoriesFromMemberFunction(tag, std::true_type) { push_back(T::getLogCategories()); } + void appendCategoriesFromMemberFunction(tag, std::true_type) { push_back(fromQStringList(T::getLogCategories())); } void appendCategoriesFromMemberFunction(...) {} template diff --git a/src/blackmisc/loghandler.h b/src/blackmisc/loghandler.h index 93f60f0e6..3fb0a4bfb 100644 --- a/src/blackmisc/loghandler.h +++ b/src/blackmisc/loghandler.h @@ -67,7 +67,7 @@ namespace BlackMisc //! \warning This must only be called from the main thread. CLogPatternHandler *handlerForValidation() { - return handlerForPattern(CLogPattern::exactMatch(CLogCategory::validation()).withSeverityAtOrAbove(CStatusMessage::SeverityWarning)); + return handlerForPattern(CLogPattern::exactMatch(CLogCategories::validation()).withSeverityAtOrAbove(CStatusMessage::SeverityWarning)); } //! Returns all log patterns for which there are currently subscribed log pattern handlers. diff --git a/src/blackmisc/logpattern.cpp b/src/blackmisc/logpattern.cpp index e1f0f1ca5..8da41608c 100644 --- a/src/blackmisc/logpattern.cpp +++ b/src/blackmisc/logpattern.cpp @@ -23,41 +23,41 @@ namespace BlackMisc { static const QHash patterns { - { "uncategorized (swift)", exactMatch(CLogCategory::uncategorized()) }, - { "background task", exactMatch(CLogCategory::worker()) }, - { "cache", exactMatch(CLogCategory::cache()) }, - { "cmd.line handling", exactMatch(CLogCategory::cmdLine()) }, - { "data inconsistency", exactMatch(CLogCategory::dataInconsistency()) }, - { "DBus", exactMatch(CLogCategory::dbus()) }, - { "downloading data", exactMatch(CLogCategory::download()) }, - { "driver", exactMatch(CLogCategory::driver()) }, - { "flight plan", exactMatch(CLogCategory::flightPlan()) }, - { "FSD", exactMatch(CLogCategory::fsd()) }, - { "interpolator", exactMatch(CLogCategory::interpolator()) }, - { "JSON (conversion)", exactMatch(CLogCategory::json()) }, - { "model cache", exactMatch(CLogCategory::modelCache()) }, - { "model GUI", exactMatch(CLogCategory::modelGui()) }, - { "model loader", exactMatch(CLogCategory::modelLoader()) }, - { "model mapping", exactMatch(CLogCategory::mapping()) }, - { "model matching", exactMatch(CLogCategory::matching()) }, - { "model set cache", exactMatch(CLogCategory::modelSetCache()) }, - { "network (flight)", exactMatch(CLogCategory::network()) }, - { "plugin", exactMatch(CLogCategory::plugin()) }, - { "services", exactMatch(CLogCategory::services()) }, - { "settings", exactMatch(CLogCategory::settings()) }, - { "startup phase", exactMatch(CLogCategory::startup()) }, - { "swift context slots", exactMatch(CLogCategory::contextSlot()) }, - { "swift contexts", exactMatch(CLogCategory::context()) }, - { "swift core", exactMatch(CLogCategory::swiftCore()) }, - { "swift data tool", exactMatch(CLogCategory::swiftDataTool()) }, - { "swift DB webservice related", exactMatch(CLogCategory::swiftDbWebservice()) }, - { "swift GUI", exactMatch(CLogCategory::guiComponent()) }, - { "swift pilot client", exactMatch(CLogCategory::swiftPilotClient()) }, - { "validation", exactMatch(CLogCategory::validation()) }, - { "VATSIM specific", exactMatch(CLogCategory::vatsimSpecific()) }, - { "verification", exactMatch(CLogCategory::verification()) }, - { "webservice related", exactMatch(CLogCategory::webservice()) }, - { "wizard", exactMatch(CLogCategory::wizard()) }, + { "uncategorized (swift)", exactMatch(CLogCategories::uncategorized()) }, + { "background task", exactMatch(CLogCategories::worker()) }, + { "cache", exactMatch(CLogCategories::cache()) }, + { "cmd.line handling", exactMatch(CLogCategories::cmdLine()) }, + { "data inconsistency", exactMatch(CLogCategories::dataInconsistency()) }, + { "DBus", exactMatch(CLogCategories::dbus()) }, + { "downloading data", exactMatch(CLogCategories::download()) }, + { "driver", exactMatch(CLogCategories::driver()) }, + { "flight plan", exactMatch(CLogCategories::flightPlan()) }, + { "FSD", exactMatch(CLogCategories::fsd()) }, + { "interpolator", exactMatch(CLogCategories::interpolator()) }, + { "JSON (conversion)", exactMatch(CLogCategories::json()) }, + { "model cache", exactMatch(CLogCategories::modelCache()) }, + { "model GUI", exactMatch(CLogCategories::modelGui()) }, + { "model loader", exactMatch(CLogCategories::modelLoader()) }, + { "model mapping", exactMatch(CLogCategories::mapping()) }, + { "model matching", exactMatch(CLogCategories::matching()) }, + { "model set cache", exactMatch(CLogCategories::modelSetCache()) }, + { "network (flight)", exactMatch(CLogCategories::network()) }, + { "plugin", exactMatch(CLogCategories::plugin()) }, + { "services", exactMatch(CLogCategories::services()) }, + { "settings", exactMatch(CLogCategories::settings()) }, + { "startup phase", exactMatch(CLogCategories::startup()) }, + { "swift context slots", exactMatch(CLogCategories::contextSlot()) }, + { "swift contexts", exactMatch(CLogCategories::context()) }, + { "swift core", exactMatch(CLogCategories::swiftCore()) }, + { "swift data tool", exactMatch(CLogCategories::swiftDataTool()) }, + { "swift DB webservice related", exactMatch(CLogCategories::swiftDbWebservice()) }, + { "swift GUI", exactMatch(CLogCategories::guiComponent()) }, + { "swift pilot client", exactMatch(CLogCategories::swiftPilotClient()) }, + { "validation", exactMatch(CLogCategories::validation()) }, + { "VATSIM specific", exactMatch(CLogCategories::vatsimSpecific()) }, + { "verification", exactMatch(CLogCategories::verification()) }, + { "webservice related", exactMatch(CLogCategories::webservice()) }, + { "wizard", exactMatch(CLogCategories::wizard()) }, { "Qt library", startsWith("qt.") }, { "uncategorized (default)", exactMatch("default") }, { "uncategorized (none)", empty() } diff --git a/src/blackmisc/network/networkutils.cpp b/src/blackmisc/network/networkutils.cpp index 78f1f73ee..8a777a3b7 100644 --- a/src/blackmisc/network/networkutils.cpp +++ b/src/blackmisc/network/networkutils.cpp @@ -402,7 +402,7 @@ namespace BlackMisc CStatusMessageList CNetworkUtils::createNetworkReport(const CUrl &url, const QNetworkAccessManager *qam) { - static const CLogCategoryList cats({CLogCategory::network()}); + static const CLogCategoryList cats({CLogCategories::network()}); CStatusMessageList msgs; if (!url.isEmpty()) diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index f2dcf05a9..e005a6684 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -844,12 +844,12 @@ namespace BlackMisc { if (same) { - static const CStatusMessage msgSame({ CLogCategory::validation() }, CStatusMessage::SeverityWarning, u"Model '%1' same %2 '%3'"); + static const CStatusMessage msgSame({ CLogCategories::validation() }, CStatusMessage::SeverityWarning, u"Model '%1' same %2 '%3'"); return CStatusMessage(msgSame) << model.getModelStringAndDbKey() << description << newValue; } else { - static const CStatusMessage msgDiff({ CLogCategory::validation() }, CStatusMessage::SeverityInfo, u"Model '%1' changed %2 '%3'->'%4'"); + static const CStatusMessage msgDiff({ CLogCategories::validation() }, CStatusMessage::SeverityInfo, u"Model '%1' changed %2 '%3'->'%4'"); return CStatusMessage(msgDiff) << model.getModelStringAndDbKey() << description << oldValue << newValue; } } @@ -858,7 +858,7 @@ namespace BlackMisc { if (!dbModel.isLoadedFromDb()) { - static const CStatusMessage msgNoDbModel({ CLogCategory::validation() }, CStatusMessage::SeverityInfo, u"No DB model yet"); + static const CStatusMessage msgNoDbModel({ CLogCategories::validation() }, CStatusMessage::SeverityInfo, u"No DB model yet"); if (details) { details->push_back(msgNoDbModel); } return false; } diff --git a/src/blackmisc/simulation/aircraftmodelloader.cpp b/src/blackmisc/simulation/aircraftmodelloader.cpp index 18e7a4f63..90908f01e 100644 --- a/src/blackmisc/simulation/aircraftmodelloader.cpp +++ b/src/blackmisc/simulation/aircraftmodelloader.cpp @@ -31,9 +31,9 @@ namespace BlackMisc { namespace Simulation { - const CLogCategoryList &IAircraftModelLoader::getLogCategories() + const QStringList &IAircraftModelLoader::getLogCategories() { - static const CLogCategoryList cats({ CLogCategory::modelLoader() }); + static const QStringList cats({ CLogCategories::modelLoader() }); return cats; } diff --git a/src/blackmisc/simulation/aircraftmodelloader.h b/src/blackmisc/simulation/aircraftmodelloader.h index e4dc79ac3..358fb10ce 100644 --- a/src/blackmisc/simulation/aircraftmodelloader.h +++ b/src/blackmisc/simulation/aircraftmodelloader.h @@ -51,7 +51,7 @@ namespace BlackMisc public: //! Log categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Parser mode enum LoadModeFlag diff --git a/src/blackmisc/simulation/aircraftmodelutils.cpp b/src/blackmisc/simulation/aircraftmodelutils.cpp index 82e21a757..465686e8d 100644 --- a/src/blackmisc/simulation/aircraftmodelutils.cpp +++ b/src/blackmisc/simulation/aircraftmodelutils.cpp @@ -144,27 +144,28 @@ namespace BlackMisc CStatusMessageList CAircraftModelUtilities::validateModelFiles(const CSimulatorInfo &simulator, const CAircraftModelList &models, CAircraftModelList &validModels, CAircraftModelList &invalidModels, bool ignoreEmpty, int stopAtFailedFiles, std::atomic_bool &wasStopped, const QString &simulatorDir) { // some generic tests + CLogCategoryList cats = { CLogCategories::matching() }; CStatusMessageList msgs; if (models.isEmpty()) { - msgs.push_back(CStatusMessage(CLogCategory::matching(), CStatusMessage::SeverityError, u"No models", true)); + msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"No models", true)); return msgs; } const int noDb = models.size() - models.countWithValidDbKey(); if (noDb > 0) { - msgs.push_back(CStatusMessage(CLogCategory::matching(), CStatusMessage::SeverityWarning, QStringLiteral("%1 models without DB data, is this intended?").arg(noDb), true)); + msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityWarning, QStringLiteral("%1 models without DB data, is this intended?").arg(noDb), true)); const QString ms = models.findWithoutValidDbKey(5).getModelStringList().join(", "); - msgs.push_back(CStatusMessage(CLogCategory::matching(), CStatusMessage::SeverityWarning, QStringLiteral("Some of the non DB models are: '%1'").arg(ms), true)); + msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityWarning, QStringLiteral("Some of the non DB models are: '%1'").arg(ms), true)); } const int noExcluded = models.countByMode(CAircraftModel::Exclude); if (noExcluded > 0) { - msgs.push_back(CStatusMessage(CLogCategory::matching(), CStatusMessage::SeverityWarning, QStringLiteral("%1 models marked as excluded, is this intended?").arg(noExcluded), true)); + msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityWarning, QStringLiteral("%1 models marked as excluded, is this intended?").arg(noExcluded), true)); const QString ms = models.findAllExcludedModels(5).getModelStringList().join(", "); - msgs.push_back(CStatusMessage(CLogCategory::matching(), CStatusMessage::SeverityWarning, QStringLiteral("Some of the excluded models are: '%1'").arg(ms), true)); + msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityWarning, QStringLiteral("Some of the excluded models are: '%1'").arg(ms), true)); } // specific checks for FSX/XPlane/FG diff --git a/src/blackmisc/simulation/autopublishdata.cpp b/src/blackmisc/simulation/autopublishdata.cpp index f6a7c8362..454bf832f 100644 --- a/src/blackmisc/simulation/autopublishdata.cpp +++ b/src/blackmisc/simulation/autopublishdata.cpp @@ -142,7 +142,7 @@ namespace BlackMisc CStatusMessageList CAutoPublishData::analyzeAgainstDBData(const CAircraftModelList &dbModels) { - static const CLogCategoryList cats({ CLogCategory::mapping(), CLogCategory::webservice() }); + static const CLogCategoryList cats({ CLogCategories::mapping(), CLogCategories::webservice() }); if (dbModels.isEmpty()) { return CStatusMessage(this).validationError(u"No DB data"); } if (this->isEmpty()) { return CStatusMessage(this).validationWarning(u"No data"); } diff --git a/src/blackmisc/simulation/backgroundvalidation.cpp b/src/blackmisc/simulation/backgroundvalidation.cpp index 453d4c11a..f10f3170d 100644 --- a/src/blackmisc/simulation/backgroundvalidation.cpp +++ b/src/blackmisc/simulation/backgroundvalidation.cpp @@ -22,9 +22,9 @@ namespace BlackMisc { namespace Simulation { - const CLogCategoryList &CBackgroundValidation::getLogCategories() + const QStringList &CBackgroundValidation::getLogCategories() { - static const CLogCategoryList cats({ CLogCategory::worker(), CLogCategory::modelSetCache() }); + static const QStringList cats({ CLogCategories::worker(), CLogCategories::modelSetCache() }); return cats; } diff --git a/src/blackmisc/simulation/backgroundvalidation.h b/src/blackmisc/simulation/backgroundvalidation.h index 60b832c91..6bb487e24 100644 --- a/src/blackmisc/simulation/backgroundvalidation.h +++ b/src/blackmisc/simulation/backgroundvalidation.h @@ -34,7 +34,7 @@ namespace BlackMisc public: //! Log categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor CBackgroundValidation(QObject *owner); diff --git a/src/blackmisc/simulation/categorymatcher.cpp b/src/blackmisc/simulation/categorymatcher.cpp index 581e1a6de..ab8aebecd 100644 --- a/src/blackmisc/simulation/categorymatcher.cpp +++ b/src/blackmisc/simulation/categorymatcher.cpp @@ -20,9 +20,9 @@ namespace BlackMisc { namespace Simulation { - const CLogCategoryList &CCategoryMatcher::getLogCategories() + const QStringList &CCategoryMatcher::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::matching() }; + static const QStringList cats { CLogCategories::matching() }; return cats; } diff --git a/src/blackmisc/simulation/categorymatcher.h b/src/blackmisc/simulation/categorymatcher.h index 8a47f768e..e15276930 100644 --- a/src/blackmisc/simulation/categorymatcher.h +++ b/src/blackmisc/simulation/categorymatcher.h @@ -29,7 +29,7 @@ namespace BlackMisc { public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor CCategoryMatcher() {} diff --git a/src/blackmisc/simulation/data/modelcaches.cpp b/src/blackmisc/simulation/data/modelcaches.cpp index 6bfc8268d..5ab96fc51 100644 --- a/src/blackmisc/simulation/data/modelcaches.cpp +++ b/src/blackmisc/simulation/data/modelcaches.cpp @@ -192,9 +192,9 @@ namespace BlackMisc } } - const CLogCategoryList &CModelCaches::getLogCategories() + const QStringList &CModelCaches::getLogCategories() { - static const CLogCategoryList l({ CLogCategory::modelCache() }); + static const QStringList l({ CLogCategories::modelCache() }); return l; } @@ -411,9 +411,9 @@ namespace BlackMisc } } - const CLogCategoryList &CModelSetCaches::getLogCategories() + const QStringList &CModelSetCaches::getLogCategories() { - static const CLogCategoryList l({ CLogCategory::modelSetCache() }); + static const QStringList l({ CLogCategories::modelSetCache() }); return l; } diff --git a/src/blackmisc/simulation/data/modelcaches.h b/src/blackmisc/simulation/data/modelcaches.h index 7fab10967..fd4774be1 100644 --- a/src/blackmisc/simulation/data/modelcaches.h +++ b/src/blackmisc/simulation/data/modelcaches.h @@ -320,7 +320,7 @@ namespace BlackMisc CModelCaches(bool synchronizeCache, QObject *parent = nullptr); //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! \name Interface implementations //! @{ @@ -361,7 +361,7 @@ namespace BlackMisc CModelSetCaches(bool synchronizeCache, QObject *parent = nullptr); //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! \name Interface implementations //! @{ diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.cpp b/src/blackmisc/simulation/fscommon/fscommonutil.cpp index e211846e8..3b9924187 100644 --- a/src/blackmisc/simulation/fscommon/fscommonutil.cpp +++ b/src/blackmisc/simulation/fscommon/fscommonutil.cpp @@ -39,9 +39,9 @@ namespace BlackMisc { using FsRegistryPathPair = QList>; - const CLogCategoryList &CFsCommonUtil::getLogCategories() + const QStringList &CFsCommonUtil::getLogCategories() { - static const CLogCategoryList cats({ CLogCategory::validation(), CLogCategory::driver() }); + static const QStringList cats({ CLogCategories::validation(), CLogCategories::driver() }); return cats; } @@ -421,13 +421,13 @@ namespace BlackMisc messages.clear(); if (!CDirectoryUtils::existsUnemptyDirectory(CSwiftDirectories::shareTerrainProbeDirectory())) { - messages.push_back(CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, u"No terrain probe source files in '%1'") << CSwiftDirectories::shareTerrainProbeDirectory()); + messages.push_back(CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityError, u"No terrain probe source files in '%1'") << CSwiftDirectories::shareTerrainProbeDirectory()); return -1; } if (simObjectDir.isEmpty()) { - messages.push_back(CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, u"No simObject directory")); + messages.push_back(CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityError, u"No simObject directory")); return -1; } @@ -435,7 +435,7 @@ namespace BlackMisc const QDir td(targetDir); if (!td.exists()) { - messages.push_back(CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, u"Cannot access target directory '%1'") << targetDir); + messages.push_back(CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityError, u"Cannot access target directory '%1'") << targetDir); return -1; } @@ -444,12 +444,12 @@ namespace BlackMisc const bool hasDir = td.mkpath(targetDir); if (!hasDir) { - messages.push_back(CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, u"Cannot create target directory '%1'") << targetDir); + messages.push_back(CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityError, u"Cannot create target directory '%1'") << targetDir); return -1; } const int copied = CDirectoryUtils::copyDirectoryRecursively(CSwiftDirectories::shareTerrainProbeDirectory(), targetDir, true); - messages.push_back(CStatusMessage(getLogCategories(), CStatusMessage::SeverityInfo, u"Copied %1 files from '%2' to '%3'") << copied << CSwiftDirectories::shareTerrainProbeDirectory() << targetDir); + messages.push_back(CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityInfo, u"Copied %1 files from '%2' to '%3'") << copied << CSwiftDirectories::shareTerrainProbeDirectory() << targetDir); return copied; } @@ -475,7 +475,7 @@ namespace BlackMisc const QString pathUp = CFileUtils::appendFilePaths(CFileUtils::pathUp(path), "Lockheed Martin"); const QDir d(pathUp); if (!d.exists()) { continue; } - if (logConfigPathReading()) { CLogMessage(getLogCategories()).info(u"P3D config dir: '%1'") << d.absolutePath(); } + if (logConfigPathReading()) { CLogMessage(static_cast(nullptr)).info(u"P3D config dir: '%1'") << d.absolutePath(); } // all versions sub directories // looking for "add-ons.cfg" or simobjects.cfg @@ -490,7 +490,7 @@ namespace BlackMisc if (fi.exists()) { files.insert(f); - if (logConfigPathReading()) { CLogMessage(getLogCategories()).info(u"P3D config file: '%1'") << f; } + if (logConfigPathReading()) { CLogMessage(static_cast(nullptr)).info(u"P3D config file: '%1'") << f; } } } // contains } // entries @@ -531,7 +531,7 @@ namespace BlackMisc QDomDocument doc; QFile file(filename); if (!file.open(QIODevice::ReadOnly) || !doc.setContent(&file)) { continue; } - if (CFsCommonUtil::logConfigPathReading()) { CLogMessage(getLogCategories()).info(u"Reading '%1' from addon path: '%2'") << file.fileName() << addOnPath; } + if (CFsCommonUtil::logConfigPathReading()) { CLogMessage(static_cast(nullptr)).info(u"Reading '%1' from addon path: '%2'") << file.fileName() << addOnPath; } const QDomNodeList components = doc.elementsByTagName("AddOn.Component"); for (int i = 0; i < components.size(); i++) @@ -550,11 +550,11 @@ namespace BlackMisc const QString fp = pathValue.left(3).contains(':') ? pathValue : CFileUtils::appendFilePaths(addOnPath, pathValue); - if (CFsCommonUtil::logConfigPathReading()) { CLogMessage(getLogCategories()).info(u"Testing '%1' as addon path: '%2'") << fp << addOnPath; } + if (CFsCommonUtil::logConfigPathReading()) { CLogMessage(static_cast(nullptr)).info(u"Testing '%1' as addon path: '%2'") << fp << addOnPath; } if (!checked || QDir(fp).exists()) { simObjectPaths.insert(CFileUtils::normalizeFilePathToQtStandard(fp)); - if (logConfigPathReading()) { CLogMessage(getLogCategories()).info(u"P3D SimObjects path: '%1'") << fp; } + if (logConfigPathReading()) { CLogMessage(static_cast(nullptr)).info(u"P3D SimObjects path: '%1'") << fp; } } } // components } // paths @@ -591,7 +591,7 @@ namespace BlackMisc if (fi.exists()) { files.push_back(fi.absoluteFilePath()); - if (logConfigPathReading()) { CLogMessage(getLogCategories()).info(u"FSX config file: '%1'") << fi.absoluteFilePath(); } + if (logConfigPathReading()) { CLogMessage(static_cast(nullptr)).info(u"FSX config file: '%1'") << fi.absoluteFilePath(); } } } return files; @@ -626,7 +626,7 @@ namespace BlackMisc if (i2 < 0 || i1 >= i2 || line.endsWith('=')) { continue; } const QStringRef path = line.mid(i2 + 1); QString soPath = QDir::fromNativeSeparators(path.toString()); - if (logConfigPathReading()) { CLogMessage(getLogCategories()).info(u"FSX SimObjects path checked: '%1' in '%2'") << line << fsxFile; } + if (logConfigPathReading()) { CLogMessage(static_cast(nullptr)).info(u"FSX SimObjects path checked: '%1' in '%2'") << line << fsxFile; } // ignore exclude patterns if (containsAny(soPath, CFsCommonUtil::fsxSimObjectsExcludeDirectoryPatterns(), Qt::CaseInsensitive)) { continue; } @@ -638,19 +638,19 @@ namespace BlackMisc if (checked && !dir.exists()) { // skip, not existing - if (logConfigPathReading()) { CLogMessage(getLogCategories()).info(u"FSX SimObjects path skipped, not existing: '%1' in '%2'") << dir.absolutePath() << fsxFile; } + if (logConfigPathReading()) { CLogMessage(static_cast(nullptr)).info(u"FSX SimObjects path skipped, not existing: '%1' in '%2'") << dir.absolutePath() << fsxFile; } continue; } const QString afp = dir.absolutePath().toLower(); if (!CDirectoryUtils::containsFileInDir(afp, airFileFilter(), true)) { - if (logConfigPathReading()) { CLogMessage(getLogCategories()).info(u"FSX SimObjects path: Skipping '%1' from '%2', no '%3' file") << afp << fsxFile << airFileFilter(); } + if (logConfigPathReading()) { CLogMessage(static_cast(nullptr)).info(u"FSX SimObjects path: Skipping '%1' from '%2', no '%3' file") << afp << fsxFile << airFileFilter(); } continue; } paths.insert(afp); - if (logConfigPathReading()) { CLogMessage(getLogCategories()).info(u"FSX SimObjects path: '%1' from '%2'") << afp << fsxFile; } + if (logConfigPathReading()) { CLogMessage(static_cast(nullptr)).info(u"FSX SimObjects path: '%1' from '%2'") << afp << fsxFile; } } return paths; } @@ -669,13 +669,13 @@ namespace BlackMisc { for (const CAircraftModel &model : nonFsModels) { - m = CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, QStringLiteral("Removed '%1' non FS family model").arg(model.getModelStringAndDbKey()), true); + m = CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityError, QStringLiteral("Removed '%1' non FS family model").arg(model.getModelStringAndDbKey()), true); msgs.push_back(m); if (wasStopped) { break; } // allow to break from "outside" } const int d = validModels.removeIfNotFsFamily(); - m = CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, QStringLiteral("Removed %1 non FS family models").arg(d), true); + m = CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityError, QStringLiteral("Removed %1 non FS family models").arg(d), true); msgs.push_back(m); } @@ -692,7 +692,7 @@ namespace BlackMisc for (const CAircraftModel &removedModel : removedModels) { removedCfgEntries++; - m = CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, QStringLiteral("'%1' removed because no longer in '%2'").arg(removedModel.getModelStringAndDbKey(), removedModel.getFileName()), true); + m = CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityError, QStringLiteral("'%1' removed because no longer in '%2'").arg(removedModel.getModelStringAndDbKey(), removedModel.getFileName()), true); msgs.push_back(m); CAircraftModelList::addAsValidOrInvalidModel(removedModel, false, validModels, invalidModels); } @@ -700,18 +700,18 @@ namespace BlackMisc if (removedCfgEntries < 1) { - m = CStatusMessage(getLogCategories(), CStatusMessage::SeverityInfo, QStringLiteral("Not removed any models, all OK!"), true); + m = CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityInfo, QStringLiteral("Not removed any models, all OK!"), true); msgs.push_back(m); } if (!validModels.isEmpty()) { - m = CStatusMessage(getLogCategories(), CStatusMessage::SeverityInfo, QStringLiteral("cfg validation, valid models: %1").arg(validModels.size()), true); + m = CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityInfo, QStringLiteral("cfg validation, valid models: %1").arg(validModels.size()), true); msgs.push_back(m); } if (!invalidModels.isEmpty()) { - m = CStatusMessage(getLogCategories(), CStatusMessage::SeverityWarning, QStringLiteral("cfg validation, invalid models: %1").arg(invalidModels.size()), true); + m = CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityWarning, QStringLiteral("cfg validation, invalid models: %1").arg(invalidModels.size()), true); msgs.push_back(m); } @@ -747,7 +747,7 @@ namespace BlackMisc CStatusMessageList msgs; if (simObjectDirs.isEmpty()) { - msgs.push_back(CStatusMessage(getLogCategories()).validationInfo(u"No SimObject directories from cfg files, skipping validation")); + msgs.push_back(CStatusMessage(static_cast(nullptr)).validationInfo(u"No SimObject directories from cfg files, skipping validation")); return msgs; } @@ -755,13 +755,13 @@ namespace BlackMisc sortedModels.sortByFileName(); if (sortedModels.isEmpty()) { - msgs.push_back(CStatusMessage(getLogCategories()).validationInfo(u"No models to validate")); + msgs.push_back(CStatusMessage(static_cast(nullptr)).validationInfo(u"No models to validate")); return msgs; } // info const QString simObjDirs = joinStringSet(simObjectDirs, ", "); - msgs.push_back(CStatusMessage(getLogCategories()).validationInfo(u"Validating %1 models against %2 SimObjects path(s): '%3'") << models.size() << simObjectDirs.size() << simObjDirs); + msgs.push_back(CStatusMessage(static_cast(nullptr)).validationInfo(u"Validating %1 models against %2 SimObjects path(s): '%3'") << models.size() << simObjectDirs.size() << simObjDirs); // validate int failed = 0; @@ -770,7 +770,7 @@ namespace BlackMisc if (!model.hasFileName()) { if (ignoreEmptyFileNames) { continue; } - msgs.push_back(CStatusMessage(getLogCategories()).validationWarning(u"No file name for model '%1'") << model.getModelString()); + msgs.push_back(CStatusMessage(static_cast(nullptr)).validationWarning(u"No file name for model '%1'") << model.getModelString()); CAircraftModelList::addAsValidOrInvalidModel(model, false, validModels, invalidModels); continue; } @@ -785,14 +785,14 @@ namespace BlackMisc CAircraftModelList::addAsValidOrInvalidModel(model, ok, validModels, invalidModels); if (!ok) { - msgs.push_back(CStatusMessage(getLogCategories()).validationWarning(u"Model '%1' '%2' in none of the %3 SimObjects path(s)") << model.getModelString() << model.getFileName() << simObjectDirs.size()); + msgs.push_back(CStatusMessage(static_cast(nullptr)).validationWarning(u"Model '%1' '%2' in none of the %3 SimObjects path(s)") << model.getModelString() << model.getFileName() << simObjectDirs.size()); failed++; } if (stopAtFailedFiles > 0 && failed >= stopAtFailedFiles) { stopped = true; - msgs.push_back(CStatusMessage(getLogCategories()).validationWarning(u"Stopping after %1 failed models") << failed); + msgs.push_back(CStatusMessage(static_cast(nullptr)).validationWarning(u"Stopping after %1 failed models") << failed); break; } } // models diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.h b/src/blackmisc/simulation/fscommon/fscommonutil.h index 1dc01fa0a..3e7eed527 100644 --- a/src/blackmisc/simulation/fscommon/fscommonutil.h +++ b/src/blackmisc/simulation/fscommon/fscommonutil.h @@ -30,7 +30,7 @@ namespace BlackMisc { public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor CFsCommonUtil() = delete; diff --git a/src/blackmisc/simulation/interpolationlogger.cpp b/src/blackmisc/simulation/interpolationlogger.cpp index 5efa54545..150594f6d 100644 --- a/src/blackmisc/simulation/interpolationlogger.cpp +++ b/src/blackmisc/simulation/interpolationlogger.cpp @@ -41,9 +41,9 @@ namespace BlackMisc this->setObjectName("CInterpolationLogger"); } - const CLogCategoryList &CInterpolationLogger::getLogCategories() + const QStringList &CInterpolationLogger::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::interpolator() }; + static const QStringList cats { CLogCategories::interpolator() }; return cats; } diff --git a/src/blackmisc/simulation/interpolationlogger.h b/src/blackmisc/simulation/interpolationlogger.h index 67b17508b..b1dd73939 100644 --- a/src/blackmisc/simulation/interpolationlogger.h +++ b/src/blackmisc/simulation/interpolationlogger.h @@ -105,7 +105,7 @@ namespace BlackMisc CInterpolationLogger(QObject *parent = nullptr); //! Log categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Write a log in background CWorker *writeLogInBackground(bool clearLog); diff --git a/src/blackmisc/simulation/interpolator.cpp b/src/blackmisc/simulation/interpolator.cpp index e97082b51..12c073271 100644 --- a/src/blackmisc/simulation/interpolator.cpp +++ b/src/blackmisc/simulation/interpolator.cpp @@ -163,9 +163,9 @@ namespace BlackMisc } template - const CLogCategoryList &CInterpolator::getLogCategories() + const QStringList &CInterpolator::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::interpolator() }; + static const QStringList cats { CLogCategories::interpolator() }; return cats; } diff --git a/src/blackmisc/simulation/interpolator.h b/src/blackmisc/simulation/interpolator.h index 3b25f5aab..4b5b8ff18 100644 --- a/src/blackmisc/simulation/interpolator.h +++ b/src/blackmisc/simulation/interpolator.h @@ -187,7 +187,7 @@ namespace BlackMisc { public: //! Log categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Latest interpolation result const Aviation::CAircraftSituation &getLastInterpolatedSituation() const { return m_lastSituation; } diff --git a/src/blackmisc/simulation/matchingutils.cpp b/src/blackmisc/simulation/matchingutils.cpp index bf1d5c6de..92b318f7a 100644 --- a/src/blackmisc/simulation/matchingutils.cpp +++ b/src/blackmisc/simulation/matchingutils.cpp @@ -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 diff --git a/src/blackmisc/simulation/matchingutils.h b/src/blackmisc/simulation/matchingutils.h index 1cc524d60..65b0986d9 100644 --- a/src/blackmisc/simulation/matchingutils.h +++ b/src/blackmisc/simulation/matchingutils.h @@ -29,7 +29,7 @@ namespace BlackMisc //! \threadsafe static void addLogDetailsToList( CStatusMessageList *log, const Simulation::CSimulatedAircraft &remoteAircraft, - const QString &message, const CLogCategoryList &extraCategories = {}, + const QString &message, const QStringList &extraCategories = {}, CStatusMessage::StatusSeverity s = CStatusMessage::SeverityInfo); private: @@ -37,7 +37,7 @@ namespace BlackMisc static const CLogCategoryList &defaultCategories(); //! Categories - static CLogCategoryList categories(const CLogCategoryList &extraCategories); + static CLogCategoryList categories(const QStringList &extraCategories); }; } // ns } // ns diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index b6607c1d4..0e7aeb4b1 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -31,9 +31,9 @@ namespace BlackMisc IRemoteAircraftProvider::~IRemoteAircraftProvider() { } - const CLogCategoryList &CRemoteAircraftProvider::getLogCategories() + const QStringList &CRemoteAircraftProvider::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::matching(), CLogCategory::network() }; + static const QStringList cats { CLogCategories::matching(), CLogCategories::network() }; return cats; } diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index ab66e50d9..a27dcdc26 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -299,7 +299,7 @@ namespace BlackMisc public: //! Log categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor CRemoteAircraftProvider(QObject *parent); diff --git a/src/blackmisc/simulation/settings/simulatorsettings.cpp b/src/blackmisc/simulation/settings/simulatorsettings.cpp index 8e7f8dfbe..7148a6ec6 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.cpp +++ b/src/blackmisc/simulation/settings/simulatorsettings.cpp @@ -236,7 +236,7 @@ namespace BlackMisc Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator"); break; } - return CStatusMessage({ CLogCategory::settings() }, CStatusMessage::SeverityError, u"wrong simulator"); + return CStatusMessage({ CLogCategories::settings() }, CStatusMessage::SeverityError, u"wrong simulator"); } CStatusMessage CMultiSimulatorSettings::addModelDirectory(const QString &modelDirectory, const CSimulatorInfo &simulator) @@ -244,7 +244,7 @@ namespace BlackMisc CSimulatorSettings s = this->getSettings(simulator); if (!s.addModelDirectory(modelDirectory)) { - return CStatusMessage({ CLogCategory::settings() }, CStatusMessage::SeverityInfo, u"directory already existing"); + return CStatusMessage({ CLogCategories::settings() }, CStatusMessage::SeverityInfo, u"directory already existing"); } return this->setSettings(s, simulator); } @@ -296,7 +296,7 @@ namespace BlackMisc Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator"); break; } - return CStatusMessage({ CLogCategory::settings() }, CStatusMessage::SeverityError, u"wrong simulator"); + return CStatusMessage({ CLogCategories::settings() }, CStatusMessage::SeverityError, u"wrong simulator"); } CStatusMessage CMultiSimulatorSettings::setAndSaveSettings(const CSpecializedSimulatorSettings &settings, const CSimulatorInfo &simulator) @@ -318,7 +318,7 @@ namespace BlackMisc Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator"); break; } - return CStatusMessage({ CLogCategory::settings() }, CStatusMessage::SeverityError, u"wrong simulator"); + return CStatusMessage({ CLogCategories::settings() }, CStatusMessage::SeverityError, u"wrong simulator"); } QString CMultiSimulatorSettings::getSimulatorDirectoryIfNotDefault(const CSimulatorInfo &simulator) const diff --git a/src/blackmisc/simulation/xplane/xplaneutil.cpp b/src/blackmisc/simulation/xplane/xplaneutil.cpp index 28e58504a..841262e70 100644 --- a/src/blackmisc/simulation/xplane/xplaneutil.cpp +++ b/src/blackmisc/simulation/xplane/xplaneutil.cpp @@ -29,9 +29,9 @@ namespace BlackMisc { namespace XPlane { - const CLogCategoryList &CXPlaneUtil::getLogCategories() + const QStringList &CXPlaneUtil::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::matching() }; + static const QStringList cats { CLogCategories::matching() }; return cats; } @@ -289,7 +289,7 @@ namespace BlackMisc { if (simDir.isEmpty()) { - return CStatusMessage(getLogCategories(), CStatusMessage::SeverityWarning, u"no simulator directory", true); + return CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityWarning, u"no simulator directory", true); } CStatusMessageList msgs; @@ -302,8 +302,8 @@ namespace BlackMisc CDirectoryUtils::isSameOrSubDirectoryOf(modelDir, sd) : CDirectoryUtils::isSameOrSubDirectoryOfStringBased(modelDir, sd.absolutePath()); const CStatusMessage m = exists ? - CStatusMessage(getLogCategories()).info(u"Model directory '%1' inside '%2'") << modelDir << sd.absolutePath() : - CStatusMessage(getLogCategories()).error(u"Model directory '%1' NOT inside '%2'") << modelDir << sd.absolutePath(); + CStatusMessage(static_cast(nullptr)).info(u"Model directory '%1' inside '%2'") << modelDir << sd.absolutePath() : + CStatusMessage(static_cast(nullptr)).error(u"Model directory '%1' NOT inside '%2'") << modelDir << sd.absolutePath(); msgs.push_back(m); } msgs.addValidationCategory(); diff --git a/src/blackmisc/simulation/xplane/xplaneutil.h b/src/blackmisc/simulation/xplane/xplaneutil.h index b6ac8210e..e801fc0b0 100644 --- a/src/blackmisc/simulation/xplane/xplaneutil.h +++ b/src/blackmisc/simulation/xplane/xplaneutil.h @@ -30,7 +30,7 @@ namespace BlackMisc CXPlaneUtil() = delete; //! Log categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! XPlane 9 directory static QString xplane9Dir(); diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp index 05c83dd67..17346855e 100644 --- a/src/blackmisc/statusmessage.cpp +++ b/src/blackmisc/statusmessage.cpp @@ -343,7 +343,7 @@ namespace BlackMisc StatusSeverity severity = stringToSeverity(severityText); typeText = u"swift.db.type." % typeText.toLower().remove(' '); - const CStatusMessage m({ CLogCategory::swiftDbWebservice(), CLogCategory(typeText)}, severity, msgText); + const CStatusMessage m({ CLogCategories::swiftDbWebservice(), typeText}, severity, msgText); return m; } diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h index c955eae70..564f798a2 100644 --- a/src/blackmisc/statusmessage.h +++ b/src/blackmisc/statusmessage.h @@ -246,7 +246,7 @@ namespace BlackMisc bool isEmpty() const { return this->m_message.isEmpty() && this->m_args.isEmpty(); } private: - void setValidation() { m_categories.remove(CLogCategory::uncategorized()); this->addIfNotExisting(CLogCategory::validation()); } + void setValidation() { m_categories.remove(CLogCategories::uncategorized()); this->addIfNotExisting(CLogCategories::validation()); } Derived &arg(const QString &value) { m_args.push_back(value); return derived(); } Derived &derived() { return static_cast(*this); } @@ -279,7 +279,7 @@ namespace BlackMisc //! @{ CStrongStringView m_message; QStringList m_args; - CLogCategoryList m_categories = CLogCategoryList { CLogCategory::uncategorized() }; + CLogCategoryList m_categories = CLogCategoryList { CLogCategories::uncategorized() }; StatusSeverity m_severity = SeverityDebug; QString message() const { return Private::arg(m_message.view(), m_args); } @@ -451,7 +451,7 @@ namespace BlackMisc void addCategory(const CLogCategory &category) { this->addIfNotExisting(category); } //! Adds validation as category - void addValidationCategory() { this->addCategory(CLogCategory::validation()); } + void addValidationCategory() { this->addCategory(CLogCategories::validation()); } //! Add categories, avoids duplicates void addCategories(const CLogCategoryList &categories) { this->addIfNotExisting(categories); } diff --git a/src/blackmisc/statusmessagelist.cpp b/src/blackmisc/statusmessagelist.cpp index 99620b019..44a2159f9 100644 --- a/src/blackmisc/statusmessagelist.cpp +++ b/src/blackmisc/statusmessagelist.cpp @@ -89,7 +89,7 @@ namespace BlackMisc void CStatusMessageList::addValidationCategory() { - this->addCategory(CLogCategory::validation()); + this->addCategory(CLogCategories::validation()); } void CStatusMessageList::addCategories(const CLogCategoryList &categories) @@ -102,7 +102,7 @@ namespace BlackMisc void CStatusMessageList::addValidationMessage(const QString &validationText, CStatusMessage::StatusSeverity severity) { - static const CLogCategoryList cats({ CLogCategory::validation() }); + static const CLogCategoryList cats({ CLogCategories::validation() }); const CStatusMessage msg(cats, severity, validationText); this->push_back(msg); } diff --git a/src/blackmisc/valuecache.cpp b/src/blackmisc/valuecache.cpp index b22618865..c29a68ca9 100644 --- a/src/blackmisc/valuecache.cpp +++ b/src/blackmisc/valuecache.cpp @@ -158,9 +158,9 @@ namespace BlackMisc // CValueCache //////////////////////////////// - const CLogCategoryList &CValueCache::getLogCategories() + const QStringList &CValueCache::getLogCategories() { - static const CLogCategoryList cats({ CLogCategory("swift.valuecache") , CLogCategory::services()} ); + static const QStringList cats({ "swift.valuecache" , CLogCategories::services()} ); return cats; } @@ -592,7 +592,7 @@ namespace BlackMisc // Private :: CValuePage //////////////////////////////// - const CLogCategoryList &CValuePage::getLogCategories() + const QStringList &CValuePage::getLogCategories() { return CValueCache::getLogCategories(); } diff --git a/src/blackmisc/valuecache.h b/src/blackmisc/valuecache.h index 0614ace9c..1a208906e 100644 --- a/src/blackmisc/valuecache.h +++ b/src/blackmisc/valuecache.h @@ -163,7 +163,7 @@ namespace BlackMisc class BatchGuard; //! Log categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor. explicit CValueCache(int fileSplitDepth, QObject *parent = nullptr); diff --git a/src/blackmisc/valuecacheprivate.h b/src/blackmisc/valuecacheprivate.h index 05e9f3000..a43f9684b 100644 --- a/src/blackmisc/valuecacheprivate.h +++ b/src/blackmisc/valuecacheprivate.h @@ -63,7 +63,7 @@ namespace BlackMisc public: //! Log categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Returns a CValuePage owned by the parent and connected to the cache, creating one if it doesn't exist. static CValuePage &getPageFor(QObject *parent, CValueCache *cache); diff --git a/src/blackmisc/verify.cpp b/src/blackmisc/verify.cpp index 63363f3d5..2f94a1b5b 100644 --- a/src/blackmisc/verify.cpp +++ b/src/blackmisc/verify.cpp @@ -65,11 +65,11 @@ namespace BlackMisc #if defined(QT_NO_DEBUG) || defined(Q_CC_MSVC) if (context && message) { - CLogMessage(CLogCategory::verification()).warning(u"Failed to verify: %1 (%2 in %3) in %4 line %5") << condition << message << context << filename << line; + CLogMessage(CLogCategories::verification()).warning(u"Failed to verify: %1 (%2 in %3) in %4 line %5") << condition << message << context << filename << line; } else { - CLogMessage(CLogCategory::verification()).warning(u"Failed to verify: %1 in %2 line %3") << condition << filename << line; + CLogMessage(CLogCategories::verification()).warning(u"Failed to verify: %1 in %2 line %3") << condition << filename << line; } # if defined(BLACK_USE_CRASHPAD) CRASHPAD_SIMULATE_CRASH(); diff --git a/src/blackmisc/worker.cpp b/src/blackmisc/worker.cpp index f2ab3de34..c2123005b 100644 --- a/src/blackmisc/worker.cpp +++ b/src/blackmisc/worker.cpp @@ -117,9 +117,9 @@ namespace BlackMisc s_allWorkers.remove(this); } - const CLogCategoryList &CWorkerBase::getLogCategories() + const QStringList &CWorkerBase::getLogCategories() { - static const BlackMisc::CLogCategoryList cats { CLogCategory::worker() }; + static const QStringList cats { CLogCategories::worker() }; return cats; } diff --git a/src/blackmisc/worker.h b/src/blackmisc/worker.h index 28d414714..0438fb847 100644 --- a/src/blackmisc/worker.h +++ b/src/blackmisc/worker.h @@ -72,7 +72,7 @@ namespace BlackMisc public: //! Log categories - static const CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Connects to a functor or method which will be called when the task is finished. //! \threadsafe The functor may not call any method that observes the worker's finished flag. diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp index 357875886..486759fef 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp @@ -29,9 +29,9 @@ namespace BlackSimPlugin { namespace Emulated { - const CLogCategoryList &CSimulatorEmulatedMonitorDialog::getLogCategories() + const QStringList &CSimulatorEmulatedMonitorDialog::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::driver(), CLogCategory::plugin() }; + static const QStringList cats { CLogCategories::driver(), CLogCategories::plugin() }; return cats; } diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h index 4ba55ac1f..1a0ae23dd 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h @@ -37,7 +37,7 @@ namespace BlackSimPlugin public: //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Ctor explicit CSimulatorEmulatedMonitorDialog(CSimulatorEmulated *simulator, QWidget *parent = nullptr); diff --git a/src/plugins/simulator/fs9/directplaypeer.cpp b/src/plugins/simulator/fs9/directplaypeer.cpp index 9ed6e7efd..eee4bfdf5 100644 --- a/src/plugins/simulator/fs9/directplaypeer.cpp +++ b/src/plugins/simulator/fs9/directplaypeer.cpp @@ -24,9 +24,9 @@ namespace BlackSimPlugin { namespace Fs9 { - const CLogCategoryList &CDirectPlayPeer::getLogCategories() + const QStringList &CDirectPlayPeer::getLogCategories() { - static const BlackMisc::CLogCategoryList cats { CLogCategory::driver() }; + static const QStringList cats { CLogCategories::driver() }; return cats; } diff --git a/src/plugins/simulator/fs9/directplaypeer.h b/src/plugins/simulator/fs9/directplaypeer.h index 7edcffa75..b0eda7b5c 100644 --- a/src/plugins/simulator/fs9/directplaypeer.h +++ b/src/plugins/simulator/fs9/directplaypeer.h @@ -49,7 +49,7 @@ namespace BlackSimPlugin void setPlayerUserId(DPNID id) { m_playerUser = id; } //! Log categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.cpp b/src/plugins/simulator/fscommon/simulatorfscommon.cpp index 94ed4ccec..529ca92cc 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.cpp +++ b/src/plugins/simulator/fscommon/simulatorfscommon.cpp @@ -62,7 +62,7 @@ namespace BlackSimPlugin { const bool on = parser.toBool(2); const bool s = this->useFsuipc(on); - CLogMessage(this, CLogCategory::cmdLine()).info(u"FSUIPC is '%1'") << boolToOnOff(s); + CLogMessage(this, CLogCategories::cmdLine()).info(u"FSUIPC is '%1'") << boolToOnOff(s); return s; } return CSimulatorPluginCommon::parseDetails(parser); diff --git a/src/plugins/simulator/fsxcommon/simconnectsymbols.cpp b/src/plugins/simulator/fsxcommon/simconnectsymbols.cpp index c54a97ef1..c98cd0183 100644 --- a/src/plugins/simulator/fsxcommon/simconnectsymbols.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectsymbols.cpp @@ -124,7 +124,7 @@ bool resolveSimConnectSymbol(QLibrary &library, FuncPtr &funcPtr, const char *fu funcPtr = reinterpret_cast(library.resolve(funcName)); if (! funcPtr) { - CLogMessage(CLogCategory::driver()).error(u"Failed to resolve %1: %2") << funcName << library.errorString(); + CLogMessage(CLogCategories::driver()).error(u"Failed to resolve %1: %2") << funcName << library.errorString(); return false; } return true; @@ -226,21 +226,21 @@ bool loadAndResolveP3DSimConnect(P3DSimConnectVersion version) const bool resolvedP3DSimConnectSymbols = resolveP3DSimConnectSymbols(simConnectDll); if (!resolvedCommon) { - CLogMessage(CLogCategory::driver()).error(u"Failed to resolve common symbols from SimConnect.dll: '%1'") << simConnectFileName; + CLogMessage(CLogCategories::driver()).error(u"Failed to resolve common symbols from SimConnect.dll: '%1'") << simConnectFileName; return false; } if (!resolvedP3DSimConnectSymbols) { - CLogMessage(CLogCategory::driver()).error(u"Failed to resolve P3D symbols from SimConnect.dll: '%1'") << simConnectFileName; + CLogMessage(CLogCategories::driver()).error(u"Failed to resolve P3D symbols from SimConnect.dll: '%1'") << simConnectFileName; return false; } - CLogMessage(CLogCategory::driver()).info(u"Loaded and resolved P3D symbols from SimConnect.dll: '%1'") << simConnectFileName; + CLogMessage(CLogCategories::driver()).info(u"Loaded and resolved P3D symbols from SimConnect.dll: '%1'") << simConnectFileName; return resolvedCommon && resolvedP3DSimConnectSymbols; } else { - CLogMessage(CLogCategory::driver()).error(u"Failed to load SimConnect.dll: '%1' '%2'") << simConnectFileName << simConnectDll.errorString(); + CLogMessage(CLogCategories::driver()).error(u"Failed to load SimConnect.dll: '%1' '%2'") << simConnectFileName << simConnectDll.errorString(); return false; } } @@ -304,7 +304,7 @@ bool loadAndResolveFsxSimConnect(bool manifestProbing) } else { - CLogMessage(CLogCategory::driver()).error(u"Failed to load SimConnect.dll: %1") << simConnectDll.errorString(); + CLogMessage(CLogCategories::driver()).error(u"Failed to load SimConnect.dll: %1") << simConnectDll.errorString(); return false; } } diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index 684385dbb..443fa77a0 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -1375,7 +1375,7 @@ namespace BlackSimPlugin { const bool trace = parser.toBool(2); this->setTraceSendId(trace); - CLogMessage(this, CLogCategory::cmdLine()).info(u"Tracing %1 driver sendIds is '%2'") << this->getSimulatorPluginInfo().getIdentifier() << boolToOnOff(trace); + CLogMessage(this, CLogCategories::cmdLine()).info(u"Tracing %1 driver sendIds is '%2'") << this->getSimulatorPluginInfo().getIdentifier() << boolToOnOff(trace); return true; } @@ -1384,7 +1384,7 @@ namespace BlackSimPlugin { const bool on = parser.toBool(2); this->setUsingSbOffsetValues(on); - CLogMessage(this, CLogCategory::cmdLine()).info(u"SB offsets is '%1'") << boolToOnOff(on); + CLogMessage(this, CLogCategories::cmdLine()).info(u"SB offsets is '%1'") << boolToOnOff(on); return true; } @@ -1393,7 +1393,7 @@ namespace BlackSimPlugin { const bool on = parser.toBool(2); m_logSbOffsets = on; - CLogMessage(this, CLogCategory::cmdLine()).info(u"SB log. offsets is '%1'") << boolToOnOff(on); + CLogMessage(this, CLogCategories::cmdLine()).info(u"SB log. offsets is '%1'") << boolToOnOff(on); return true; } diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp index b26babe7f..ab5fd56e9 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp @@ -24,9 +24,9 @@ namespace BlackSimPlugin { namespace XPlane { - const CLogCategoryList &CXSwiftBusTrafficProxy::getLogCategories() + const QStringList &CXSwiftBusTrafficProxy::getLogCategories() { - static const CLogCategoryList cats { CLogCategory::driver(), CLogCategory::dbus() }; + static const QStringList cats { CLogCategories::driver(), CLogCategories::dbus() }; return cats; } diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h index 1e9667ec5..70b166fb2 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h @@ -178,7 +178,7 @@ namespace BlackSimPlugin } //! Log. categories - static const BlackMisc::CLogCategoryList &getLogCategories(); + static const QStringList &getLogCategories(); //! Constructor CXSwiftBusTrafficProxy(QDBusConnection &connection, QObject *parent = nullptr, bool dummy = false); diff --git a/src/swiftguistandard/swiftguistdapplication.cpp b/src/swiftguistandard/swiftguistdapplication.cpp index b7d2f509e..0828a9c69 100644 --- a/src/swiftguistandard/swiftguistdapplication.cpp +++ b/src/swiftguistandard/swiftguistdapplication.cpp @@ -40,7 +40,7 @@ CStatusMessageList CSwiftGuiStdApplication::startHookIn() { if (coreMode == CoreModes::Standalone && !dBusAddress.isEmpty()) { - const CStatusMessage m = CStatusMessage(this, CLogCategory::validation()). + const CStatusMessage m = CStatusMessage(this, CLogCategories::validation()). error(u"Inconsistent pair DBus: '%1' and core: '%2'") << dBusAddress << coreModeStr; return CStatusMessageList(m) ; @@ -52,7 +52,7 @@ CStatusMessageList CSwiftGuiStdApplication::startHookIn() if (!dBusAddress.isEmpty() && coreModeStr.isEmpty()) { coreMode = CoreModes::Distributed; // default - const CStatusMessage m = CStatusMessage(this, CLogCategory::validation()). + const CStatusMessage m = CStatusMessage(this, CLogCategories::validation()). info(u"No DBus address, setting core mode: '%1'") << CoreModes::coreModeToString(coreMode); msgs.push_back(m); @@ -60,7 +60,7 @@ CStatusMessageList CSwiftGuiStdApplication::startHookIn() else if (dBusAddress.isEmpty() && coreMode == CoreModes::Distributed) { dBusAddress = CDBusServer::sessionBusAddress(); // a possible default - const CStatusMessage m = CStatusMessage(this, CLogCategory::validation()). + const CStatusMessage m = CStatusMessage(this, CLogCategories::validation()). info(u"Setting DBus address to '%1'") << dBusAddress; msgs.push_back(m); diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp index 0537f9b28..d8d8ab8be 100644 --- a/src/swiftguistandard/swiftguistdinit.cpp +++ b/src/swiftguistandard/swiftguistdinit.cpp @@ -94,7 +94,7 @@ void SwiftGuiStd::init() connect(&m_logHistoryForOverlay, &CLogHistoryReplica::elementAdded, this, [this](const CStatusMessage& message) { //! \todo filter out validation messages at CLogPattern level - if (!message.getCategories().contains(CLogCategory::validation())) { ui->fr_CentralFrameInside->showOverlayMessage(message); } + if (!message.getCategories().contains(CLogCategories::validation())) { ui->fr_CentralFrameInside->showOverlayMessage(message); } }); m_logHistoryForStatus.initialize(sApp->getDataLinkDBus()); m_logHistoryForOverlay.initialize(sApp->getDataLinkDBus());