From 5af1ffbfc1f98d3c9d245a00632feb8bb1450dc3 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Wed, 24 Apr 2024 23:20:49 +0200 Subject: [PATCH] refactor: Remove deprecated functions --- src/blackcore/db/airportdatareader.cpp | 2 +- src/blackcore/db/backgrounddataupdater.cpp | 2 +- src/blackcore/db/databasereader.cpp | 20 +++++++++---------- src/blackcore/db/databasereaderconfig.cpp | 2 +- src/blackcore/webdataservices.cpp | 10 +++++----- src/blackmisc/network/entityflags.cpp | 5 ----- src/blackmisc/network/entityflags.h | 4 ---- .../simulation/settings/simulatorsettings.h | 8 -------- 8 files changed, 18 insertions(+), 35 deletions(-) diff --git a/src/blackcore/db/airportdatareader.cpp b/src/blackcore/db/airportdatareader.cpp index f1ffe3d55..10bc96b00 100644 --- a/src/blackcore/db/airportdatareader.cpp +++ b/src/blackcore/db/airportdatareader.cpp @@ -72,7 +72,7 @@ namespace BlackCore::Db whatToRead &= CEntityFlags::AirportEntity; // can handle these entities if (whatToRead == CEntityFlags::NoEntity) { - return CStatusMessage(this).info(u"'%1' No entity for this reader") << CEntityFlags::flagToString(whatToRead); + return CStatusMessage(this).info(u"'%1' No entity for this reader") << CEntityFlags::entitiesToString(whatToRead); } int c = 0; diff --git a/src/blackcore/db/backgrounddataupdater.cpp b/src/blackcore/db/backgrounddataupdater.cpp index a4c035b86..8bc89869a 100644 --- a/src/blackcore/db/backgrounddataupdater.cpp +++ b/src/blackcore/db/backgrounddataupdater.cpp @@ -159,7 +159,7 @@ namespace BlackCore::Db if (!latestCacheTs.isValid()) { return; } const QDateTime latestDbTs = sApp->getWebDataServices()->getLatestDbEntityTimestamp(entity); - const QString entityStr = CEntityFlags::flagToString(entity); + const QString entityStr = CEntityFlags::entitiesToString(entity); const QString latestCacheTsStr = latestCacheTs.toString(Qt::ISODate); if (!latestDbTs.isValid()) { return; } diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp index c17064401..dcefe9ffe 100644 --- a/src/blackcore/db/databasereader.cpp +++ b/src/blackcore/db/databasereader.cpp @@ -57,7 +57,7 @@ namespace BlackCore::Db while (currentEntity) { const CDatabaseReaderConfig config(this->getConfigForEntity(currentEntity)); - const QString currentEntityName = CEntityFlags::flagToString(currentEntity); + const QString currentEntityName = CEntityFlags::entitiesToString(currentEntity); // retrieval mode const CDbFlags::DataRetrievalMode rm = config.getRetrievalMode(); // DB reading, cache, shared @@ -159,14 +159,14 @@ namespace BlackCore::Db // Real read from DB if (dbEntities != CEntityFlags::NoEntity) { - CLogMessage(this).info(u"Start reading DB entities: %1") << CEntityFlags::flagToString(dbEntities); + CLogMessage(this).info(u"Start reading DB entities: %1") << CEntityFlags::entitiesToString(dbEntities); this->startReadFromBackendInBackgroundThread(dbEntities, CDbFlags::DbReading, newerThan); } // Real read from shared if (sharedEntities != CEntityFlags::NoEntity) { - CLogMessage(this).info(u"Start reading shared entities: %1") << CEntityFlags::flagToString(sharedEntities); + CLogMessage(this).info(u"Start reading shared entities: %1") << CEntityFlags::entitiesToString(sharedEntities); this->startReadFromBackendInBackgroundThread(dbEntities, CDbFlags::Shared, newerThan); } } @@ -186,7 +186,7 @@ namespace BlackCore::Db if (newerHeaderEntities != entities) { const CEntityFlags::Entity validInCacheEntities = (entities ^ newerHeaderEntities) & entities; - CLogMessage(this).info(u"Reduced '%1' to '%2' before triggering load of shared files (still in cache)") << CEntityFlags::flagToString(entities) << CEntityFlags::flagToString(newerHeaderEntities); + CLogMessage(this).info(u"Reduced '%1' to '%2' before triggering load of shared files (still in cache)") << CEntityFlags::entitiesToString(entities) << CEntityFlags::entitiesToString(newerHeaderEntities); // In case we have difference entities we treat them as they were loaded, they result from still being in the cache // Using timer to first finish this function, then the resulting signal @@ -397,7 +397,7 @@ namespace BlackCore::Db CUrl url = urlSharedDbdata; url.appendPath(fileName); - const QString entityString = CEntityFlags::flagToString(currentEntity); + const QString entityString = CEntityFlags::entitiesToString(currentEntity); CLogMessage(this).info(u"Triggered read of header for shared file of '%1'") << entityString; const QNetworkReply *reply = sApp->headerFromNetwork(url, { this, &CDatabaseReader::receivedSharedFileHeader }); if (reply) { c++; } @@ -488,13 +488,13 @@ namespace BlackCore::Db { // never emit when lock is held, deadlock Q_ASSERT_X(CEntityFlags::isSingleEntity(entity), Q_FUNC_INFO, "Expect single entity"); - CLogMessage(this).info(u"Read %1 entities of '%2' from '%3' (%4)") << number << CEntityFlags::flagToString(entity) << res.getUrlString() << res.getLoadTimeStringWithStartedHint(); + CLogMessage(this).info(u"Read %1 entities of '%2' from '%3' (%4)") << number << CEntityFlags::entitiesToString(entity) << res.getUrlString() << res.getLoadTimeStringWithStartedHint(); emit this->dataRead(entity, res.isRestricted() ? CEntityFlags::ReadFinishedRestricted : CEntityFlags::ReadFinished, number, res.getUrl()); } void CDatabaseReader::logNoWorkingUrl(CEntityFlags::Entity entity) { - const CStatusMessage msg = CStatusMessage(this, m_severityNoWorkingUrl, u"No working URL for '%1'") << CEntityFlags::flagToString(entity); + const CStatusMessage msg = CStatusMessage(this, m_severityNoWorkingUrl, u"No working URL for '%1'") << CEntityFlags::entitiesToString(entity); CLogMessage::preformatted(msg); } @@ -569,7 +569,7 @@ namespace BlackCore::Db QString CDatabaseReader::getSupportedEntitiesAsString() const { - return CEntityFlags::flagToString(this->getSupportedEntities()); + return CEntityFlags::entitiesToString(this->getSupportedEntities()); } CEntityFlags::Entity CDatabaseReader::maskBySupportedEntities(CEntityFlags::Entity entities) const @@ -609,8 +609,8 @@ namespace BlackCore::Db { const bool s = this->readFromJsonFilesInBackground(CSwiftDirectories::staticDbFilesDirectory(), entities, overrideNewerOnly); return s ? - CStatusMessage(this).info(u"Started reading in background from '%1' of entities: '%2'") << CSwiftDirectories::staticDbFilesDirectory() << CEntityFlags::flagToString(entities) : - CStatusMessage(this).error(u"Starting reading in background from '%1' of entities: '%2' failed") << CSwiftDirectories::staticDbFilesDirectory() << CEntityFlags::flagToString(entities); + CStatusMessage(this).info(u"Started reading in background from '%1' of entities: '%2'") << CSwiftDirectories::staticDbFilesDirectory() << CEntityFlags::entitiesToString(entities) : + CStatusMessage(this).error(u"Starting reading in background from '%1' of entities: '%2' failed") << CSwiftDirectories::staticDbFilesDirectory() << CEntityFlags::entitiesToString(entities); } else { diff --git a/src/blackcore/db/databasereaderconfig.cpp b/src/blackcore/db/databasereaderconfig.cpp index 2fd12b2dd..ecdba9e17 100644 --- a/src/blackcore/db/databasereaderconfig.cpp +++ b/src/blackcore/db/databasereaderconfig.cpp @@ -26,7 +26,7 @@ namespace BlackCore::Db { return CDbFlags::flagToString(this->getRetrievalMode()) % u' ' % - CEntityFlags::flagToString(this->getEntities()) % + CEntityFlags::entitiesToString(this->getEntities()) % u' ' % m_cacheLifetime.toQString(i18n); } diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index 8dff0fa47..2dd643685 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/blackcore/webdataservices.cpp @@ -1308,7 +1308,7 @@ namespace BlackCore if (state == CEntityFlags::ReadStarted) { return; } // just started const QString from = url.isEmpty() ? QStringLiteral("") : QStringLiteral(" from '%1'").arg(url.toString()); - const QString entStr = CEntityFlags::flagToString(entities); + const QString entStr = CEntityFlags::entitiesToString(entities); if (CEntityFlags::isWarningOrAbove(state)) { @@ -1441,7 +1441,7 @@ namespace BlackCore if (infoReader->areAllInfoObjectsRead()) { // we have all data and carry on - CLogMessage(this).info(u"Info objects (%1) triggered for '%2' loaded from '%3'") << info << CEntityFlags::flagToString(entities) << infoReader->getInfoObjectsUrl().toQString(); + CLogMessage(this).info(u"Info objects (%1) triggered for '%2' loaded from '%3'") << info << CEntityFlags::entitiesToString(entities) << infoReader->getInfoObjectsUrl().toQString(); timeOut = QDateTime(); // reset to null return true; // no need to wait any longer } @@ -1451,7 +1451,7 @@ namespace BlackCore { const QString timeOutString = timeOut.toString(); const CStatusMessage m = CLogMessage(this).warning(u"Could not read '%1' info objects for '%2' from '%3', time out '%4'. Marking reader '%5' as failed and continue.") - << info << CEntityFlags::flagToString(entities) + << info << CEntityFlags::entitiesToString(entities) << infoReader->getInfoObjectsUrl().toQString() << timeOutString << infoReader->getName(); emit this->databaseReaderMessages(m); @@ -1469,7 +1469,7 @@ namespace BlackCore { // ok, this means we are parsing this->readDeferredInBackground(entities, waitForInfoObjectsMs); - const CStatusMessage m = CLogMessage(this).info(u"Parsing objects (%1) for '%2' from '%3'") << info << CEntityFlags::flagToString(entities) << infoReader->getInfoObjectsUrl().toQString(); + const CStatusMessage m = CLogMessage(this).info(u"Parsing objects (%1) for '%2' from '%3'") << info << CEntityFlags::entitiesToString(entities) << infoReader->getInfoObjectsUrl().toQString(); emit this->databaseReaderMessages(m); return false; // wait } @@ -1477,7 +1477,7 @@ namespace BlackCore { // we have a response, but a failure, means server is alive, but responded with error // such an error (access, ...) normally will not go away - const CStatusMessage m = CLogMessage(this).error(u"Info objects (%1) loading for '%2' failed from '%3', '%4'") << info << CEntityFlags::flagToString(entities) << infoReader->getInfoObjectsUrl().toQString() << infoReader->getStatusMessage(); + const CStatusMessage m = CLogMessage(this).error(u"Info objects (%1) loading for '%2' failed from '%3', '%4'") << info << CEntityFlags::entitiesToString(entities) << infoReader->getInfoObjectsUrl().toQString() << infoReader->getStatusMessage(); infoReader->setMarkedAsFailed(true); emit this->databaseReaderMessages(m); return true; // carry on, regardless of situation diff --git a/src/blackmisc/network/entityflags.cpp b/src/blackmisc/network/entityflags.cpp index a96d574fa..93ad451dd 100644 --- a/src/blackmisc/network/entityflags.cpp +++ b/src/blackmisc/network/entityflags.cpp @@ -37,11 +37,6 @@ namespace BlackMisc::Network } } - QString CEntityFlags::flagToString(CEntityFlags::Entity entities) - { - return entitiesToString(entities, ", "); - } - QStringList CEntityFlags::entitiesToStringList(CEntityFlags::Entity entities) { QStringList list; diff --git a/src/blackmisc/network/entityflags.h b/src/blackmisc/network/entityflags.h index 9a4f64767..2cb753647 100644 --- a/src/blackmisc/network/entityflags.h +++ b/src/blackmisc/network/entityflags.h @@ -67,10 +67,6 @@ namespace BlackMisc::Network //! Convert to string static QString flagToString(CEntityFlags::EntityFlag flag); - //! Convert to string - //! \deprecated use entities to string - static QString flagToString(CEntityFlags::Entity entities); - //! Entities to string list static QStringList entitiesToStringList(CEntityFlags::Entity entities); diff --git a/src/blackmisc/simulation/settings/simulatorsettings.h b/src/blackmisc/simulation/settings/simulatorsettings.h index 28be6b47d..b540d814f 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.h +++ b/src/blackmisc/simulation/settings/simulatorsettings.h @@ -510,14 +510,6 @@ namespace BlackMisc::Simulation::Settings //! Default model path per simulator const QStringList &defaultModelDirectories(const CSimulatorInfo &simulator) const; - //! Default model exclude patterns per simulator - //! \deprecated use CSpecializedSimulatorSettings::defaultModelExcludeDirectoryPatterns - // static const QStringList &defaultModelExcludeDirectoryPatterns(const CSimulatorInfo &simulator); - - //! Default simulator path per simulator - //! \deprecated use CSpecializedSimulatorSettings::defaultSimulatorDirectory - // static const QString &defaultSimulatorDirectory(const CSimulatorInfo &simulator); - signals: //! Simulator settings have been changed void settingsChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator);