diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt index 6c910ee9d..0f7d3a0d2 100755 --- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt @@ -119,13 +119,9 @@ include_directories(${CMAKE_SOURCE_DIR}/include/SituationReplay) # like the services above. There is no include/Evaluations stub tree, so only the build dir # is added (same shape as FileManagement above, which has no stub tree either). include_directories(${CMAKE_BINARY_DIR}/Lts/Services/Evaluations) -include_directories(${CMAKE_SOURCE_DIR}/include/Buildings) include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/GuezNasat) include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS) include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS/QosProfile) -include_directories(${CMAKE_SOURCE_DIR}/include/DDS) -include_directories(${CMAKE_SOURCE_DIR}/include/DDS/Generic) -include_directories(${CMAKE_SOURCE_DIR}/include/TrainingAreaBaseOC) # Generated DDS headers (BUILD_RTI=ON) include_directories(${CMAKE_BINARY_DIR}/Lts) # consumers (LtsCoordinate, AES/CES, HLA proxies) resolve the diff --git a/qt6-after/qt6-migrated-legatus/Lts/Application/AarApp/aar_application.cpp b/qt6-after/qt6-migrated-legatus/Lts/Application/AarApp/aar_application.cpp index 86aba3426..cf14be7de 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Application/AarApp/aar_application.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Application/AarApp/aar_application.cpp @@ -8,6 +8,7 @@ */ #include "aar_application.h" +#include #include "ui_aarApp.h" #include "databases_model.h" @@ -44,7 +45,7 @@ AarApplication::AarApplication(QWidget *parent) const QList &screenList = QGuiApplication::screens(); m_widgets.reserve(screenList.size()); - for (QScreen *s : qAsConst(screenList)) + for (QScreen *s : std::as_const(screenList)) { QWidget *w = new QWidget(); // no parent w->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint); @@ -86,7 +87,7 @@ AarApplication::~AarApplication() delete m_databasesModel; delete m_progressDialog; - for (QSqlDatabase db : qAsConst(m_dbMap)) + for (QSqlDatabase db : std::as_const(m_dbMap)) db.close(); m_dbPostgres.close(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Application/AarApp/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Application/AarApp/main.cpp index 2db9648f4..6f66c8aeb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Application/AarApp/main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Application/AarApp/main.cpp @@ -46,8 +46,7 @@ int main(int argc, char *argv[]) QCoreApplication::setApplicationName(QLatin1String("AarApplication")); QCoreApplication::setOrganizationName(QLatin1String("RME")); - if (!bHeadless) - app->setAttribute(Qt::AA_UseHighDpiPixmaps); + // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled) NGL::LoggerHandler *lh = dynamic_cast(app.data()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/thp_viewer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/thp_viewer.cpp index 2c64f19cd..35cb2d1a6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/thp_viewer.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/thp_viewer.cpp @@ -449,9 +449,8 @@ QHash ThpViewer::getCombinedPlaybackDetails(const QUrl &url) cons QDomDocument doc(QStringLiteral("RSS")); if (!file.open(QIODevice::ReadOnly)) return hash; - QString errorStr; - int errorLine, errorColumn; - if (!doc.setContent(&file, true, &errorStr, &errorLine, &errorColumn)) + const auto parseResult = doc.setContent(&file, QDomDocument::ParseOption::UseNamespaceProcessing); + if (!parseResult) { file.close(); return hash; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/thpwidgets/thp_situation_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/thpwidgets/thp_situation_widget.cpp index ec6aadfb1..ff89cd7bb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/thpwidgets/thp_situation_widget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/thpwidgets/thp_situation_widget.cpp @@ -7,6 +7,7 @@ */ #include "thp_situation_widget.h" +#include #include "ui_thp_situation_building_base.h" #include "thp_situation_filter_aes.h" @@ -384,7 +385,7 @@ bool SituationWidget::restoreOperatorMapSettingsOverlays(const SituationMap::Ope // So we have to do it here: const QList &orderedOverlayIds = oms.orderedOverlays; DEBUG_LOG(m_logger) << LOGFUNCTION << " restore OverlayIds..."; - for (auto overlayId : qAsConst(orderedOverlayIds)) + for (auto overlayId : std::as_const(orderedOverlayIds)) { DEBUG_LOG(m_logger) << LOGFUNCTION << " applyNewOverlay , overlayId=" << overlayId; applyNewOverlay(overlayId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp index fe070f612..dc91a9e66 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp @@ -83,15 +83,12 @@ bool XmlReader::readServiceFile(const QString& svcFile, const QString& idlServic INFO_LOG(m_logger) << "SvcFile: " << svcFile; QDomDocument doc; - QString errorMsg; - int errorLine = 0; - int errorColumn = 0; - auto parseResult = doc.setContent(&f, &errorMsg, &errorLine, &errorColumn); + const auto parseResult = doc.setContent(&f); if (!parseResult) { m_errorString = QLatin1String("Error parsing service file '") + svcFile + QLatin1String("' at line ") + - QString::number(errorLine) + QLatin1Char(':') + - QString::number(errorColumn); + QString::number(int(parseResult.errorLine)) + QLatin1Char(':') + + QString::number(int(parseResult.errorColumn)); ERROR_LOG(m_logger) << m_errorString; return false; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee index 2e843d0aa..6eb0b7bc5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee @@ -56,7 +56,7 @@ std::shared_ptr Dtc::create(const std::shared_ptr(ddsConnector); {% endif %} s_availableConnectors.insert(std::make_pair(ddsConnector.get(), ret)); - return std::move(ret); // c++11 defect + return ret; // moved implicitly (C++17; explicit std::move on a local triggers -Wredundant-move) } // DtcImpl diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee index 46a7611b5..a3311b5cc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee @@ -46,7 +46,7 @@ Q_DECL_EXPORT std::shared_ptr Ftc::create(const std::shared_ptr(ddsConnector); s_availableConnectors.insert(std::make_pair(ddsConnector.get(), ret)); - return std::move(ret); // c++11 defect + return ret; // moved implicitly (C++17; explicit std::move on a local triggers -Wredundant-move) } // FtcImpl diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.cpp index 0c5bf7463..31ec47a54 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.cpp @@ -113,7 +113,7 @@ AppDescriptionVector LtsAppDescriptor::getAppDescriptionVector(const QByteArray& int column = 0; QChar x = QLatin1Char('\n'); - for (int i = 0; i < jsonDocument.count(); i++) + for (int i = 0; i < jsonDocument.size(); i++) { if (i == parseError.offset) break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp index daf6603af..526f6ce23 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp @@ -78,8 +78,8 @@ class LtsElevationManager::Private LtsElevationManager::LtsElevationManager() : QObject(nullptr) - , m_logger(getLogger("LtsElevationManager")) , d(new Private) + , m_logger(getLogger("LtsElevationManager")) { ++s_counter; TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.cpp index de85cc92f..7b47979ad 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.cpp @@ -20,15 +20,13 @@ QVector readLicences(const QByteArray& unencryptedXmlData) QVector licenceVec; QDomDocument xmlDoc; - QString errorMsg; - int errorLine = 0; - int errorColumn = 0; - if (!xmlDoc.setContent(unencryptedXmlData, &errorMsg, &errorLine, &errorColumn)) + const auto parseResult = xmlDoc.setContent(unencryptedXmlData); + if (!parseResult) { ERROR_LOG(getLogger()) << "Error reading xml data, " - << "error in line " << errorLine << ", column " << errorColumn - << ", message: " << errorMsg; + << "error in line " << int(parseResult.errorLine) << ", column " << int(parseResult.errorColumn) + << ", message: " << parseResult.errorMessage; return licenceVec; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp index c870472a4..9960dda29 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp @@ -9,6 +9,8 @@ */ #include "lts_plugin_loader.h" +#include +#include #include #include @@ -56,7 +58,7 @@ LtsPluginLoader::~LtsPluginLoader() void LtsPluginLoader::unloadAllPlugins() { - for (auto &pi : qAsConst(m_loadedPlugins)) + for (auto &pi : std::as_const(m_loadedPlugins)) { QPluginLoader *pluginLoader = pi.pluginLoader; @@ -280,7 +282,7 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, // continue; // } - QScopedPointer pluginLoader(new QPluginLoader); + std::unique_ptr pluginLoader(new QPluginLoader); pluginLoader->setFileName(absoluteFilePath); const QJsonObject jObj = pluginLoader->metaData(); @@ -433,7 +435,7 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, pi.fileName = filename; pi.fullFileName = absoluteFilePath; pi.plugin = plugin; - pi.pluginLoader = pluginLoader.data(); + pi.pluginLoader = pluginLoader.get(); if (loadPlugin && !loadPlugin(pi)) // does the dev want this plugin? if no, unload it! TODO: really unload? or still cache it?? { @@ -442,7 +444,7 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, pluginLoader->unload(); continue; // next plugin } - pi.pluginLoader = pluginLoader.take(); + pi.pluginLoader = pluginLoader.release(); // the dev decided to use that plugin, so cache it m_loadedPlugins.insert(PluginKey(requestedPluginType, pluginName), pi); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.cpp index 095cb58e3..d7ece7fb5 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.cpp @@ -58,7 +58,7 @@ void DragHandler::dragLeaveEvent(QDragLeaveEvent* event) void DragHandler::dropEvent(QDropEvent* event) { - int dropPos = event->pos().x(); + int dropPos = event->position().toPoint().x(); int dropTime = m_tcw->m_tools->getTime(dropPos, m_tcw->m_isFilter) - m_tcw->m_dragOffsetTime; for (const auto& tcw : std::as_const(m_tcwCorresponding)) @@ -80,7 +80,7 @@ void DragHandler::dropEvent(QDropEvent* event) void DragHandler::dragMoveEvent(QDragMoveEvent* event) { - int pos = event->pos().x(); + int pos = event->position().toPoint().x(); if (m_tcw->dragMove(pos)) event->acceptProposedAction(); @@ -101,7 +101,7 @@ void DragHandler::mouseMoveEvent(QMouseEvent* event) if (event->buttons() != Qt::LeftButton) return; - QPoint cursorPos = m_tcw->mapFromGlobal(event->globalPos()); + QPoint cursorPos = m_tcw->mapFromGlobal(event->globalPosition().toPoint()); if (!m_tcw->m_mainSelected || ((cursorPos - m_dragStartPos).manhattanLength() < QApplication::startDragDistance() && (m_dragStartPos - cursorPos).manhattanLength() < QApplication::startDragDistance())) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.cpp index 82b837e9b..1bb250977 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.cpp @@ -37,7 +37,7 @@ void TrackHeader::mousePressEvent(QMouseEvent* event) return; if (!m_indicatorLock) { - setIndicatorTime(m_tools->getTime(event->localPos().x())); + setIndicatorTime(m_tools->getTime(event->position().toPoint().x())); emit signalHeaderIndicatorTimeUserChanged(m_indicatorTime); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.cpp index 04715dd3a..dcaf4218f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.cpp @@ -19,7 +19,7 @@ void ResizeHandler::mousePressEvent(QMouseEvent* event) if (event->buttons() != Qt::LeftButton || !m_possible) return; - TrackEntry* te = m_trackContentWidget->getTrackEntryOnPos(event->globalPos()); + TrackEntry* te = m_trackContentWidget->getTrackEntryOnPos(event->globalPosition().toPoint()); if (te == nullptr) return; @@ -101,7 +101,7 @@ bool ResizeHandler::isCollision(int newLength) const bool ResizeHandler::mouseMoveEvent(QMouseEvent* event) { - QPoint pos = m_trackContentWidget->mapFromGlobal(event->globalPos()); + QPoint pos = m_trackContentWidget->mapFromGlobal(event->globalPosition().toPoint()); int posX = pos.x(); int cursorTime = m_trackContentWidget->m_tools->getTime(posX, m_trackContentWidget->m_isFilter); @@ -128,7 +128,7 @@ bool ResizeHandler::mouseMoveEvent(QMouseEvent* event) } else { - TrackEntry* te = m_trackContentWidget->getTrackEntryOnPos(event->globalPos()); + TrackEntry* te = m_trackContentWidget->getTrackEntryOnPos(event->globalPosition().toPoint()); if (m_trackContentWidget->m_isFilter) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.cpp index 8050f9874..8a5008eac 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.cpp @@ -45,7 +45,7 @@ void SelectHandler::mousePressEvent(QMouseEvent* event) { m_pressedEntry = nullptr; - QPoint clickedPos = tcw->mapFromGlobal(event->globalPos()); + QPoint clickedPos = tcw->mapFromGlobal(event->globalPosition().toPoint()); int clickedPosY = clickedPos.y(); int clickedPosX = clickedPos.x(); @@ -133,13 +133,13 @@ void SelectHandler::mousePressEvent(QMouseEvent* event) contextMenu->addAction(action); } - contextMenu->popup(event->globalPos()); + contextMenu->popup(event->globalPosition().toPoint()); } } void SelectHandler::mouseReleaseEvent(QMouseEvent* event) { - QPoint clickedPos = tcw->mapFromGlobal(event->globalPos()); + QPoint clickedPos = tcw->mapFromGlobal(event->globalPosition().toPoint()); int clickedPosX = clickedPos.x(); int clickedTime = tcw->m_tools->getTime(clickedPosX, tcw->m_isFilter); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.cpp index f48673549..ccd47d77d 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.cpp @@ -54,7 +54,7 @@ TrackWidget::TrackWidget(int baseWidth, bool readonly, Tools* tools, bool filter connect(ui->mainTrack, &TrackContentWidget::signalTrackEntryDeleted, this, &TrackWidget::slotTrackEntryDeleted); connect(ui->mainTrack, &TrackContentWidget::signalEditEntry, this, &TrackWidget::signalEditEntry); - connect(ui->chkSelect, &QCheckBox::stateChanged, this, &TrackWidget::signalSelectTrack); + connect(ui->chkSelect, &QCheckBox::checkStateChanged, this, &TrackWidget::signalSelectTrack); connect(ui->pbExpand, &QPushButton::clicked, this, &TrackWidget::slotExpand); connect(ui->pbAddFilter, &QPushButton::clicked, this, &TrackWidget::slotAddFilter); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp index 905a6f7f9..10875a013 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp @@ -9,6 +9,7 @@ */ #include "lts_session.h" +#include #ifdef BUILD_RTI #include "lts_session_data_dds.h" @@ -1307,7 +1308,7 @@ void LtsSession::createBaseLayout() if (showDeveloperActions) addDeveloperActions(); - for (LtsNotification::LtsNotificationController* ctl : qAsConst(m_notiCtlList)) + for (LtsNotification::LtsNotificationController* ctl : std::as_const(m_notiCtlList)) { if (!m_baseLayout->notificationExists(ctl->identifier())) // add if non-existent only m_baseLayout->addNotification(ctl->createWidget()); // FIXME: crash when no icons? diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp index e6e9e8dc9..b71b03ad1 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp @@ -5,7 +5,91 @@ namespace LtsSession { -// STUB implementations - RTI DDS not available -// All methods are stubbed since RTI Connext DDS is not available +// STUB implementations - RTI Connext DDS not available. +// The topic-lock feature depends on the RTI DDS backend (Core::Interface::Ftc), +// which is an optional dependency not present in this build. These definitions +// exist so that LtsSession links; the moc-generated qt_metacall references every +// slot, so each slot needs a body. Semantics reflect an unavailable backend: +// init reports failure (the caller logs a warning and skips wiring the handler) +// and the handler is never locked. + +TopicLockHandler::TopicLockHandler() + : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LtsSession.TopicLockHandler")) +{ +} + +TopicLockHandler::~TopicLockHandler() {} + +bool TopicLockHandler::init(const std::shared_ptr &coreFtc, int exerciseId) +{ + Q_UNUSED(coreFtc); + Q_UNUSED(exerciseId); + return false; // RTI DDS backend unavailable +} + +void TopicLockHandler::slotTryLock(const LtsWidgets::TopicInfo &topicInfo) +{ + Q_UNUSED(topicInfo); +} + +bool TopicLockHandler::slotUnlock() +{ + return true; // nothing is locked (no DDS backend) +} + +void TopicLockHandler::slotFinalize() {} + +bool TopicLockHandler::lock() +{ + return false; // no DDS backend to lock against +} + +bool TopicLockHandler::unlock() +{ + return true; // nothing to unlock +} + +std::string TopicLockHandler::objStateAsString() const +{ + return "stub (RTI DDS not available)"; +} + + +TopicLockHanderData::TopicLockHanderData() {} + +TopicLockHanderData::~TopicLockHanderData() {} + +void TopicLockHanderData::init(const std::shared_ptr &coreFtc, int exerciseId) +{ + Q_UNUSED(coreFtc); + Q_UNUSED(exerciseId); +} + +void TopicLockHanderData::unlock() {} + +void TopicLockHanderData::slotTryLock(const LtsWidgets::TopicInfo &topicInfo) +{ + Q_UNUSED(topicInfo); +} + +bool TopicLockHanderData::isLocked() const +{ + return false; // no DDS backend: never locked +} + +LtsWidgets::TopicInfo TopicLockHanderData::getTopicInfo() const +{ + return LtsWidgets::TopicInfo(); +} + +void TopicLockHanderData::slotLock(const QString &lockedBy) +{ + m_lockedBy = lockedBy; +} + +void TopicLockHanderData::slotUnlock() +{ + m_lockedBy.clear(); +} } // namespace LtsSession diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/main.cpp index f560cf3ce..0698d83cb 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/main.cpp @@ -89,7 +89,6 @@ void populateModel(LtsTimeline::TimelineModel* model) try { - const TestItem& testItem = dynamic_cast(model->item(5)); } catch (const std::exception& ex) { @@ -109,6 +108,7 @@ void populateModel(LtsTimeline::TimelineModel* model) #define unsorted false QVector x; bool y; + (void)y; x = model->itemIdsBetween(now + 60'000 + 1, now + 150'000 - 1, non_strict, recursive); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp index 488033851..4fea3e0c8 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp @@ -51,7 +51,10 @@ Track& TimelineModel::track(int id) noexcept(false) { if (id == m_rootTrack.id()) return m_rootTrack; + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // model facade delegates to the deprecated root Track lookup return m_rootTrack.track(id); + #pragma GCC diagnostic pop } auto it = m_trackCache.find(id); @@ -68,7 +71,10 @@ const Track& TimelineModel::track(int id) const noexcept(false) { if (id == m_rootTrack.id()) return m_rootTrack; + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // model facade delegates to the deprecated root Track lookup return m_rootTrack.track(id); + #pragma GCC diagnostic pop } std::map::const_iterator it = m_trackCache.find(id); @@ -82,7 +88,10 @@ const Track& TimelineModel::track(int id) const noexcept(false) Item& TimelineModel::item(int id) noexcept(false) { if (!m_itemCaching) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // model facade delegates to the deprecated root Track lookup return m_rootTrack.item(id); + #pragma GCC diagnostic pop auto it = m_itemCache.find(id); @@ -95,7 +104,10 @@ Item& TimelineModel::item(int id) noexcept(false) const Item& TimelineModel::item(int id) const noexcept(false) { if (!m_itemCaching) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // model facade delegates to the deprecated root Track lookup return m_rootTrack.item(id); + #pragma GCC diagnostic pop decltype(m_itemCache)::const_iterator it = m_itemCache.find(id); @@ -132,7 +144,10 @@ bool TimelineModel::isItemsBetween(qint64 start, qint64 end, const QVector& const QVector TimelineModel::copyItemIdsBetween(qint64 start, qint64 end, bool strict, bool complete, bool sorted) const { + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // model facade delegates to the deprecated root Track lookup return m_rootTrack.copyItemIdsBetween(start, end, strict, complete, true, sorted); + #pragma GCC diagnostic pop } bool TimelineModel::isItemsBetween(qint64 start, qint64 end, int ignoreId, bool strict, bool complete, diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.cpp index 37cfbda03..fffaccb33 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.cpp @@ -45,9 +45,9 @@ void TimelineViewDragHandler::dragMoveEvent(QDragMoveEvent* e) if (!e->mimeData()->hasFormat(Item::mimetype)) return; - m_dragPos = e->pos(); + m_dragPos = e->position().toPoint(); m_view->m_header->setHoverPosition(m_dragPos.x()); - e->setAccepted(canDragItemsTo(e->pos())); + e->setAccepted(canDragItemsTo(e->position().toPoint())); m_view->viewport()->update(); } @@ -67,7 +67,7 @@ void TimelineViewDragHandler::dropEvent(QDropEvent* e) if (!e->mimeData()->hasFormat(Item::mimetype)) return; - if (!canDragItemsTo(e->pos())) + if (!canDragItemsTo(e->position().toPoint())) { clear(); e->acceptProposedAction(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.cpp index f4077200c..0cd9428b0 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.cpp @@ -22,8 +22,8 @@ namespace LtsTimeline TimelineWidget::TimelineWidget(QWidget *parent) : QWidget(parent) - , m_ui(new Ui::Timeline) , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Timeline.TimelineWidget")) + , m_ui(new Ui::Timeline) { m_ui->setupUi(this); m_ui->debugWidget->hide(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.cpp index da29b6b71..1f212bd76 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.cpp @@ -20,7 +20,10 @@ const Track& Track::track(int id) const noexcept(false) { try { + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // self-recursive lookup: recurses via the deprecated public Track API return track->track(id); + #pragma GCC diagnostic pop } catch (...) { @@ -131,6 +134,7 @@ void Track::removeCopyItem(int itemId) noexcept(false) const QVector Track::copyItemIdsBetween(qint64 start, qint64 end, bool strict, bool complete, bool recursive, bool sorted, qint64 minimumDuration) const { + Q_UNUSED(minimumDuration); auto itemPtrRefs = _copyItems(); if (recursive) @@ -153,7 +157,10 @@ const QVector Track::copyItemIdsBetween(qint64 start, qint64 end, bool stri sort(itemPtrRefs); } + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal call to the deprecated transformItemPtrsToIds helper return transformItemPtrsToIds(itemPtrRefs); + #pragma GCC diagnostic pop } const QVector Track::itemIdsBetween(qint64 start, qint64 end, bool strict, bool complete, bool recursive, @@ -171,7 +178,10 @@ const QVector Track::itemIdsBetween(qint64 start, qint64 end, bool strict, sort(itemPtrRefs); + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal call to the deprecated transformItemPtrsToIds helper return transformItemPtrsToIds(itemPtrRefs); + #pragma GCC diagnostic pop } QVector itemIds; @@ -209,7 +219,10 @@ bool Track::isItemsBetween(qint64 start, qint64 end, const QVector& ignoreI for (const int itemId : std::as_const(m_copyItemIds)) { + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal lookup via the deprecated Track::item const Item& i = item(itemId); + #pragma GCC diagnostic pop if (!ignoreIds.contains(i.id())) if (isItemBetween(i, start, end, strict, complete, minimumDuration)) return true; @@ -304,7 +317,10 @@ ItemPtrNCVRefs Track::_itemsNCV(bool recursive) const QVector Track::_itemIds(bool recursive) const { + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal call to the deprecated transformItemPtrsToIds helper QVector itemIds(transformItemPtrsToIds(m_items)); + #pragma GCC diagnostic pop if (!recursive) return itemIds; @@ -363,19 +379,28 @@ QVector Track::itemIds(bool recursive, bool sorted) const if (sorted) { if (!recursive) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal call to the deprecated transformItemPtrsToIds helper return transformItemPtrsToIds(m_items); + #pragma GCC diagnostic pop ItemPtrRefs is(_items(true)); sort(is); + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal call to the deprecated transformItemPtrsToIds helper return transformItemPtrsToIds(is); + #pragma GCC diagnostic pop } QVector itemIds; itemIds.reserve(m_items.size()); + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // internal call to the deprecated transformItemPtrsToIds helper itemIds += transformItemPtrsToIds(m_items); + #pragma GCC diagnostic pop if (!recursive) return itemIds; @@ -448,7 +473,10 @@ Track& Track::track(int id) noexcept(false) { try { + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // self-recursive lookup: recurses via the deprecated public Track API return track->track(id); + #pragma GCC diagnostic pop } catch (...) { @@ -495,7 +523,10 @@ Item& Track::item(int id) noexcept(false) { try { + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // self-recursive lookup: recurses via the deprecated public Track API return track->item(id); + #pragma GCC diagnostic pop } catch (...) { @@ -519,7 +550,10 @@ const Item& Track::item(int id) const noexcept(false) { try { + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // self-recursive lookup: recurses via the deprecated public Track API return track->item(id); + #pragma GCC diagnostic pop } catch (...) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.cpp index 4cc727c6b..69a5142e0 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.cpp @@ -935,8 +935,8 @@ void LtsUtilsTest::test_jsonArray() QVERIFY_EXCEPTION_THROWN(array.at(0), JsonTypeError); - QVERIFY_EXCEPTION_THROWN(array.contains(-1), JsonRangeError); - QVERIFY_EXCEPTION_THROWN(array.contains(4), JsonRangeError); + QVERIFY_EXCEPTION_THROWN((void)array.contains(-1), JsonRangeError); + QVERIFY_EXCEPTION_THROWN((void)array.contains(4), JsonRangeError); QVERIFY_EXCEPTION_THROWN(array.at(-1), JsonRangeError); QVERIFY_EXCEPTION_THROWN(array.at(4), JsonRangeError); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qbytearray_byteaccess.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qbytearray_byteaccess.h index 41350b14b..14ede78dc 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qbytearray_byteaccess.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qbytearray_byteaccess.h @@ -223,12 +223,10 @@ template bool inline get1Byte(const QByteArray& baData, size_t& pos if (size_t(baData.size()) < pos + 1) return false; - const char* data = baData.data() + pos; - if (std::numeric_limits::is_signed) - out = (T)(data[0]); + out = (T)(baData.at(pos)); else - out = (T)(data[0] & 0xFF); + out = (T)(baData.at(pos) & 0xFF); pos += 1; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/variant_operators.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/variant_operators.h index 9ca5e4d9c..8983030d9 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/variant_operators.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/variant_operators.h @@ -9,7 +9,7 @@ namespace LtsUtils inline bool lessThan(const QVariant& var1, const QVariant& var2) { - if (var1.canConvert(QMetaType::QString) && var2.canConvert(QMetaType::QString)) + if (var1.canConvert() && var2.canConvert()) { QString str1(var1.toString()); QString str2(var2.toString()); @@ -28,7 +28,7 @@ inline bool lessThan(const QVariant& var1, const QVariant& var2) return d1 < d2; } - else if (var1.canConvert(QMetaType::Double) && var2.canConvert(QMetaType::Double)) + else if (var1.canConvert() && var2.canConvert()) return var1.toDouble() < var2.toDouble(); return false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp index fdb804fe5..bc70d3950 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp @@ -49,7 +49,7 @@ WebSocketHelper::WebSocketHelper(AbstractClientMessageFactory* messageFactory, L connect(m_socket, &QWebSocket::textFrameReceived, this, &WebSocketHelper::dataReceived); connect(m_socket, &QWebSocket::connected, this, &WebSocketHelper::onConnected); connect(m_socket, &QWebSocket::disconnected, this, &WebSocketHelper::onDisconnected); - connect(m_socket, QOverload::of(&QWebSocket::error), this, &WebSocketHelper::error); + connect(m_socket, &QWebSocket::errorOccurred, this, &WebSocketHelper::error); } WebSocketHelper::~WebSocketHelper() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.cpp index 38fe2ca54..b21bee229 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.cpp @@ -49,6 +49,7 @@ void LtsAbstractSequenceWidget::getValue(QWidget *data, return; data = findChild(findObjectName); + Q_UNUSED(data); } void LtsAbstractSequenceWidget::setMemberCount(int count) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.cpp index 8d3d1a00f..2c3451398 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -248,7 +249,7 @@ int getItemValue(QSpinBox *spinBox) LtsDateTimeEdit::LtsDateTimeEdit(QWidget *parent, bool withNowButton, bool checkable) : QWidget(parent) // , m_uiLe(new Ui::LtsDateTimeEditLe) - , m_scFixed(new QShortcut(QKeySequence(Qt::ShiftModifier + Qt::Key_F2), this, SLOT(setFixedDateTime()), nullptr, Qt::WidgetWithChildrenShortcut)) + , m_scFixed(new QShortcut(QKeySequence(Qt::ShiftModifier | Qt::Key_F2), this, SLOT(setFixedDateTime()), nullptr, Qt::WidgetWithChildrenShortcut)) , m_scOffset(new QShortcut(QKeySequence(Qt::Key_F2), this, SLOT(setOffsetDateTime()), nullptr, Qt::WidgetWithChildrenShortcut)) , m_checkable(checkable) // see below , m_withNowButton(withNowButton) // see below @@ -551,7 +552,7 @@ bool LtsDateTimeEdit::setMsecsSinceEpoch(qint64 msec, bool setToNearestPossible) m_curTimeMSec = msec; const qint64 offsetTimeZoneMsec = getTimezoneAsSecs() * 1000; - const QDateTime datetime(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec + offsetTimeZoneMsec, Qt::UTC)); + const QDateTime datetime(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec + offsetTimeZoneMsec, QTimeZone(0))); const QDate date(datetime.date()); const QTime time(datetime.time()); @@ -940,7 +941,7 @@ bool LtsDateTimeEdit::isDataAcceptable() return false; } - qint64 msec = QDateTime(QDate(getYear(), getMonth(), getDay()), QTime(getHour(), getMinute(), getSecond()), Qt::UTC).toMSecsSinceEpoch(); + qint64 msec = QDateTime(QDate(getYear(), getMonth(), getDay()), QTime(getHour(), getMinute(), getSecond()), QTimeZone(0)).toMSecsSinceEpoch(); msec -= DTG::timezone2Secs(getTimezone()) * 1000LL; if (m_minTimeMSec > 0 && m_maxTimeMSec > 0 && m_minTimeMSec < m_maxTimeMSec) { @@ -1539,7 +1540,7 @@ void LtsDateTimeEdit::onFocusOutDay() { if (m_getCurrentTimeCallback) { - const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), Qt::UTC)); + const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), QTimeZone(0))); setDay(dt.date().day()); } } @@ -1571,7 +1572,7 @@ void LtsDateTimeEdit::onFocusOutHHMMSS() { if (m_getCurrentTimeCallback) { - const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), Qt::UTC)); + const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), QTimeZone(0))); setHHMMSS(dt.time().hour(), dt.time().minute(), dt.time().second()); } } @@ -1632,7 +1633,7 @@ void LtsDateTimeEdit::onFocusOutMonth() { if (m_getCurrentTimeCallback) { - const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), Qt::UTC)); + const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), QTimeZone(0))); setMonth(dt.date().month()); } } @@ -1671,7 +1672,7 @@ void LtsDateTimeEdit::onFocusOutYear() { if (m_getCurrentTimeCallback) { - const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), Qt::UTC)); + const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), QTimeZone(0))); setYear(dt.date().year()); } } @@ -1768,7 +1769,7 @@ void LtsDateTimeEdit::onMonthWheelEvent(bool bForward, int cursorPos) if (!isMonthAcceptable()) return; const int ofs = bForward ? 1 : -1; - const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec, Qt::UTC).addMonths(ofs)); + const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec, QTimeZone(0)).addMonths(ofs)); setMsecsSinceEpoch(dt.toMSecsSinceEpoch(), true); m_uiLe->leLongMonth->setCursorPosition(cursorPos); m_uiLe->leLongMonth->setSelection(0, 3); @@ -1782,7 +1783,7 @@ void LtsDateTimeEdit::onYearWheelEvent(bool bForward, int cursorPos) if (!isYearAcceptable()) return; const int ofs = bForward ? 1 : -1; - const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec, Qt::UTC).addYears(ofs)); + const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec, QTimeZone(0)).addYears(ofs)); setMsecsSinceEpoch(dt.toMSecsSinceEpoch(), true); m_uiLe->leLongYear->setCursorPosition(cursorPos); m_uiLe->leLongYear->setSelection(0, 2); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp index 2605ae850..1bf897677 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp @@ -389,7 +389,7 @@ void LtsDialog::addConnections(QWidget *widget) if (addChangesMadeSignal(widget, &QLineEdit::textChanged)) return; if (addChangesMadeSignal(widget, &QDateTimeEdit::dateTimeChanged)) return; if (addChangesMadeSignal(widget, &QComboBox::currentTextChanged)) return; - if (addChangesMadeSignal(widget, &QCheckBox::stateChanged)) return; + if (addChangesMadeSignal(widget, &QCheckBox::checkStateChanged)) return; if (addChangesMadeSignal(widget, static_cast(&QSpinBox::valueChanged))) return; if (addChangesMadeSignal(widget, static_cast(&QDoubleSpinBox::valueChanged))) return; if (addChangesMadeSignal(widget, &QSlider::valueChanged)) return; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h index e129f9a53..906d4cf7b 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h @@ -437,7 +437,7 @@ private: for (WidgetType *widget : children) { QVariant lastState = widget->property("lastReadOnlyState"); - if (lastState.isValid() && !lastState.isNull() && lastState.canConvert(QMetaType::Bool)) + if (lastState.isValid() && !lastState.isNull() && lastState.canConvert()) widget->setReadOnly(lastState.toBool()); } } @@ -449,7 +449,7 @@ private: for (WidgetType *widget : children) { QVariant lastState = widget->property("lastEnabledState"); - if (lastState.isValid() && !lastState.isNull() && lastState.canConvert(QMetaType::Bool)) + if (lastState.isValid() && !lastState.isNull() && lastState.canConvert()) widget->setEnabled(lastState.toBool()); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.cpp index e69094c5a..1caa38162 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.cpp @@ -119,6 +119,7 @@ void bt() } //qWarning() << "frame" << i << address << function << offset; + (void)offset; } free(symbols); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.cpp index 117802a1a..b88fa9309 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.cpp @@ -84,12 +84,12 @@ void LtsMSecDateTimeEdit::setTimezoneHoursOffset(int timezoneHoursOffset) void LtsMSecDateTimeEdit::setDateTime(const QDateTime &dateTime) { // TODO: doesn't make sense, as toMSecsSinceEpoch returns the *UTC version* of the dt, so the timespec stuff does nothing - setMsecsSinceEpoch(QDateTime::fromMSecsSinceEpoch(dateTime.toMSecsSinceEpoch(), Qt::TimeSpec::OffsetFromUTC, m_timezoneHoursOffset * 3600).toMSecsSinceEpoch()); + setMsecsSinceEpoch(QDateTime::fromMSecsSinceEpoch(dateTime.toMSecsSinceEpoch(), QTimeZone(m_timezoneHoursOffset * 3600)).toMSecsSinceEpoch()); } void LtsMSecDateTimeEdit::setMsecsSinceEpoch(qint64 msecs) { - QDateTimeEdit::setDateTime(QDateTime::fromMSecsSinceEpoch(msecs, Qt::TimeSpec::OffsetFromUTC, m_timezoneHoursOffset * 3600)); + QDateTimeEdit::setDateTime(QDateTime::fromMSecsSinceEpoch(msecs, QTimeZone(m_timezoneHoursOffset * 3600))); } int LtsMSecDateTimeEdit::msecStepSize() const diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.cpp index d32772d07..94468a10b 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.cpp @@ -50,11 +50,14 @@ QValidator::State LtsMultiRangeSpinBox::validate(QString &input, int &pos) const // int value = input.toInt(); // value -= minimum(); // return (value % singleStep() == 0) ? QValidator::Acceptable : QValidator::Intermediate; + Q_UNUSED(input); + Q_UNUSED(pos); return QValidator::Acceptable; } void LtsMultiRangeSpinBox::fixup(QString &str) const { + Q_UNUSED(str); // QSpinBox::fixup(str); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_selection_popup.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_selection_popup.cpp index 06617449a..0ff6dddc8 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_selection_popup.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_selection_popup.cpp @@ -106,7 +106,7 @@ LtsSelectionPopup::~LtsSelectionPopup() void LtsSelectionPopup::slotFilterChanged() { - m_filter->setFilterWildcard(m_ui->leSearch->text().count() ? m_ui->leSearch->text() : QStringLiteral("*") /* show everything if nothing was entered */); + m_filter->setFilterWildcard(m_ui->leSearch->text().size() ? m_ui->leSearch->text() : QStringLiteral("*") /* show everything if nothing was entered */); refresh(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.cpp index 1f523bf92..c34155fa2 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.cpp @@ -139,7 +139,6 @@ void LtsTextEditor::slotTextBold() if (m_ui->textEdit->document()->isEmpty()) { const QString &f = m_ui->cbFonts->currentText(); - fmt.setFontFamily(f); fmt.setFontFamilies({f}); fmt.setForeground(m_foregroundColor); const qreal pointSize = (m_ui->cbFontSize->currentText().toFloat() > 0 ? m_ui->cbFontSize->currentText().toFloat() : 11); @@ -158,7 +157,6 @@ void LtsTextEditor::slotTextUnderline() if (m_ui->textEdit->document()->isEmpty()) { const QString &f = m_ui->cbFonts->currentText(); - fmt.setFontFamily(f); fmt.setFontFamilies({f}); fmt.setForeground(m_foregroundColor); const qreal pointSize = (m_ui->cbFontSize->currentText().toFloat() > 0 ? m_ui->cbFontSize->currentText().toFloat() : 11); @@ -177,7 +175,6 @@ void LtsTextEditor::slotTextItalic() if (m_ui->textEdit->document()->isEmpty()) { const QString &f = m_ui->cbFonts->currentText(); - fmt.setFontFamily(f); fmt.setFontFamilies({f}); fmt.setForeground(m_foregroundColor); const qreal pointSize = (m_ui->cbFontSize->currentText().toFloat() > 0 ? m_ui->cbFontSize->currentText().toFloat() : 11); @@ -202,7 +199,6 @@ void LtsTextEditor::slotTextFamily(int index) fmt.setForeground(m_foregroundColor); } const QString f = m_ui->cbFonts->currentText(); - fmt.setFontFamily(f); fmt.setFontFamilies({f}); slotMergeFormatOnWordOrSelection(fmt); } @@ -223,7 +219,6 @@ void LtsTextEditor::slotTextSize(int index) if (m_ui->textEdit->document()->isEmpty()) { const QString &f = m_ui->cbFonts->currentText(); - fmt.setFontFamily(f); fmt.setFontFamilies({f}); fmt.setForeground(m_foregroundColor); @@ -273,7 +268,6 @@ void LtsTextEditor::slotTextColor() fmt.setFontWeight(m_ui->pbBold->isChecked() ? QFont::Bold : QFont::Normal); const QString &f = m_ui->cbFonts->currentText(); - fmt.setFontFamily(f); fmt.setFontFamilies({f}); const qreal pointSize = (m_ui->cbFontSize->currentText().toFloat() > 0 ? m_ui->cbFontSize->currentText().toFloat() : 11); fmt.setFontPointSize(pointSize); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp index fd92752f6..9578a01f9 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp @@ -652,7 +652,7 @@ void LtsTextEditor2::onTextItalic() void LtsTextEditor2::onTextFamily(const QString &f) { QTextCharFormat fmt; - fmt.setFontFamily(f); + fmt.setFontFamilies({f}); mergeFormatOnWordOrSelection(fmt); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h index 791a6dc12..00387ca36 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h @@ -47,7 +47,7 @@ class Interface { public: Interface(LtsSession::LtsSession* session, NGL::INGLLogger& logger) - : m_hasInit(true), m_session(session), m_logger(logger), m_appId(LtsAppDescriptor::App::Login) + : m_hasInit(true), m_session(session), m_appId(LtsAppDescriptor::App::Login), m_logger(logger) { } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.cpp index 8800730f6..c49db2199 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.cpp @@ -7,14 +7,14 @@ #include Initialisation::Initialisation() - : m_domainParticipant(nullptr) + : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("UnitTests.Initialisation")) + , m_domainParticipant(nullptr) , m_domainParticipantSub(nullptr) , m_domainId(0) , m_exerciseId(-1) , m_ddsPublisher(nullptr) , m_ddsSubscriber(nullptr) , m_subListener(new DDSGeneric::SubscriberListener) - , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("UnitTests.Initialisation")) { if (!DDS::QosProfile::setDefault()) ERROR_LOG(m_logger) << "Error setting default QoS from xml-file "; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.cpp index 8888525fa..ba833e5c2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.cpp @@ -115,7 +115,7 @@ void Threading::preInit() const } bremse--; - const int lenRest = maxLen - name.count(); + const int lenRest = maxLen - name.size(); if (lenRest < 1) { Q_ASSERT(false); @@ -143,7 +143,7 @@ void Threading::preInit() const - const int finalLeft = maxLen - name.count(); + const int finalLeft = maxLen - name.size(); if (finalLeft < 0 || (finalLeft > 0 && functionTopicName().length() > maxLen)) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp index 9d27ba455..302fb8896 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp @@ -8,6 +8,7 @@ */ #include "aes_explosions_edit_adler_standalone.h" +#include #include "aes_rocket_utility.h" #include "aes_effector.h" #include "ui_aes_explosions_edit_adler_standalone.h" @@ -1914,7 +1915,7 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable) // } const QList &geoButtons = m_geometrieButtonGroup->buttons(); - for (QAbstractButton *btn : qAsConst(geoButtons)) + for (QAbstractButton *btn : std::as_const(geoButtons)) btn->setEnabled(enable); // For PreFat // m_ui->geometrieLineBtn->hide(); @@ -2907,7 +2908,7 @@ void ExplosionsEditAdlerStandAlone::fillCharges() m_ui->cbChargeType->clear(); m_ui->cbChargeType->addItem(emptyEntryComboBox, -1); - for (const ProjectDataManagement::ChargeType &chargeType : qAsConst(chargesForGearClass)) + for (const ProjectDataManagement::ChargeType &chargeType : std::as_const(chargesForGearClass)) { // Vulcano ist available for point geometry only: const bool bIsVulcano = chargeTypeIdIsVulcano(chargeType.id()); @@ -2953,7 +2954,7 @@ void ExplosionsEditAdlerStandAlone::fillGearClasses() int index = 0; m_ui->cbGearClass->insertItem(index, emptyEntryComboBox, -1); - for (auto type : qAsConst(gearClasses)) + for (auto type : std::as_const(gearClasses)) { if (m_gearClassFilter.contains(type.gearClassId())) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp index 790d3450d..314a0ef18 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -156,7 +157,7 @@ class AvmPlaybackMenu::TimeControl : public QObject QString msecsSinceEpochToString(qint64 msecs) { return dateTimeToString( - QDateTime::fromMSecsSinceEpoch(msecs, Qt::TimeSpec::OffsetFromUTC, m_timezoneHoursOffset * 3600)); + QDateTime::fromMSecsSinceEpoch(msecs, QTimeZone(m_timezoneHoursOffset * 3600))); } void setTimezoneHoursOffset(int timezoneHoursOffset) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/CMakeLists.txt index 02d1cbc9f..195e3e4de 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/CMakeLists.txt @@ -35,11 +35,8 @@ set(SRCS # which needs to be built on SV, too. # NGL_ADD_LIBRARY2(WS AvmShared SHARED ${SRCS}) -NGL_TARGET_INCLUDE_DIRECTORIES(AvmShared - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/../../Services/ - ${CMAKE_CURRENT_SOURCE_DIR}/../../Common/ -) +# NGL_TARGET_INCLUDE_DIRECTORIES(AvmShared) removed: ../../Services and ../../Common do not +# exist at those relative paths (pre-existing -Wmissing-include-dirs warnings); nothing includes from them. if(QT6_GUI_AVAILABLE) NGL_TARGET_LINK_LIBRARIES(AvmShared PUBLIC diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/symbol_favourites.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/symbol_favourites.cpp index 5f0d93823..bc48616e7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/symbol_favourites.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/symbol_favourites.cpp @@ -385,13 +385,10 @@ public: const QString &backup = toString(); - QString errorMsg; - int errorLine; - int errorColumn; - - if (!setContent(xml, &errorMsg, &errorLine, &errorColumn)) + const auto parseResult = setContent(xml); + if (!parseResult) { - ERROR_LOG(m_logger) << Q_FUNC_INFO << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn; + ERROR_LOG(m_logger) << Q_FUNC_INFO << " parsing xml input failed: " << parseResult.errorMessage << " at line " << int(parseResult.errorLine) << " , column " << int(parseResult.errorColumn); setContent(backup); return false; } @@ -406,13 +403,10 @@ public: const QString &backup = toString(); - QString errorMsg; - int errorLine; - int errorColumn; - - if (!setContent(device, &errorMsg, &errorLine, &errorColumn)) + const auto parseResult = setContent(device); + if (!parseResult) { - ERROR_LOG(m_logger) << Q_FUNC_INFO << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn; + ERROR_LOG(m_logger) << Q_FUNC_INFO << " parsing xml input failed: " << parseResult.errorMessage << " at line " << int(parseResult.errorLine) << " , column " << int(parseResult.errorColumn); setContent(backup); return false; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp index f8d219e11..767db3578 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp @@ -301,6 +301,8 @@ bool fill(QComboBox *cbx, PdmComboBoxType type) #endif // BUILD_WITH_EXTERNAL_DDS case PdmComboBoxType::CbUnkown: break; + default: + break; } if (curData.isValid() && (cbx->findData(curData) != -1)) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/scr_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/scr_gui_plugin.cpp index 3734ae5a1..75fe11bbf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/scr_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/scr_gui_plugin.cpp @@ -15,6 +15,7 @@ #include #include #include +#include namespace ScreenRecording @@ -138,7 +139,7 @@ void InterfaceImpl::onUpdateGui() connect(m_timer, &QTimer::timeout, this, [this]() { m_toolBtn->setIcon((m_counter++ % 2) ? m_recIcon : QIcon()); - m_toolBtn->setToolTip(QDateTime::fromSecsSinceEpoch(m_counter, Qt::UTC).toString(QLatin1String("hh:mm:ss"))); + m_toolBtn->setToolTip(QDateTime::fromSecsSinceEpoch(m_counter, QTimeZone(0)).toString(QLatin1String("hh:mm:ss"))); }); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp index 1c4d8c31c..c2ba2522d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp @@ -8,6 +8,7 @@ */ #include "srm_data_plugin.h" +#include #include #include @@ -51,7 +52,7 @@ public: { // next 4 lines: comment please m_references += fi; - for (const auto &info : qAsConst(m_replayPartitions)) + for (const auto &info : std::as_const(m_replayPartitions)) { fi->write(info); } @@ -72,7 +73,7 @@ public: void removeSession(ForeignInterfaceImpl *fi, bool wait = true) noexcept(false) { m_references -= fi; - for (const auto &info : qAsConst(m_replayPartitions)) + for (const auto &info : std::as_const(m_replayPartitions)) fi->remove(info); replayPartitionRemoveRequest(fi, 0, 0, 0, wait); @@ -262,7 +263,7 @@ public: } const auto &rp = it.value(); - for (auto ptr : qAsConst(m_references)) + for (auto ptr : std::as_const(m_references)) ptr->remove(rp); proc->deleteLater(); @@ -281,7 +282,7 @@ public: } const ReplayPartitionEx &rp = it.value(); - for (ForeignInterfaceImpl* ptr : qAsConst(m_references)) + for (ForeignInterfaceImpl* ptr : std::as_const(m_references)) ptr->write(rp); } @@ -353,7 +354,7 @@ public: } } - for (auto *ptr : qAsConst(m_references)) + for (auto *ptr : std::as_const(m_references)) ptr->remove(rp); it = m_replayPartitions.erase(it); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.cpp index e2b6b5525..ecd735aa9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.cpp @@ -11,8 +11,8 @@ namespace BSM { Api::Api(QObject *parent) : QObject(parent) - , m_socketHandler(new SocketHandler(this)) , m_logger(TrainingAreaBase::getLogger("BSM.Api")) + , m_socketHandler(new SocketHandler(this)) { connect(m_socketHandler, &SocketHandler::opticalShot, this, &Api::opticalShot); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp index a7de10cb2..e281fc127 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp @@ -15,11 +15,11 @@ namespace BSM { Socket::Socket(const Bsm &cfg, QObject *parent) : QObject(parent) + , m_logger(TrainingAreaBase::getLogger("BSM.Socket")) , m_config(cfg) , m_tcpSocket(new QTcpSocket(this)) , m_reconnectTimer(nullptr) , m_aliveTimer(new QTimer(this)) - , m_logger(TrainingAreaBase::getLogger("BSM.Socket")) { m_aliveTimer->setTimerType(Qt::VeryCoarseTimer); m_aliveTimer->setSingleShot(true); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.cpp index 96996627d..0236d9045 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.cpp @@ -12,8 +12,8 @@ namespace BuildingControlUnit namespace Json { WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent) - , m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this)), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this)) {} WebSocketHandler::~WebSocketHandler() { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp index 5e912d63c..6c1b28f72 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp @@ -41,8 +41,8 @@ static const bool point3dRegistered = []() { Api::Api(QObject *parent) : QObject(parent) - , m_lastHitResult(HitResult()) , m_logger(TrainingAreaBase::getLogger("VWM.Api")) + , m_lastHitResult(HitResult()) { Q_UNUSED(point3dRegistered); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.cpp index 74e5382a6..c8b59a717 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.cpp @@ -294,12 +294,10 @@ bool readBuilding(const QString &fn, Building &cfg) bool readBuilding(const QByteArray &data, Building &cfg) { QDomDocument doc; - QString errorMsg; - int errorLine; - int errorColumn; - if (!doc.setContent(data, &errorMsg, &errorLine, &errorColumn)) + const auto parseResult = doc.setContent(data); + if (!parseResult) { - ERROR_LOG(logger()) << "Line=" << errorLine << ", Column=" << errorColumn << ": " << errorMsg; + ERROR_LOG(logger()) << "Line=" << int(parseResult.errorLine) << ", Column=" << int(parseResult.errorColumn) << ": " << parseResult.errorMessage; return false; } const QDomElement domRoot = doc.documentElement(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_xml_reader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_xml_reader.cpp index ec07a9e8e..5421ce997 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_xml_reader.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_xml_reader.cpp @@ -32,13 +32,11 @@ QDomElement readFile(const QString &fn, const QString &rootTag) return QDomElement(); } - QString errMsg; - int errLine = 0; - int errColumn = 0; QDomDocument doc; - if (!doc.setContent(data, &errMsg, &errLine, &errColumn)) + const auto parseResult = doc.setContent(data); + if (!parseResult) { - WARNING_LOG(logger()) << "Could not parse xml file '" << fn << "' at " << errLine << ":" << errColumn << ": " << errMsg; + WARNING_LOG(logger()) << "Could not parse xml file '" << fn << "' at " << int(parseResult.errorLine) << ":" << int(parseResult.errorColumn) << ": " << parseResult.errorMessage; return QDomElement(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp index 0227f5ca3..ea28b9d63 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp @@ -25,8 +25,8 @@ BuildingControlHandler::BuildingControlHandler(MainHandler *mainHandler) , Interface::Fts::SendCesHit3DonBuildingRequestHandler(mainHandler->ddsHandler()->fts()) , Interface::Fts::TriggerBsmFlashRequestHandler(mainHandler->ddsHandler()->fts()) , Interface::Fts::SwitchRelayRequestHandler(mainHandler->ddsHandler()->fts()) - , m_mainHandler(mainHandler) , m_logger(getLogger("BuildingControlHandler")) + , m_mainHandler(mainHandler) {} BuildingControlHandler::~BuildingControlHandler() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp index e707e4547..3f5d7a6a0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp @@ -46,6 +46,7 @@ BuildingProcess::BuildingProcess(MainHandler *mainHandler, const bool initBuilding, QObject *parent) : QObject(parent) + , m_logger(getLogger("BuildingProcess")) , m_mainHandler(mainHandler) , m_buildingInfo(info) , m_wsSocket(nullptr) @@ -53,7 +54,6 @@ BuildingProcess::BuildingProcess(MainHandler *mainHandler, , m_hitLineInfoTimer(new QTimer(this)) , m_hitLineId(info.mseId << 16) , m_initBuilding(initBuilding) - , m_logger(getLogger("BuildingProcess")) { m_proc.setProgram(procName); m_proc.setReadChannel(QProcess::StandardOutput); @@ -1145,7 +1145,7 @@ void BuildingProcess::openWebSocket() { closeWebSocket(); m_wsSocket = new QWebSocket; - connect(m_wsSocket, QOverload::of(&QWebSocket::error), + connect(m_wsSocket, &QWebSocket::errorOccurred, this, &BuildingProcess::onWebSocketError); connect(m_wsSocket, &QWebSocket::connected, this, &BuildingProcess::onWebSocketConnected); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp index 158a4d09b..fca23acb1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp @@ -14,8 +14,8 @@ namespace Buildings { DdsHandler::DdsHandler(int domainId, int exerciseId) - : m_ddsConnector(std::make_shared(domainId, IDL::PartitionType::Exercise, exerciseId)) - , m_logger(getLogger("DdsHandler")) + : m_logger(getLogger("DdsHandler")) + , m_ddsConnector(std::make_shared(domainId, IDL::PartitionType::Exercise, exerciseId)) { DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp index 3a654d039..00cae1dd2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp @@ -17,12 +17,12 @@ namespace Buildings { -IsmHandler::IsmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler) +IsmHandler::IsmHandler(MainHandler *mainHandler) : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_mainHandler(mainHandler) , m_dtcIsm(nullptr) , m_ftcIsm(nullptr) , m_changeTimeoutTimer(new QTimer(this)) - , m_changeTimeoutTimerInit(new QTimer(this)), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + , m_changeTimeoutTimerInit(new QTimer(this)) { connect(m_changeTimeoutTimer, &QTimer::timeout, this, &IsmHandler::onBuildingsChanged); m_changeTimeoutTimer->setInterval(3 * 1000); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp index 314159f03..3dfdb42a8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp @@ -8,9 +8,9 @@ namespace Buildings { -PdmHandler::PdmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler) - , m_bPdmInitialized(false), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} +PdmHandler::PdmHandler(MainHandler *mainHandler) : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_mainHandler(mainHandler) + , m_bPdmInitialized(false) {} PdmHandler::~PdmHandler() {} diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp index 95b4d91fc..cfb89d25b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp @@ -7,8 +7,8 @@ namespace Buildings { -PpmHandler::PpmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} +PpmHandler::PpmHandler(MainHandler *mainHandler) : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_mainHandler(mainHandler) {} PpmHandler::~PpmHandler() {} diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp index 211946b7f..94603ffb3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp @@ -9,8 +9,8 @@ namespace Buildings RelayInfoHandler::RelayInfoHandler(MainHandler *mainHandler) : QObject() , Interface::Fts::SetRelayInfoRequestHandler(mainHandler->ddsHandler()->fts()) - , m_mainHandler(mainHandler) , m_logger(getLogger("RelayInfoHandler")) + , m_mainHandler(mainHandler) {} RelayInfoHandler::~RelayInfoHandler() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp index 9c9c996e5..8ea91f748 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp @@ -17,9 +17,9 @@ namespace Buildings WebSocketHandler::WebSocketHandler(const std::shared_ptr &buildingControlHandler, QObject *parent) : QObject(parent) + , m_logger(getLogger(QStringLiteral("WebSocketHandler"))) , m_buildingControlHandler(buildingControlHandler) , m_webSocketServer(new QWebSocketServer(QStringLiteral("BuildingsSocket"), QWebSocketServer::NonSecureMode, this)) - , m_logger(getLogger(QStringLiteral("WebSocketHandler"))) {} WebSocketHandler::~WebSocketHandler() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/client_connection.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/client_connection.cpp index 41fe7571c..b8aee1416 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/client_connection.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/client_connection.cpp @@ -11,9 +11,9 @@ using namespace CombatNetRadio::WebSocketInterface::Connection; ClientConnection::ClientConnection(QWebSocket *socket, QObject *parent) : QObject(parent) + , m_logger(getLogger(QLatin1String("ClientConnection"))) , m_socket(socket) , m_ip(socket->peerAddress()) - , m_logger(getLogger(QLatin1String("ClientConnection"))) {} ClientConnection::~ClientConnection() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/connection_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/connection_handler.cpp index f56565ad2..c401bff52 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/connection_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/connection_handler.cpp @@ -11,8 +11,8 @@ using namespace CombatNetRadio::WebSocketInterface::Connection; -ConnectionHandler::ConnectionHandler() : m_server(nullptr), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { +ConnectionHandler::ConnectionHandler() : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_server(nullptr) { } ConnectionHandler::~ConnectionHandler() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/message_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/message_handler.cpp index 0911818ff..7c9027a82 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/message_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/message_handler.cpp @@ -13,8 +13,8 @@ namespace WebSocketInterface namespace Messages { -MessageHandler::MessageHandler(ExerciseManager *exerciseManager) : m_exerciseManager(exerciseManager), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { +MessageHandler::MessageHandler(ExerciseManager *exerciseManager) : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_exerciseManager(exerciseManager) { Q_ASSERT(exerciseManager); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp index 196fd3095..3435ea71b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp @@ -20,8 +20,8 @@ namespace CombatNetRadio ConfigCnr::ConfigCnr(int exerciseId, AudioVideoManagement::Interface::Dtc *avmDtc, InfrastructureManagement::Interface::Dtc *ismDtc) : m_exerciseId(exerciseId) , m_avmDtc(avmDtc) , m_ismDtc(ismDtc) - , m_loggerJson(getLogger("ConfigCnr.Json")), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_loggerJson(getLogger("ConfigCnr.Json")) { Q_ASSERT(avmDtc); Q_ASSERT(ismDtc); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.cpp index 37008bf76..f1f030be0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.cpp @@ -18,8 +18,8 @@ namespace CombatNetRadio { DdsHandler::DdsHandler(int domainId) - : m_ddsConnector(std::make_shared(domainId, IDL::PartitionType::Global)) - , m_logger(getLogger("DdsHandler")) + : m_logger(getLogger("DdsHandler")) + , m_ddsConnector(std::make_shared(domainId, IDL::PartitionType::Global)) { DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp index 0258e6564..24b83b011 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp @@ -16,8 +16,8 @@ namespace ComponentMonitor { CheckmkHandler::CheckmkHandler() : QObject() - , m_socket(new QTcpSocket(this)), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_socket(new QTcpSocket(this)) { TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"; TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.cpp index a40a1fa4c..372b56b7f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.cpp @@ -13,8 +13,8 @@ namespace DifferentialGPS { DdsHandler::DdsHandler(int domainId) - : m_ddsConnector(std::make_shared(domainId, IDL::PartitionType::Global)) - , m_logger(getLogger("DdsHandler")) + : m_logger(getLogger("DdsHandler")) + , m_ddsConnector(std::make_shared(domainId, IDL::PartitionType::Global)) { DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition(); } // end of ctor() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp index 04bd1b3b9..5114ff068 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp @@ -17,11 +17,11 @@ namespace DifferentialGPS { MainThread::MainThread(QObject *parent) : QObject(parent) + , m_logger(getLogger("MainThread")) , m_ddsHandler(nullptr) , m_dgpsTimer(new QTimer(this)) , m_tetraIfNum(0) , m_trimbleIfNum(0) - , m_logger(getLogger("MainThread")) , m_broadcastTime(QTime::currentTime()) , m_broadcastCycle_ms(10000) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/guez_nasat_telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/guez_nasat_telegrams.cpp index dc072b9f8..015118a21 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/guez_nasat_telegrams.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/guez_nasat_telegrams.cpp @@ -94,7 +94,7 @@ bool get(const QJsonObject &obj, const QString &key, double &val, bool bOptional template <> bool get(const QJsonObject &obj, const QString &key, FinalAttackHeadingMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -111,7 +111,7 @@ bool get(const QJsonObject &obj, const QString &key, FinalAttackHeadingMode &val template <> bool get(const QJsonObject &obj, const QString &key, FuseType &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -129,7 +129,7 @@ bool get(const QJsonObject &obj, const QString &key, FuseType &val, bool bOption template <> bool get(const QJsonObject &obj, const QString &key, Heading2InitialPointMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -150,7 +150,7 @@ bool get(const QJsonObject &obj, const QString &key, Heading2InitialPointMode &v template <> bool get(const QJsonObject &obj, const QString &key, Munition &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -206,7 +206,7 @@ bool get(const QJsonObject &obj, const QString &key, Munition &val, bool bOption template <> bool get(const QJsonObject &obj, const QString &key, ReleaseMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -223,7 +223,7 @@ bool get(const QJsonObject &obj, const QString &key, ReleaseMode &val, bool bOpt template <> bool get(const QJsonObject &obj, const QString &key, TimeForTargetMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp index 052be586c..86465bcc2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp @@ -51,8 +51,8 @@ int NasatAircraftParticipantEx::partyId() const HandlerParticipant::HandlerParticipant(Initialization *mainHandler) - : m_mainHandler(mainHandler) - , m_logger(getLogger("ParticipantPositionPublisher")) + : m_logger(getLogger("ParticipantPositionPublisher")) + , m_mainHandler(mainHandler) {} HandlerParticipant::~HandlerParticipant() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_anmeldebestaetigung.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_anmeldebestaetigung.cpp index f2c76b88e..17638a303 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_anmeldebestaetigung.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_anmeldebestaetigung.cpp @@ -32,5 +32,7 @@ void TestExAnmeldebestaetigung::testExAnmeldebestaetigung() const QJsonObject jsonObj = jsonDoc.object(); QJsonObject dataObj = jsonObj[AdlerJson::JsonKeys::DATA()].toObject(); + // WIP: parsed from dataObj once the test body is completed AdlerJson::AnBestaetigungsdaten anBestaetigungsdaten; + Q_UNUSED(anBestaetigungsdaten); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp index 423dcddbf..27a383283 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp @@ -8,6 +8,7 @@ */ #include "aes_handler.h" +#include #include "DDS/Core/function_reply_object.h" #include "aes.hpp" #include "json_dispatcher.h" @@ -128,7 +129,7 @@ void AesHandler::onEffectClusterModifyReply(const Core::FunctionReplyObject &rep std::vector args; args.reserve(argsList.size()); - for (const auto &str : qAsConst(argsList)) + for (const auto &str : std::as_const(argsList)) args.emplace_back(str.toStdString()); req.notification().content(content.toStdString()); @@ -171,7 +172,7 @@ void AesHandler::onEffectClusterModifyReply(const Core::FunctionReplyObject &rep std::vector recipientIdsDds; recipientIdsDds.reserve(recipientIds.size()); - for (const auto &recipientId : qAsConst(recipientIds)) + for (const auto &recipientId : std::as_const(recipientIds)) { NotificationManagement::Address addr; addr.addressId(recipientId); @@ -349,7 +350,7 @@ void AesHandler::sendTrajectoryAdlerModifyRequest(const WirkfeldplanungData &dat QVector subordinates = m_dtcPpm->getSubordinatesByParticipant(participantId); QVector subordinatePositions; - for (int subordinate : qAsConst(subordinates)) + for (int subordinate : std::as_const(subordinates)) { DEBUG_LOG(m_logger) << "subordinates(" << participantId << ") :" << subordinate; subordinatePositions.append(m_dtcPpm->participantPosition(subordinate)); @@ -365,7 +366,7 @@ void AesHandler::sendTrajectoryAdlerModifyRequest(const WirkfeldplanungData &dat double grad = (data.zieldaten.zielachse / 6400.) * 360.0; - for (Flugbahnpunkt pos : qAsConst(data.feuerkommando.wirkmittel.at(wirkmittelIndex).flugbahnpunkt)) + for (Flugbahnpunkt pos : std::as_const(data.feuerkommando.wirkmittel.at(wirkmittelIndex).flugbahnpunkt)) { /* DEBUG_LOG(m_logger) << "Flugbahnpunkt:" @@ -625,7 +626,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId) QList rects; int zone = 0; QVector vecPoints; - for (const WirkmittelFeuerkommando &effector : qAsConst(data.feuerkommando.wirkmittel)) + for (const WirkmittelFeuerkommando &effector : std::as_const(data.feuerkommando.wirkmittel)) { // get the target point for the effector const QPointF centerPoint(effector.auftreffpunkt.koordinate.longitude * (M_PI / 180.0), effector.auftreffpunkt.koordinate.latitude * (M_PI / 180.0)); @@ -674,9 +675,9 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId) // Now that we know the impact radius we create a boundingbox around all impact areas int zone = 0; QVector vecPoints; - for (const WirkmittelFeuerkommandoRakete &effector : qAsConst(data.feuerkommando.wirkmittelRakete)) + for (const WirkmittelFeuerkommandoRakete &effector : std::as_const(data.feuerkommando.wirkmittelRakete)) { - for (const Treffpunkt &treffpunkt : qAsConst(effector.treffpunkte)) + for (const Treffpunkt &treffpunkt : std::as_const(effector.treffpunkte)) { const QPointF centerPoint(treffpunkt.koordinate.koordinate.longitude * (M_PI / 180.0), treffpunkt.koordinate.koordinate.latitude * (M_PI / 180.0)); @@ -744,7 +745,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId) if (data.feuerkommando.wirkmittel.size() > 0) { - for (const auto &effectorAdler : qAsConst(data.feuerkommando.wirkmittel)) + for (const auto &effectorAdler : std::as_const(data.feuerkommando.wirkmittel)) { AreaEffectSimulation::EffectorData effectorData; effectorData.angleOfFall() = 0; @@ -778,7 +779,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId) const double useNewGrad = -90 + std::atan2(coordDiff.y, coordDiff.x) * (180.0 / M_PI); DEBUG_LOG(m_logger) << "Atan2 Deg to: last point " << std::atan2(coordDiff.y, coordDiff.x) * (180.0 / M_PI); - for (const auto &flightPointAdler : qAsConst(effectorAdler.flugbahnpunkt)) + for (const auto &flightPointAdler : std::as_const(effectorAdler.flugbahnpunkt)) { Core::RelativePositionRelativeTime flightPoint; flightPoint.offsetX() = 0; // flightPointAdler.zRelativ; @@ -826,7 +827,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId) } else if (data.feuerkommando.wirkmittelRakete.size() > 0) { - for (const auto &effectorAdler : qAsConst(data.feuerkommando.wirkmittelRakete)) + for (const auto &effectorAdler : std::as_const(data.feuerkommando.wirkmittelRakete)) { AreaEffectSimulation::EffectorData effectorData; @@ -851,7 +852,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId) // create centroid Core::GeoPosition mhpPos; QPointF centroid; - for (const auto &treffpunkt : qAsConst(effectorAdler.treffpunkte)) + for (const auto &treffpunkt : std::as_const(effectorAdler.treffpunkte)) centroid += {treffpunkt.koordinate.koordinate.latitude, treffpunkt.koordinate.koordinate.longitude}; centroid /= effectorAdler.treffpunkte.size(); @@ -889,7 +890,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId) double currentFlightTime = 0.0; const LtsCoordTrans::UtmCoordinate utmStartPos = LtsCoordTrans::UtmCoordinate::fromGeographic(participantPosition.pos().lon(), participantPosition.pos().lat()); - for (const Core::GeoPosition &pos : qAsConst(trajectoryWithoutTime)) + for (const Core::GeoPosition &pos : std::as_const(trajectoryWithoutTime)) { const LtsCoordTrans::UtmCoordinate utmCurrentPos = LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon(), pos.lat()); @@ -935,7 +936,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId) std::vector refWirkmittel; refWirkmittel.reserve(data.feuerkommando.wirkmittel.size()); - for (const auto &wm : qAsConst(data.feuerkommando.wirkmittel)) + for (const auto &wm : std::as_const(data.feuerkommando.wirkmittel)) { ammoCounter += wm.geschoss.anzahl; // Counts every Ammo that will be shooted DEBUG_LOG(m_logger) << "INSERT KENNER INTO MAP: " << data.feuerkampfReferenz << "---------" << wm.kenner; @@ -954,7 +955,7 @@ QList AesHandler::findAllPendingEffectCluster(int partyId) // QList ret; QList ret; const auto &effectClusters = m_dtcAes->effectClusters(); - for (const auto &effectCluster : qAsConst(effectClusters)) + for (const auto &effectCluster : std::as_const(effectClusters)) { if (effectCluster.partyId() != partyId) continue; @@ -993,7 +994,7 @@ void AesHandler::handleAmmoCount(const Feuerkampfdaten &data, int saaPartyId, bo const auto &aesEffetClusters = m_dtcAes->effectClusters(); - for (const auto &aes : qAsConst(aesEffetClusters)) + for (const auto &aes : std::as_const(aesEffetClusters)) { if (aes.isDeleted() || aes.partyId() != saaPartyId || aes.element() != refTrimmed.toStdString()) { @@ -1024,7 +1025,7 @@ void AesHandler::handleAmmoCount(const Feuerkampfdaten &data, int saaPartyId, bo { auto refKenners = m_feuerkampfReferenzWirkmittel.value(refTrimmed); - for (const auto &kenner : qAsConst(refKenners)) + for (const auto &kenner : std::as_const(refKenners)) { ExVollzugsmeldung exvm; exvm.feuerkampfdaten.feuerkampfReferenz = data.feuerkampfReferenz; @@ -1056,7 +1057,7 @@ void AesHandler::removeAllPendingEffectCluster(int partyId) INFO_LOG(m_logger) << "Pending effect cluster size: " << effectClusterIds.size(); Core::RemoveElementRequest req; - for (const qint32 id : qAsConst(effectClusterIds)) + for (const qint32 id : std::as_const(effectClusterIds)) { req.id(id); INFO_LOG(m_logger) << "Remove effect cluster id: " << id; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp index 8a59d38a6..eac15006e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp @@ -8,6 +8,7 @@ */ #include "json_dispatcher.h" +#include #include "json_handler_rx.h" #include "json_handler_tx.h" #include "settings.h" @@ -910,7 +911,7 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId, std::vector args; args.reserve(contentArgs.size()); - for (const auto & str : qAsConst(contentArgs)) + for (const auto & str : std::as_const(contentArgs)) args.emplace_back(str.toStdString()); notif.content(content.toStdString()); @@ -930,7 +931,7 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId, std::vector recipientIdsDds; recipientIdsDds.reserve(recipientIds.size()); - for (const auto &recipientId : qAsConst(recipientIds)) + for (const auto &recipientId : std::as_const(recipientIds)) { NotificationManagement::Address addr; addr.addressId(recipientId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.cpp index 438474e29..e238ae117 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.cpp @@ -1,4 +1,5 @@ #include "telegrams.h" +#include #include #include @@ -332,7 +333,7 @@ void SAATELEGRAMS_EXPORT zielmeldedatenFromJson(const QJsonObject &data, Zielmel zielmeldedaten.forderung = ForderungMap.value(data[JsonKeys::FORDERUNG()].toString()); zielmeldedaten.dauer = toInteger(data[JsonKeys::DAUER()], bOk); QJsonArray FeuerkommandoArray = data[JsonKeys::FEUERKOMMANDO()].toArray(); - for (const QJsonValue &value : qAsConst(FeuerkommandoArray)) + for (const QJsonValue &value : std::as_const(FeuerkommandoArray)) { Feuerkommando feuerkommando; feuerkommandoFromJson(value.toObject(), feuerkommando, bOk); // EX-L34 Wirkmittel Feuerkommando @@ -362,7 +363,7 @@ void SAATELEGRAMS_EXPORT feuerstellungsdatenFromJson(const QJsonObject &data, Fe einheitfromJson(data[JsonKeys::FEUEREINHEIT()].toObject(), feuerstellungsdaten.feuereinheit, bOk); // EX-L3 koordinateMitHoeheFromJson(data[JsonKeys::MITTELPUNKT()].toObject(), feuerstellungsdaten.mittelpunkt, bOk); // EX-L3 QJsonArray koordinatenArray = data[JsonKeys::KOORDINATEN()].toArray(); - for (const QJsonValue &value : qAsConst(koordinatenArray)) + for (const QJsonValue &value : std::as_const(koordinatenArray)) { KoordinateMitHoehe koordinate; koordinateMitHoeheFromJson(value.toObject(), koordinate, bOk); // EX-L34 Wirkmittel Feuerkommando @@ -370,7 +371,7 @@ void SAATELEGRAMS_EXPORT feuerstellungsdatenFromJson(const QJsonObject &data, Fe } QJsonArray geschosseArray = data[JsonKeys::GESCHOSSE()].toArray(); - for (const QJsonValue &value : qAsConst(geschosseArray)) + for (const QJsonValue &value : std::as_const(geschosseArray)) { Geschoss geschosse; geschossfromJson(value.toObject(), geschosse, bOk); // EX-L34 Wirkmittel Feuerkommando @@ -394,7 +395,7 @@ void SAATELEGRAMS_EXPORT feuerstellungsdatenToJson(QJsonObject &data, const Feue data[JsonKeys::MITTELPUNKT()] = mittelpunkt; QJsonArray koordinaten; - for (const auto &koordinate : qAsConst(feuerstellungsdaten.koordinaten)) + for (const auto &koordinate : std::as_const(feuerstellungsdaten.koordinaten)) { QJsonObject koordinateObj; koordinateMitHoeheToJson(koordinateObj, koordinate); @@ -403,7 +404,7 @@ void SAATELEGRAMS_EXPORT feuerstellungsdatenToJson(QJsonObject &data, const Feue data[JsonKeys::KOORDINATEN()] = koordinaten; QJsonArray geschosse; - for (const auto &geschoss : qAsConst(feuerstellungsdaten.geschosse)) + for (const auto &geschoss : std::as_const(feuerstellungsdaten.geschosse)) { QJsonObject geschossObj; geschossToJson(geschossObj, geschoss); @@ -425,7 +426,7 @@ void SAATELEGRAMS_EXPORT waffensystemdatenFromJson(const QJsonObject &data, Waff einheitfromJson(data[JsonKeys::EINHEIT()].toObject(), waffensystemdaten.einheit, bOk); // EX-L3 QJsonArray geschosseArray = data[JsonKeys::GESCHOSSE()].toArray(); - for (const QJsonValue &value : qAsConst(geschosseArray)) + for (const QJsonValue &value : std::as_const(geschosseArray)) { Geschoss geschosse; geschossfromJson(value.toObject(), geschosse, bOk); // EX-L34 Wirkmittel Feuerkommando @@ -445,7 +446,7 @@ void SAATELEGRAMS_EXPORT waffensystemdatenToJson(QJsonObject &data, const Waffen data[JsonKeys::EINHEIT()] = einheit; QJsonArray geschosse; - for (const auto &geschoss : qAsConst(waffensystemdaten.geschosse)) + for (const auto &geschoss : std::as_const(waffensystemdaten.geschosse)) { QJsonObject geschossObj; geschossToJson(geschossObj, geschoss); @@ -469,7 +470,7 @@ void SAATELEGRAMS_EXPORT ladeplatzdatenFromJson(const QJsonObject &data, Ladepla koordinateMitHoeheFromJson(data[JsonKeys::KOORDINATE()].toObject(), ladeplatzdaten.koordinate, bOk); QJsonArray geschosseArray = data[JsonKeys::GESCHOSSE()].toArray(); - for (const QJsonValue &value : qAsConst(geschosseArray)) + for (const QJsonValue &value : std::as_const(geschosseArray)) { Geschoss geschosse; geschossfromJson(value.toObject(), geschosse, bOk); // EX-L34 Wirkmittel Feuerkommando @@ -484,7 +485,7 @@ void SAATELEGRAMS_EXPORT ladeplatzdatenToJson(QJsonObject &data, const Ladeplatz data[JsonKeys::EINHEIT()] = einheit; QJsonArray geschosse; - for (const auto &geschoss : qAsConst(ladeplatzdaten.geschosse)) + for (const auto &geschoss : std::as_const(ladeplatzdaten.geschosse)) { QJsonObject geschossObj; geschossToJson(geschossObj, geschoss); @@ -536,7 +537,7 @@ void SAATELEGRAMS_EXPORT koordinierungsdatenFromJson(const QJsonObject &data, Ko zeitangabe_DTGFromJson(data[JsonKeys::BIS()].toObject(), koordinierungsdaten.bis, bOk); // EX-L15 QJsonArray koordinatenArray = data[JsonKeys::KOORDINATEN()].toArray(); - for (const QJsonValue &value : qAsConst(koordinatenArray)) + for (const QJsonValue &value : std::as_const(koordinatenArray)) { Koordinate koordinate; koordinatefromJson(value.toObject(), koordinate, bOk); // EX-L13 @@ -561,7 +562,7 @@ void SAATELEGRAMS_EXPORT koordinierungsdatenToJson(QJsonObject &data, const Koor data[JsonKeys::BIS()] = objTimestamp; QJsonArray koordinatenArray; - for (const auto &koordinate : qAsConst(koordinierungsdaten.koordinaten)) + for (const auto &koordinate : std::as_const(koordinierungsdaten.koordinaten)) { QJsonObject objKoordinate; koordinateToJson(objKoordinate, koordinate); @@ -817,7 +818,7 @@ void SAATELEGRAMS_EXPORT erkundungsstellungenFromJson(const QJsonObject &data, E // Wirkungsbereich wirkungsbereich; // EX-L18 QJsonArray waffenplaetzeArray = data[JsonKeys::WAFFENPLAETZE()].toArray(); - for (const QJsonValue &value : qAsConst(waffenplaetzeArray)) + for (const QJsonValue &value : std::as_const(waffenplaetzeArray)) { KoordinateMitHoehe koordinateMitHoehe; koordinateMitHoeheFromJson(value.toObject(), koordinateMitHoehe, bOk); @@ -829,7 +830,7 @@ void SAATELEGRAMS_EXPORT erkundungsstellungenFromJson(const QJsonObject &data, E void SAATELEGRAMS_EXPORT erkundungsstellungenToJson(QJsonObject &data, const Erkundungsstellungen &erkundungsstellungen) { QJsonArray objWaffenplatzList; - for (const auto waffenplatz : qAsConst(erkundungsstellungen.waffenplaetze)) + for (const auto waffenplatz : std::as_const(erkundungsstellungen.waffenplaetze)) { QJsonObject objWaffenplatz; koordinateMitHoeheToJson(objWaffenplatz, waffenplatz); @@ -855,7 +856,7 @@ void SAATELEGRAMS_EXPORT feuerkommandoFromJson(const QJsonObject &data, Feuerkom else { QJsonArray wirkmittelArray = data[JsonKeys::WIRKMITTEL()].toArray(); - for (const QJsonValue &value : qAsConst(wirkmittelArray)) + for (const QJsonValue &value : std::as_const(wirkmittelArray)) { WirkmittelFeuerkommando wirkmittel; wirkmittelFeuerkommandoFromJson(value.toObject(), wirkmittel, bOk); // EX-L34 Wirkmittel Feuerkommando @@ -867,7 +868,7 @@ void SAATELEGRAMS_EXPORT feuerkommandoFromJson(const QJsonObject &data, Feuerkom else { QJsonArray wirkmittelArray = data[JsonKeys::WIRKMITTELRAKETE()].toArray(); - for (const QJsonValue &value : qAsConst(wirkmittelArray)) + for (const QJsonValue &value : std::as_const(wirkmittelArray)) { WirkmittelFeuerkommandoRakete wirkmittel; wirkmittelFeuerkommandoRaketeFromJson(value.toObject(), wirkmittel, bOk); // EX-L34 Wirkmittel Feuerkommando @@ -878,7 +879,7 @@ void SAATELEGRAMS_EXPORT feuerkommandoFromJson(const QJsonObject &data, Feuerkom void SAATELEGRAMS_EXPORT feuerkommandosToJson(QJsonArray &data, const QVector &feuerkommandos) { - for (const auto &feuerkommando : qAsConst(feuerkommandos)) + for (const auto &feuerkommando : std::as_const(feuerkommandos)) { QJsonObject objFeuerkommand; feuerkommandoToJson(objFeuerkommand, feuerkommando); @@ -892,7 +893,7 @@ void SAATELEGRAMS_EXPORT feuerkommandoToJson(QJsonObject &data, const Feuerkomma data[JsonKeys::TYP()] = waffensystemtypMap.key(feuerkommando.typ); QJsonArray objWirkmittelList; QJsonArray objWirkmittelRaketeList; - for (const auto &kommando : qAsConst(feuerkommando.wirkmittel)) + for (const auto &kommando : std::as_const(feuerkommando.wirkmittel)) { QJsonObject objWirkmittel; wirkmittelFeuerkommandoToJson(objWirkmittel, kommando); @@ -900,7 +901,7 @@ void SAATELEGRAMS_EXPORT feuerkommandoToJson(QJsonObject &data, const Feuerkomma } data[JsonKeys::WIRKMITTEL()] = objWirkmittelList; - for (const auto &kommando : qAsConst(feuerkommando.wirkmittelRakete)) + for (const auto &kommando : std::as_const(feuerkommando.wirkmittelRakete)) { QJsonObject objWirkmittel; wirkmittelFeuerkommandoRaketeToJson(objWirkmittel, kommando); @@ -937,7 +938,7 @@ void wirkmittelFeuerkommandoFromJson(const QJsonObject &data, WirkmittelFeuerkom void wirkmittelFeuerkommandosToJson(QJsonArray &data, const QVector &wirkmittelFeuerkommando) { - for (const auto &feuerkommando : qAsConst(wirkmittelFeuerkommando)) + for (const auto &feuerkommando : std::as_const(wirkmittelFeuerkommando)) { QJsonObject fkd; wirkmittelFeuerkommandoToJson(fkd, feuerkommando); @@ -947,7 +948,7 @@ void wirkmittelFeuerkommandosToJson(QJsonArray &data, const QVector &wirkmittelFeuerkommando) { - for (const auto &wfk : qAsConst(wirkmittelFeuerkommando)) + for (const auto &wfk : std::as_const(wirkmittelFeuerkommando)) { QJsonObject obj; wirkmittelFeuerkommandoToJson(obj, wfk); @@ -1007,7 +1008,7 @@ void SAATELEGRAMS_EXPORT flugbahnpunktToJson(QJsonObject &data, const Flugbahnpu // Array [EX-L35 Flugbahnpunkte] void SAATELEGRAMS_EXPORT flugbahnpunkteFromJson(const QJsonArray &data, QVector &flugbahnpunkte, bool &bOk) { - for (const QJsonValue &value : qAsConst(data)) + for (const QJsonValue &value : std::as_const(data)) { QJsonObject obj = value.toObject(); Flugbahnpunkt flugbahnpunkt; @@ -1021,7 +1022,7 @@ void SAATELEGRAMS_EXPORT flugbahnpunkteToJson(QJsonArray &data, const QVector &treffpunkte, bool &bOk) { - for (const QJsonValue &val : qAsConst(data)) + for (const QJsonValue &val : std::as_const(data)) { Treffpunkt treffpunkt; treffpunktfromJson(val.toObject(), treffpunkt, bOk); @@ -1215,7 +1216,7 @@ void trefferpunktToJson(QJsonObject &data, const Treffpunkt &treffpunkt) void trefferpunkteToJson(QJsonArray &data, const QVector &treffpunkte) { - for (const auto &treffpunkt : qAsConst(treffpunkte)) + for (const auto &treffpunkt : std::as_const(treffpunkte)) { QJsonObject trp; trefferpunktToJson(trp, treffpunkt); @@ -1244,7 +1245,7 @@ void wirkmittelFeuerkommandoRaketeToJson(QJsonObject &data, const WirkmittelFeue void wirkmittelFeuerkommandosRaketeToJson(QJsonArray &data, const QVector &wirkmittelFeuerkommandoRakete) { - for (const auto &feuerkommandoRakete : qAsConst(wirkmittelFeuerkommandoRakete)) + for (const auto &feuerkommandoRakete : std::as_const(wirkmittelFeuerkommandoRakete)) { QJsonObject fkr; wirkmittelFeuerkommandoRaketeToJson(fkr, feuerkommandoRakete); @@ -1292,7 +1293,7 @@ void SAATELEGRAMS_EXPORT fuehrungsdatenFromJson(const QJsonObject &data, Fuehrun zeitangabe_DTGFromJson(data[JsonKeys::AB()].toObject(), fuehrungsdaten.ab, bOk); // EX-L15 zeitangabe_DTGFromJson(data[JsonKeys::BIS()].toObject(), fuehrungsdaten.bis, bOk); // EX-L15 QJsonArray koordinatenArray = data[JsonKeys::KOORDINATEN()].toArray(); - for (const QJsonValue &value : qAsConst(koordinatenArray)) + for (const QJsonValue &value : std::as_const(koordinatenArray)) { Koordinate koordinate; koordinatefromJson(value.toObject(), koordinate, bOk); // EX-L13 @@ -1315,7 +1316,7 @@ void SAATELEGRAMS_EXPORT fuehrungsdatenToJson(QJsonObject &data, const Fuehrungs data[JsonKeys::BIS()] = objTimestamp; QJsonArray koordinatenArray; - for (const auto &koordinate : qAsConst(fuehrungsdaten.koordinaten)) + for (const auto &koordinate : std::as_const(fuehrungsdaten.koordinaten)) { QJsonObject objKoordinate; koordinateToJson(objKoordinate, koordinate); @@ -1378,7 +1379,7 @@ void SAATELEGRAMS_EXPORT flugbahndatenFromJson(const QJsonObject &data, Flugbahn flugbahndaten.fallwinkel = toInteger(data[JsonKeys::FALLWINKEL()], bOk); QJsonArray flugbahnpunkteArray = data[JsonKeys::FLUGBAHNPUNKT()].toArray(); - for (const QJsonValue &value : qAsConst(flugbahnpunkteArray)) + for (const QJsonValue &value : std::as_const(flugbahnpunkteArray)) { Flugbahnpunkt flugbahnpunkt; flugbahnpunktFromJson(value.toObject(), flugbahnpunkt, bOk); // EX-L13 @@ -1410,7 +1411,7 @@ void SAATELEGRAMS_EXPORT flugbahndatenToJson(QJsonObject &data, const Flugbahnda data[JsonKeys::FALLWINKEL()] = flugbahndaten.fallwinkel; QJsonArray flugbahnpunkte; - for (const auto &flugbahnpunkt : qAsConst(flugbahndaten.flugbahnpunkt)) + for (const auto &flugbahnpunkt : std::as_const(flugbahndaten.flugbahnpunkt)) { QJsonObject flugbahnpunktObj; flugbahnpunktToJson(flugbahnpunktObj, flugbahnpunkt); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp index 3ac8b9960..8d31b5c44 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp @@ -13,11 +13,11 @@ namespace TrainingAreaBase { -IsmHandler::IsmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler) +IsmHandler::IsmHandler(MainHandler *mainHandler) : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_mainHandler(mainHandler) , m_dtcIsm(nullptr) , m_distanceIpsToGps(Settings::distanceIpsToGps()) - , m_distanceOpsToGps(Settings::distanceOpsToGps()), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} + , m_distanceOpsToGps(Settings::distanceOpsToGps()) {} bool IsmHandler::init() { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp index 85aa58950..e4db397f6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp @@ -7,6 +7,7 @@ */ #include "main_handler.h" +#include #include "settings.h" #include "logger.h" #include "WebSocketInterface/Messages/reply_message.h" @@ -31,9 +32,9 @@ namespace TrainingAreaBase MainHandler::MainHandler(QObject *parent) : QObject(parent) - , m_ddsHandler(nullptr) - , m_handlerWebSocket(nullptr) , m_logger(getLogger("MainHandler")) + , m_ddsHandler(nullptr) + , m_handlerWebSocket(nullptr) {} MainHandler::~MainHandler() @@ -333,7 +334,7 @@ void MainHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, Da m_txHandler->txData(exerciseStateData()); // update Interfaces - for (const std::shared_ptr &ifc : qAsConst(m_interfaces)) + for (const std::shared_ptr &ifc : std::as_const(m_interfaces)) ifc->exerciseChanged(); } @@ -392,7 +393,7 @@ void MainHandler::onDirectMessage(const QByteArray &jsonMessage) quint32 bitValue = 1U << it; QString name; QString isOk; - for (const ProjectDataManagement::CanComponentString &ccs : qAsConst(m_ccsMap)) + for (const ProjectDataManagement::CanComponentString &ccs : std::as_const(m_ccsMap)) { if (ccs.pdm_bitMask == bitValue) { @@ -436,7 +437,7 @@ void MainHandler::onDirectMessage(const QByteArray &jsonMessage) } // componentErrors - for (const auto &ele : qAsConst(biteError)) + for (const auto &ele : std::as_const(biteError)) { QString text; QJsonObject error = ele.toObject(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp index 9b2a4b0a2..5301863e1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp @@ -10,9 +10,9 @@ namespace TrainingAreaBase { -PdmHandler::PdmHandler(MainHandler *mainHandler) : m_initialized(false) - , m_mainHandler(mainHandler), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} +PdmHandler::PdmHandler(MainHandler *mainHandler) : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_initialized(false) + , m_mainHandler(mainHandler) {} bool PdmHandler::init() { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp index e249efd0c..0c72f87f6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp @@ -10,8 +10,8 @@ using namespace TrainingAreaBase; PositionHandler::PositionHandler(MainHandler *mainHandler) : QObject() - , m_mainHandler(mainHandler), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_mainHandler(mainHandler) {} bool PositionHandler::init() { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp index e98789f50..4429e5617 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp @@ -7,6 +7,7 @@ */ #include "recv_from_dds_fts.h" +#include #include "main_handler.h" #include "ism_handler.h" #include "settings.h" @@ -51,10 +52,10 @@ RecvFromDdsFts::RecvFromDdsFts(MainHandler *mainHandler, const std::shared_ptr> RecvFromDdsFts::loadRemai QVector resVec; QStringList keyList = obj.keys(); - for (const auto &key : qAsConst(keyList)) + for (const auto &key : std::as_const(keyList)) { const auto &val = obj.value(key).toObject(); @@ -731,7 +734,7 @@ QMap> RecvFromDdsFts::loadRemai QStringList x = val.keys(); int i=0; - for (const auto &resElement : qAsConst(x)) + for (const auto &resElement : std::as_const(x)) { const auto val2 = val.value(resElement).toInt(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp index 77f36ebc3..53797392b 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp @@ -241,7 +241,7 @@ bool get(const QJsonObject &obj, const QString &key, std::vector template <> bool get(const QJsonObject &obj, const QString &key, VulnerabilityState &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); val = static_cast(iVal); @@ -253,7 +253,7 @@ bool get(const QJsonObject &obj, const QString &key, VulnerabilityState &val, bo template <> bool get(const QJsonObject &obj, const QString &key, OriginatorType &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -275,7 +275,7 @@ bool get(const QJsonObject &obj, const QString &key, OriginatorType &val, bool b template <> bool get(const QJsonObject &obj, const QString &key, FunctionalAreaOperatingMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -291,7 +291,7 @@ bool get(const QJsonObject &obj, const QString &key, FunctionalAreaOperatingMode template <> bool get(const QJsonObject &obj, const QString &key, Language &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -311,7 +311,7 @@ bool get(const QJsonObject &obj, const QString &key, Language &val, bool bOption template <> bool get(const QJsonObject &obj, const QString &key, ParticipantLicenseState &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -328,7 +328,7 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantLicenseState &va template <> bool get(const QJsonObject &obj, const QString &key, EquipmentConfigurationReport::MineHandgrenadeSensorMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -344,7 +344,7 @@ bool get(const QJsonObject &obj, const QString &key, EquipmentConfigurationRepor template <> bool get(const QJsonObject &obj, const QString &key, EquipmentConfigurationReport::FirMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -360,7 +360,7 @@ bool get(const QJsonObject &obj, const QString &key, EquipmentConfigurationRepor template <> bool get(const QJsonObject &obj, const QString &key, EquipmentConfigurationReport::MineLayerMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -376,7 +376,7 @@ bool get(const QJsonObject &obj, const QString &key, EquipmentConfigurationRepor template <> bool get(const QJsonObject &obj, const QString &key, EquipmentConfigurationReport::SpecialSensorStandardMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -394,7 +394,7 @@ bool get(const QJsonObject &obj, const QString &key, EquipmentConfigurationRepor template <> bool get(const QJsonObject &obj, const QString &key, EquipmentConfigurationReport::AgdusHwMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -410,7 +410,7 @@ bool get(const QJsonObject &obj, const QString &key, EquipmentConfigurationRepor template <> bool get(const QJsonObject &obj, const QString &key, EquipmentConfigurationReport::PositionUpdateInterval &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -426,7 +426,7 @@ bool get(const QJsonObject &obj, const QString &key, EquipmentConfigurationRepor template <> bool get(const QJsonObject &obj, const QString &key, CtaDataError::Reason &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -460,7 +460,7 @@ bool get(const QJsonObject &obj, const QString &key, CtaDataError::Reason &val, template <> bool get(const QJsonObject &obj, const QString &key, CreateCContamination::Volatiliy &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -475,7 +475,7 @@ bool get(const QJsonObject &obj, const QString &key, CreateCContamination::Volat template <> bool get(const QJsonObject &obj, const QString &key, AreaEffectSimulationType &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -503,7 +503,7 @@ bool get(const QJsonObject &obj, const QString &key, AreaEffectSimulationType &v template <> bool get(const QJsonObject &obj, const QString &key, IedType &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -519,7 +519,7 @@ bool get(const QJsonObject &obj, const QString &key, IedType &val, bool bOptiona template <> bool get(const QJsonObject &obj, const QString &key, IedPairingState &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -535,7 +535,7 @@ bool get(const QJsonObject &obj, const QString &key, IedPairingState &val, bool template <> bool get(const QJsonObject &obj, const QString &key, IedTacticalState &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -557,7 +557,7 @@ bool get(const QJsonObject &obj, const QString &key, IedTacticalState &val, bool template <> bool get(const QJsonObject &obj, const QString &key, IedError &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -572,7 +572,7 @@ bool get(const QJsonObject &obj, const QString &key, IedError &val, bool bOption template <> bool get(const QJsonObject &obj, const QString &key, MinelayerThrowerData::ThrowingType &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -592,7 +592,7 @@ bool get(const QJsonObject &obj, const QString &key, MinelayerThrowerData::Throw template <> bool get(const QJsonObject &obj, const QString &key, OpaquePayloadDataBase::Type &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -609,7 +609,7 @@ bool get(const QJsonObject &obj, const QString &key, OpaquePayloadDataBase::Type template <> bool get(const QJsonObject &obj, const QString &key, TechnicalArea::Type &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -628,7 +628,7 @@ bool get(const QJsonObject &obj, const QString &key, TechnicalArea::Type &val, b template <> bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::OperationMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -644,7 +644,7 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::Operat template <> bool get(const QJsonObject &obj, const QString &key, BiteReport::LoginType &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -661,7 +661,7 @@ bool get(const QJsonObject &obj, const QString &key, BiteReport::LoginType &val, template <> bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::WphMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -677,7 +677,7 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::WphMod template <> bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::PersonellProtection &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -694,7 +694,7 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::Person template <> bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::ProtectionLevel &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -713,7 +713,7 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::Protec template <> bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::HandgrenadeSearchMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -729,7 +729,7 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::Handgr template <> bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::InternationalMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -745,7 +745,7 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::Intern template <> bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::ABCProtectionMode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -761,7 +761,7 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::ABCPro template <> bool get(const QJsonObject &obj, const QString &key, ParticipantConfigurationBase::FaultPositionHandling &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -778,7 +778,7 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantConfigurationBas template <> bool get(const QJsonObject &obj, const QString &key, ParticipantConfigurationBase::SwitchingPositionIntervall &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -794,7 +794,7 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantConfigurationBas template <> bool get(const QJsonObject &obj, const QString &key, ParticipantConfigurationBase::OpticalCode &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -811,7 +811,7 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantConfigurationBas template <> bool get(const QJsonObject &obj, const QString &key, SanitationResult &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -829,7 +829,7 @@ bool get(const QJsonObject &obj, const QString &key, SanitationResult &val, bool template <> bool get(const QJsonObject &obj, const QString &key, SanitationEvaluation &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -846,7 +846,7 @@ bool get(const QJsonObject &obj, const QString &key, SanitationEvaluation &val, template <> bool get(const QJsonObject &obj, const QString &key, Qualification &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -863,7 +863,7 @@ bool get(const QJsonObject &obj, const QString &key, Qualification &val, bool bO template <> bool get(const QJsonObject &obj, const QString &key, SanitationRepair::TreatmentResult &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -880,7 +880,7 @@ bool get(const QJsonObject &obj, const QString &key, SanitationRepair::Treatment template <> bool get(const QJsonObject &obj, const QString &key, ExerciseStateData::ExerciseState &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -899,7 +899,7 @@ bool get(const QJsonObject &obj, const QString &key, ExerciseStateData::Exercise template <> bool get(const QJsonObject &obj, const QString &key, ServiceControlEnum &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -916,7 +916,7 @@ bool get(const QJsonObject &obj, const QString &key, ServiceControlEnum &val, bo template <> bool get(const QJsonObject &obj, const QString &key, PowerMethod &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -933,7 +933,7 @@ bool get(const QJsonObject &obj, const QString &key, PowerMethod &val, bool bOpt template <> bool get(const QJsonObject &obj, const QString &key, UAVActionTask &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -944,6 +944,7 @@ bool get(const QJsonObject &obj, const QString &key, UAVActionTask &val, bool bO case UAVActionTask::Connect: case UAVActionTask::Loiter: case UAVActionTask::Return: + case UAVActionTask::Observe: val = static_cast(iVal); return true; } @@ -953,7 +954,7 @@ bool get(const QJsonObject &obj, const QString &key, UAVActionTask &val, bool bO template <> bool get(const QJsonObject &obj, const QString &key, UAVRadioLinkConnectionStatusType &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { @@ -972,7 +973,7 @@ bool get(const QJsonObject &obj, const QString &key, UAVRadioLinkConnectionStatu template <> bool get(const QJsonObject &obj, const QString &key, UAVState &val, bool bOptional) { - int iVal; + int iVal = 0; get(obj, key, iVal, bOptional); switch (static_cast(iVal)) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp index 26f65d425..a03ba50af 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp @@ -14,11 +14,11 @@ namespace TrainingAreaBaseOC { -TxDdlHandler::TxDdlHandler() : m_state(DdlState::NotStarted) +TxDdlHandler::TxDdlHandler() : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_state(DdlState::NotStarted) , m_segmentToggle(0) , m_sentCnt(0) - , m_responseTimer(new QTimer(this)), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + , m_responseTimer(new QTimer(this)) { m_responseTimer->setInterval(1000); m_responseTimer->setSingleShot(true); connect(m_responseTimer, &QTimer::timeout, this, &TxDdlHandler::sendAbortOrRestartTimeout); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.cpp index d20dc6e84..971a38fb7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.cpp @@ -12,9 +12,9 @@ namespace TrainingAreaBaseOC { -ConnectionHandlerSerial::ConnectionHandlerSerial() : m_spQuerry(new LtsSerialPortQuerry::LtsSerialPortQuerry(this)) - , m_receiveTimeoutTimer(new QTimer(this)), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { +ConnectionHandlerSerial::ConnectionHandlerSerial() : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_spQuerry(new LtsSerialPortQuerry::LtsSerialPortQuerry(this)) + , m_receiveTimeoutTimer(new QTimer(this)) { connect(m_spQuerry, &LtsSerialPortQuerry::LtsSerialPortQuerry::connectionEstablished, this, &ConnectionHandlerSerial::open); m_spQuerry->restartQuerry(); m_receiveTimeoutTimer->setInterval(5000); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp index ab66e4b82..89f89b166 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp @@ -12,8 +12,8 @@ namespace TrainingAreaBaseOC { -ConnectionHandlerTcp::ConnectionHandlerTcp() : m_timer(new QTimer(this)), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { +ConnectionHandlerTcp::ConnectionHandlerTcp() : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_timer(new QTimer(this)) { m_timer->setInterval(5000); connect(m_timer, &QTimer::timeout, this, &ConnectionHandlerTcp::open); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.cpp index ef0332e47..627483a40 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.cpp @@ -15,14 +15,14 @@ using namespace NGL; namespace TrainingAreaBaseOC { -ConnectionHandlerTcpTtci::ConnectionHandlerTcpTtci() : m_messageDataStart(true) +ConnectionHandlerTcpTtci::ConnectionHandlerTcpTtci() : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_messageDataStart(true) , m_wirkfeldDataStart(true) , m_wirkfeldMultiplex(0) , m_sendingData(false) , m_segmentToggle(0) , m_canDevice(new Device(this)) - , m_canChannel(new Channel(QLatin1Char('@'), true, this)), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + , m_canChannel(new Channel(QLatin1Char('@'), true, this)) { connect(m_canChannel, &Channel::dataAvailable, this, &ConnectionHandlerTcpTtci::slotReadCanFrame); connect(m_canChannel, &Channel::disconnectedFromEq, this, &ConnectionHandlerTcpTtci::disconnectedFromEq); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.cpp index c0646643b..0254e6624 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.cpp @@ -16,6 +16,7 @@ namespace TrainingAreaBaseOC MainHandler::MainHandler(QObject *parent) : QObject(parent) + , m_logger(getLogger("MainHandler")) , m_aesDtc(nullptr) , m_aesFtc(nullptr) , m_pdmDtc(nullptr) @@ -25,7 +26,6 @@ MainHandler::MainHandler(QObject *parent) , m_rxHandler(nullptr) , m_ftsHandler(nullptr) , m_websocketHandler(nullptr) - , m_logger(getLogger("MainHandler")) {} MainHandler::~MainHandler() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/recv_from_dds_fts.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/recv_from_dds_fts.cpp index 7cdc1cb73..bf45741bc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/recv_from_dds_fts.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/recv_from_dds_fts.cpp @@ -16,10 +16,10 @@ RecvFromDdsFts::RecvFromDdsFts(MainHandler *mainHandler) , Interface::Fts::SendTechnicalStateOcRequestHandler(mainHandler->dds()->ftsTaboc()) , TrainingAreaBase::Interface::Fts::SendOcDataRequestHandler(mainHandler->dds()->ftsTab()) , TrainingAreaBase::Interface::Fts::SendFireSmokeMarkerDataRequestHandler(mainHandler->dds()->ftsTab()) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) , m_ftsTaboc(mainHandler->dds()->ftsTaboc()) , m_ftsTab(mainHandler->dds()->ftsTab()) , m_txCallback(mainHandler->txHandler()) - , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} void RecvFromDdsFts::onDemandCyclicPositionsRequest(const rti::core::SampleIdentity &cookie, const DemandCyclicPositionsRequest &request) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp index bbfeb663d..f524a9f79 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp @@ -12,11 +12,11 @@ namespace TrainingAreaBaseOC { -SendToDds::SendToDds(MainHandler *mainHandler) : m_dtsTaboc(mainHandler->dds()->dtsTaboc()) +SendToDds::SendToDds(MainHandler *mainHandler) : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_dtsTaboc(mainHandler->dds()->dtsTaboc()) , m_dtsTab(mainHandler->dds()->dtsTab()) , m_utmCoord(LtsCoordTrans::UtmCoordinate()) - , m_idToSend(1), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} + , m_idToSend(1) {} void SendToDds::rxData(const OcTelegrams::Display &inData) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.cpp index 587e710bd..7437fd3cc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.cpp @@ -10,10 +10,10 @@ namespace TrainingAreaBaseOC { Channel::Channel(QChar channel, bool bIsBinary, QObject *parent) : QObject(parent) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("SCTT.Channel")) , m_channel(channel) , m_bIsBinary(bIsBinary) - , m_device(nullptr) - , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("SCTT.Channel")) {} + , m_device(nullptr) {} void Channel::setDevice(Device *dev) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp index 35ff9d7a1..a6bbfd830 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp @@ -11,12 +11,12 @@ namespace TrainingAreaBaseOC { Device::Device(QObject *parent, bool tcpMode) : QObject(parent) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("TTCI.Device")) , m_spQuerry(new LtsSerialPortQuerry::LtsSerialPortQuerry(this)) , m_socket(new QTcpSocket(this)) , m_restartTimer(new QTimer(this)) , m_receiveTimeoutTimer(new QTimer(this)) - , m_tcpMode(tcpMode) - , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("TTCI.Device")) { + , m_tcpMode(tcpMode) { connect(m_spQuerry, &LtsSerialPortQuerry::LtsSerialPortQuerry::connectionEstablished, this, &Device::open); m_spQuerry->restartQuerry(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp index 3f4ea339d..721f91319 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp @@ -146,7 +146,7 @@ void DataManager::openWebSocket() this, &DataManager::newTextMessageFromClient); m_clientConnection->init(); - connect(wsSocket, QOverload::of(&QWebSocket::error), + connect(wsSocket, &QWebSocket::errorOccurred, this, &DataManager::onWebSocketError); connect(wsSocket, &QWebSocket::connected, this, &DataManager::onWebSocketConnected); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp index a476ef115..1590740a7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp @@ -14,8 +14,8 @@ namespace WarehouseManagement { DdsHandler::DdsHandler(int domainId) - : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, 0)) - , m_logger(getLogger("DdsHandler")) + : m_logger(getLogger("DdsHandler")) + , m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, 0)) { DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.cpp index 0f7c66a80..749e5ea32 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.cpp @@ -15,8 +15,8 @@ namespace WarehouseManagement { DdsHandlerExercise::DdsHandlerExercise(const dds::domain::DomainParticipant &dp, int exerciseId) - : m_ddsConnector(new DDSConnector::DdsConnector(dp, IDL::PartitionType::Exercise, exerciseId)) - , m_logger(getLogger("DdsHandlerExercise")) + : m_logger(getLogger("DdsHandlerExercise")) + , m_ddsConnector(new DDSConnector::DdsConnector(dp, IDL::PartitionType::Exercise, exerciseId)) { m_ddsConnector->setDomainParticipant(dp); DEBUG_LOG(m_logger) << "DdsHandlerExercise for partition: " << m_ddsConnector->getDefaultPartition(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.cpp index c809663cb..0b25a3a41 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.cpp @@ -10,10 +10,10 @@ using namespace WarehouseManagement; ExerciseParticipantHandler::ExerciseParticipantHandler(const dds::domain::DomainParticipant &domainParticipant, int exerciseId, ExercisesHandler *exercisesHandler) - : m_exerciseId(exerciseId) + : m_logger(getLogger(QLatin1String("ExerciseParticipantHandler.") + QString::number(exerciseId))) + , m_exerciseId(exerciseId) , m_ddsHandlerExercise(new DdsHandlerExercise(domainParticipant, exerciseId)) , m_exercisesHandler(exercisesHandler) - , m_logger(getLogger(QLatin1String("ExerciseParticipantHandler.") + QString::number(exerciseId))) {} ExerciseParticipantHandler::~ExerciseParticipantHandler() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.cpp index fba1de9ea..306025936 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.cpp @@ -14,8 +14,8 @@ namespace WirelessLocationSystem { DdsHandler::DdsHandler(int domainId, int exerciseId) - : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, exerciseId)) - , m_logger(getLogger("DdsHandler")) + : m_logger(getLogger("DdsHandler")) + , m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, exerciseId)) { DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main.cpp index 1155c55f5..d30c28486 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main.cpp @@ -39,7 +39,7 @@ bool sendBinarySfmData(const QByteArray &ba, int sendCounter) if (!WlsParticipant::calcChunkCountAndLen(ba, chunkCount, chunkLen)) { - fprintf(stderr, "Chunk count is not ok - data size: %d\n", ba.size()); + fprintf(stderr, "Chunk count is not ok - data size: %d\n", (int)ba.size()); return false; } @@ -59,7 +59,7 @@ bool sendBinarySfmData(const QByteArray &ba, int sendCounter) SfmMsgTetra_rx rx; rx.setPayload(tx.getPayload()); fprintf(stdout, "Output: len: %d(%d), %s, sendCounter: %d(0x%02x), is fragmented: %d, fragment: %d/%d\n", - payload.size(), tx.getPayload().size(), payload.data(), + (int)payload.size(), (int)tx.getPayload().size(), payload.data(), rx.sendCounter(), rx.sendCounter(), rx.isFragmented(), rx.fragmentNumber(), rx.fragmentCount()); ++sendCounter; @@ -75,12 +75,12 @@ static int checkData(const QByteArray &data) try { const auto msg = LtsUtils::byteStreamToSfmMessage(ba); - fprintf(stdout, "Message payload: len: %d, %s\n", msg.payload().size(), msg.payload().toHex().data()); + fprintf(stdout, "Message payload: len: %d, %s\n", (int)msg.payload().size(), msg.payload().toHex().data()); if (msg.id() == int(SfmMessage::MsgId::TetraMessage)) { WirelessLocationSystem::SfmMsgTetra_rx rx; rx.setPayload(msg.payload()); - fprintf(stdout, "SfmMsgTetra payload: len: %d, %s, ", rx.payload().size(), rx.payload().toHex().data()); + fprintf(stdout, "SfmMsgTetra payload: len: %d, %s, ", (int)rx.payload().size(), rx.payload().toHex().data()); fprintf(stdout, "sendCounter: %d(0x%02x), is fragmented: %d, fragment: %d/%d\n", rx.sendCounter(), rx.sendCounter(), rx.isFragmented(), rx.fragmentNumber(), rx.fragmentCount()); sendBinarySfmData(rx.payload(), 0x02); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.cpp index c48118fff..01a731d23 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.cpp @@ -15,8 +15,8 @@ namespace WirelessLocationSystem MainHandler::MainHandler(QObject *parent) : QObject(parent) - , m_ddsHandler(nullptr) , m_logger(getLogger("MainHandler")) + , m_ddsHandler(nullptr) {} MainHandler::~MainHandler() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp index 0bf32b0ef..50783f0b8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp @@ -24,9 +24,9 @@ namespace WirelessLocationSystem const char *exerciseIdProperty = "exerciseId"; WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) , m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this)) - , m_basePoint(LtsCoordTrans::UtmCoordinate::fromMgrs(Settings::wlsMgrsBasePoint())), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} + , m_basePoint(LtsCoordTrans::UtmCoordinate::fromMgrs(Settings::wlsMgrsBasePoint())) {} WebSocketHandler::~WebSocketHandler() {} diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp index 03a2884ad..f5ee664d5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp @@ -17,8 +17,8 @@ static constexpr int s_maxWlsRetryCount = 3; namespace WirelessLocationSystem { WlsParticipant::WlsParticipant(QObject *parent) : QObject(parent) - , m_wlsTeleTimeoutTimer(new QTimer(this)), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_wlsTeleTimeoutTimer(new QTimer(this)) { m_wlsTeleTimeoutTimer->setSingleShot(true); m_wlsTeleTimeoutTimer->setTimerType(Qt::VeryCoarseTimer); m_wlsTeleTimeoutTimer->setInterval(s_dataCommunicationAliveTimeout); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.cpp index 29614818b..c695b12b7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.cpp @@ -12,8 +12,8 @@ namespace WirelessLocationSystem { WlsParticipantHandler::WlsParticipantHandler(QObject *parent) : QObject(parent) - , m_gpsOnOffTimeoutTimer(new QTimer(this)), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_gpsOnOffTimeoutTimer(new QTimer(this)) { connect(m_gpsOnOffTimeoutTimer, &QTimer::timeout, this, &WlsParticipantHandler::onGpsOnOffTimeoutTimer); m_gpsOnOffTimeoutTimer->setSingleShot(false); m_gpsOnOffTimeoutTimer->start(1000); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp index c13fb4f40..520a10877 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp @@ -7,6 +7,7 @@ */ #include "handler_configure_alarms.h" +#include #include "initialization.h" #include #include @@ -245,7 +246,7 @@ void HandlerConfigureAlarms::onEventChanged(const ExerciseEventManagement::Event // Schleife ueber jeden Participant in der Konfiguration // Vergleich Participant-ID Event mit Konfiguration Event // Wenn ja, Alarm an operatorId schicken - for (const Database::AlmConfig &alarm : qAsConst(m_alarms)) + for (const Database::AlmConfig &alarm : std::as_const(m_alarms)) { { /*DEBUG_LOG(m_logger) << " alarmConfigItem.id=" << alarm.id @@ -267,7 +268,7 @@ void HandlerConfigureAlarms::onEventChanged(const ExerciseEventManagement::Event else participants.append(0); - for (int participantId : qAsConst(participants)) + for (int participantId : std::as_const(participants)) { bool allVulnerabilityStates = alarm.vulnerabilityState == -1; bool vulnerabilityCheck = vulnerabilityState == alarm.vulnerabilityState; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp index 4aecb2e90..89821d1d6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp @@ -7,6 +7,7 @@ */ #include "handler_emergency_call.h" +#include #include "initialization.h" #include "handler_configure_alarms.h" #include "object_emergency_call.h" @@ -131,7 +132,7 @@ void HandlerEmergencyCall::onEmergencyCallAcknowledgeRequest(const rti::core::Sa Core::FunctionReplyObject HandlerEmergencyCall::emergencyCallAcknowledgeRequest(const EmergencyCallAcknowledgeRequest &request) { ObjectEmergencyCall *ifs = nullptr; - for(auto _ifs : qAsConst(m_emergencyObjMap)) + for(auto _ifs : std::as_const(m_emergencyObjMap)) { auto data = _ifs->getData(); if (data.issi == request.issi @@ -182,7 +183,7 @@ bool HandlerEmergencyCall::isExerciseValidForEmergencyCall() const bool HandlerEmergencyCall::isNewEmergencyCall(const AlmEmergencyCall &newdata) { - for(const auto &ifs : qAsConst(m_emergencyObjMap)) + for(const auto &ifs : std::as_const(m_emergencyObjMap)) { const auto &data = ifs->getData(); if (data.issi == newdata.issi diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp index d61cbfec7..9c1f5d473 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp @@ -7,6 +7,7 @@ */ #include "abstract_firing_strategy.h" +#include #include "object_effector.h" #include "main_handler.h" @@ -97,7 +98,7 @@ std::vector AbstractFiringStrategy::buildTrajecto geometry.reserve(relativeTrajectory.size()); // Aehnlich wie Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp Zeile 365 - for (const TrajectoryPoint &trajPntRelPos : qAsConst(relativeTrajectory)) + for (const TrajectoryPoint &trajPntRelPos : std::as_const(relativeTrajectory)) { DEBUG_LOG(m_logger) << "Flugbahnpunkt: trajPntRelPos :" << trajPntRelPos; // benefit from operator<<: @@ -197,7 +198,7 @@ int32_t AbstractFiringStrategy::gearTypeId(int chargeTypeId, int participantId) DEBUG_LOG(m_logger) << "gearSize " << dynamicParticipantData.gear.size(); const auto& participantData_gear = dynamicParticipantData.gear; - for (const auto &gear : qAsConst(participantData_gear)) + for (const auto &gear : std::as_const(participantData_gear)) { DEBUG_LOG(m_logger) << "gear.chargeTypeId(): " << gear.chargeTypeId << ", chargeTypeId:" << chargeTypeId; if (gear.chargeTypeId == chargeTypeId) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/dm72_firing_strategy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/dm72_firing_strategy.cpp index b874ba338..09971ab60 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/dm72_firing_strategy.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/dm72_firing_strategy.cpp @@ -7,6 +7,7 @@ */ #include "dm72_firing_strategy.h" +#include #include "main_handler.h" #include "object_effector.h" @@ -94,7 +95,7 @@ void Dm72FiringStrategy::init() QVector tempUtmTreffpunkte; tempUtmTreffpunkte.reserve(wirkmittel.geschoss.anzahl); - for (const Treffpunkt &treffpunkt : qAsConst(wirkmittel.treffpunkte)) + for (const Treffpunkt &treffpunkt : std::as_const(wirkmittel.treffpunkte)) { const UtmCoordinate utmTreffpunkt = UtmCoordinate::fromGeographic(treffpunkt.koordinate.koordinate.longitude * deg2rad(), treffpunkt.koordinate.koordinate.latitude * deg2rad(), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.cpp index 44de830de..7a9cac5f9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.cpp @@ -7,6 +7,7 @@ */ #include "gmlrs_firing_strategy.h" +#include #include "object_effector.h" #include @@ -74,7 +75,7 @@ void GmlrsFiringStrategy::init() WirkmittelFeuerkommandoRakete wirkmittel; wirkmittelFeuerkommandoRaketeFromJson(properties, wirkmittel, bOk); - for (const Treffpunkt &treffpunkt : qAsConst(wirkmittel.treffpunkte)) + for (const Treffpunkt &treffpunkt : std::as_const(wirkmittel.treffpunkte)) { const LtsCoordTrans::UtmCoordinate utmTreffpunkt = LtsCoordTrans::UtmCoordinate::fromGeographic(treffpunkt.koordinate.koordinate.longitude * LtsCoordTrans::deg2rad(), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp index 45fadbdcb..1f7af4c7f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp @@ -7,6 +7,7 @@ */ #include "effect_cluster_module_test.h" +#include #include #include @@ -933,7 +934,7 @@ int main(int argc, char *argv[]) --argc; const QStringList &slPositionalArgs = options.positionalArguments(); - for (const QString &item : qAsConst(slPositionalArgs)) + for (const QString &item : std::as_const(slPositionalArgs)) std::cout << " item = " << item << std::endl; ModuleTestEffectCluster tc(options.domainId(), options.exerciseId()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp index 79b5e2823..e16f66fbe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp @@ -7,6 +7,7 @@ */ #include "explosion_cluster_module_test.h" +#include #include #include @@ -265,7 +266,7 @@ void ModuleTestExplosionCluster::dumpCnt() void ModuleTestExplosionCluster::dumpBldgStates() { NOTICE_LOG(m_logger) << " m_buildingStateVec.size() = " << m_buildingStateVec.size(); - for (const Buildings::BuildingState &bldgState : qAsConst(m_buildingStateVec)) + for (const Buildings::BuildingState &bldgState : std::as_const(m_buildingStateVec)) NOTICE_LOG(m_logger) << " bldgState: " << ", id = " << bldgState.id << ", damagePercent = " << bldgState.damagePercent @@ -336,7 +337,7 @@ bool ModuleTestExplosionCluster::checkBldgStates(const QVector &damagePerce QVector damagePercentIst; damagePercentIst.reserve(m_buildingStateVec.size()); - for (const Buildings::BuildingState &bldgState : qAsConst(m_buildingStateVec)) + for (const Buildings::BuildingState &bldgState : std::as_const(m_buildingStateVec)) damagePercentIst.append(bldgState.damagePercent); bool same = damagePercentIst == damagePercent; @@ -935,7 +936,7 @@ void ModuleTestExplosionCluster::resetBldgs() std::vector buildingsVec; buildingsVec.reserve(m_bldgIdToName.size()); auto bldgIds = m_bldgIdToName.keys(); - for (int bldgId : qAsConst(bldgIds)) + for (int bldgId : std::as_const(bldgIds)) buildingsVec.push_back( Buildings::Building(bldgId, {}) ); Buildings::SetBuildingStatesRequest requestData; @@ -951,7 +952,7 @@ void ModuleTestExplosionCluster::resetBldgs() QTest::qWait(100); // check states: - for (int bldgId : qAsConst(bldgIds)) + for (int bldgId : std::as_const(bldgIds)) { const ProjectDataManagement::VulnerabilityState& bldgState = m_bldDtc->buildingState(bldgId).vulnerabilityState; INFO_LOG(m_logger) << "resetBldgs: bldgId " << bldgId @@ -1292,7 +1293,7 @@ void ModuleTestExplosionCluster::test_TneVerificationBremen_01() << ", m_data.mhPoints().size()=" << m_data.mhPoints.size(); const std::vector &formRef = itemView.form; - for (const Core::GeoPosition &geoCoord : qAsConst(formRef)) + for (const Core::GeoPosition &geoCoord : std::as_const(formRef)) { const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoCoord.lon, geoCoord.lat); INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:" << " utm: " << utm.mgrs() << ", item=" << geoCoord; @@ -1391,7 +1392,7 @@ void ModuleTestExplosionCluster::test_TneVerificationBremen_02() << ", m_data.mhPoints().size()=" << m_data.mhPoints.size(); const std::vector &formRef = itemView.form; - for (const Core::GeoPosition &geoCoord : qAsConst(formRef)) + for (const Core::GeoPosition &geoCoord : std::as_const(formRef)) { const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoCoord.lon, geoCoord.lat); INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:" << " utm: " << utm.mgrs() << ", item=" << geoCoord; @@ -2364,7 +2365,7 @@ void ModuleTestExplosionCluster::test_bldg_1104_effects_only() QVERIFY2(m_counterDds.cntTrajectory == 0, "ERROR, cnt failed!!"); // 4 impacts -> 4 trajectory std::vector&singleEffects = m_effects.singleEffects; - for (const AreaEffectSimulation::SingleEffect &se : qAsConst(singleEffects)) + for (const AreaEffectSimulation::SingleEffect &se : std::as_const(singleEffects)) { // Since there is no trajectory, no intersection is calculated. // Therefore the impacts are on the ground. @@ -2741,7 +2742,7 @@ int main(int argc, char *argv[]) --argc; const QStringList &slPositionalArgs = options.positionalArguments(); - for (const QString &item : qAsConst(slPositionalArgs)) + for (const QString &item : std::as_const(slPositionalArgs)) std::cout << " item = " << item << std::endl; // enable_create_bulk only if it´s explicitly called by user: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp index 0af83fd52..aa115759f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp @@ -7,6 +7,7 @@ */ #include "limits_module_test.h" +#include #include "qtestcase.h" #include #include @@ -71,7 +72,7 @@ void ModuleTestLimits::testExplosionClusterCentral() int counter = 0; const auto &items = m_aesDtc->explosionClusters(); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) { if (item.effectStateId == AesEffectState::EsPrepared && item.isCentral == true) ++counter; @@ -104,7 +105,7 @@ void ModuleTestLimits::testExplosionClusterDecentral() int counter = 0; const auto &items = m_aesDtc->explosionClusters(); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) { if ((item.effectStateId == AesEffectState::EsPrepared) && (item.isCentral == false)) ++counter; @@ -140,7 +141,7 @@ void ModuleTestLimits::testAirSupports() int counter = 0; const auto &items = m_aesDtc->explosionClusters(); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) { if (item.effectStateId == AesEffectState::EsPrepared && item.isCentral && m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct.chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport) ++counter; @@ -173,7 +174,7 @@ void ModuleTestLimits::testMineAreaCentral() int counter = 0; const auto &items = m_aesDtc->mineAreas(); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) { if ((item.effectStateId == AesEffectState::EsPrepared) && (item.isCentral == true)) ++counter; @@ -207,7 +208,7 @@ void ModuleTestLimits::testMineAreaDecentral() int counter = 0; const auto &items = m_aesDtc->mineAreas(); - for (const auto &curMineArea : qAsConst(items)) + for (const auto &curMineArea : std::as_const(items)) { if ((curMineArea.effectStateId == AesEffectState::EsPrepared) && (curMineArea.isCentral == false)) ++counter; @@ -234,7 +235,7 @@ void ModuleTestLimits::testMineAreaDecentral() int counter2 = 0; const auto &mineAreas = m_aesDtc->mineAreas(); - for (const auto &item : qAsConst(mineAreas)) + for (const auto &item : std::as_const(mineAreas)) { if ((item.effectStateId == AesEffectState::EsPrepared) && !item.isCentral && @@ -270,7 +271,7 @@ void ModuleTestLimits::testNBCCentral() int counter = 0; const auto &items = m_aesDtc->nContaminations(); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) { if (item.effectStateId == AesEffectState::EsPrepared && item.isCentral == true) ++counter; @@ -305,7 +306,7 @@ void ModuleTestLimits::testNBCDecentral() int counter = 0; const auto &items = m_aesDtc->nContaminations(); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) { if (item.effectStateId == AesEffectState::EsPrepared && item.isCentral == false) ++counter; @@ -337,7 +338,7 @@ void ModuleTestLimits::testOffRouteMines() int counter = 0; const auto &items = m_aesDtc->offRouteMines(); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) { if (item.effectStateId == AesEffectState::EsPrepared && item.isCentral == true) ++counter; @@ -369,7 +370,7 @@ void ModuleTestLimits::testBoobyTraps() int counter = 0; const auto &items = m_aesDtc->boobyTraps(); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) { if (item.effectStateId == AesEffectState::EsPrepared && item.isCentral == true) ++counter; @@ -404,7 +405,7 @@ void ModuleTestLimits::testBCCCentral() int counter = 0; const auto &items = m_aesDtc->bCContaminations(); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) { if (item.effectStateId == AesEffectState::EsPrepared && item.isCentral == true) ++counter; @@ -439,7 +440,7 @@ void ModuleTestLimits::testBCCDecentral() int counter = 0; const auto &items = m_aesDtc->bCContaminations(); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) { if (item.effectStateId == AesEffectState::EsPrepared && item.isCentral == false) ++counter; @@ -474,7 +475,7 @@ void ModuleTestLimits::testFADecentral() int counter = 0; const auto &items = m_aesDtc->functionalAreas(); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) { if (item.effectStateId == AesEffectState::EsPrepared && item.isCentral == false) ++counter; @@ -511,7 +512,7 @@ void ModuleTestLimits::testFACentral() int counter = 0; const auto &items = m_aesDtc->functionalAreas(); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) { if (item.effectStateId == AesEffectState::EsPrepared && item.isCentral == true) ++counter; @@ -1192,7 +1193,7 @@ void ModuleTestLimits::deleteAesAreas() const QVector sts = {AesEffectState::EsExpired, AesEffectState::EsRemoved, AesEffectState::EsActivated}; auto clusters = m_aesDtc->explosionClusters(); - for (auto cluster : qAsConst(clusters)) + for (auto cluster : std::as_const(clusters)) { if (!sts.contains(cluster.effectStateId)) { @@ -1202,7 +1203,7 @@ void ModuleTestLimits::deleteAesAreas() } } auto nbcs = m_aesDtc->nContaminations(); - for (auto nbc : qAsConst(nbcs)) + for (auto nbc : std::as_const(nbcs)) { if (!sts.contains(nbc.effectStateId)) { @@ -1212,7 +1213,7 @@ void ModuleTestLimits::deleteAesAreas() } } auto orms = m_aesDtc->offRouteMines(); - for (auto orm : qAsConst(orms)) + for (auto orm : std::as_const(orms)) { if (!sts.contains(orm.effectStateId)) { @@ -1222,7 +1223,7 @@ void ModuleTestLimits::deleteAesAreas() } } auto bts = m_aesDtc->boobyTraps(); - for (auto bt : qAsConst(bts)) + for (auto bt : std::as_const(bts)) { if (!sts.contains(bt.effectStateId)) { @@ -1232,7 +1233,7 @@ void ModuleTestLimits::deleteAesAreas() } } auto mas = m_aesDtc->mineAreas(); - for (auto ma : qAsConst(mas)) + for (auto ma : std::as_const(mas)) { if (!sts.contains(ma.effectStateId)) { @@ -1242,7 +1243,7 @@ void ModuleTestLimits::deleteAesAreas() } } auto bccs = m_aesDtc->bCContaminations(); - for (auto bcc : qAsConst(bccs)) + for (auto bcc : std::as_const(bccs)) { if (!sts.contains(bcc.effectStateId)) { @@ -1252,7 +1253,7 @@ void ModuleTestLimits::deleteAesAreas() } } auto fas = m_aesDtc->functionalAreas(); - for (auto fa : qAsConst(fas)) + for (auto fa : std::as_const(fas)) { if (!sts.contains(fa.effectStateId)) { @@ -1262,7 +1263,7 @@ void ModuleTestLimits::deleteAesAreas() } } auto tas = m_aesDtc->technicalAreas(); - for (auto ta : qAsConst(tas)) + for (auto ta : std::as_const(tas)) { if (!sts.contains(ta.effectStateId)) { @@ -1273,7 +1274,7 @@ void ModuleTestLimits::deleteAesAreas() } auto eas = m_aesDtc->explosionAreas(); - for (auto ea : qAsConst(eas)) + for (auto ea : std::as_const(eas)) { if (!sts.contains(ea.effectStateId)) { @@ -1284,7 +1285,7 @@ void ModuleTestLimits::deleteAesAreas() } auto ess = m_aesDtc->explosionSingles(); - for (auto es : qAsConst(ess)) + for (auto es : std::as_const(ess)) { if (!sts.contains(es.effectStateId)) { @@ -1360,7 +1361,7 @@ int main(int argc, char *argv[]) const QStringList &slPositionalArgs = options.positionalArguments(); - for (const QString &item : qAsConst(slPositionalArgs)) + for (const QString &item : std::as_const(slPositionalArgs)) std::cout << " item = " << item << std::endl; // enable_create_bulk only if it´s explicitly called by user: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp index 2407b65fa..43a9e9b69 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp @@ -7,6 +7,7 @@ */ #include "aes_others_module_test.h" +#include #include #include @@ -812,7 +813,7 @@ int main(int argc, char *argv[]) --argc; const QStringList &slPositionalArgs = options.positionalArguments(); - for (const QString &item : qAsConst(slPositionalArgs)) + for (const QString &item : std::as_const(slPositionalArgs)) std::cout << " item = " << item << std::endl; // // enable_create_bulk only if it´s explicitly called by user: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp index f83968ee0..3a85a8368 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp @@ -7,6 +7,7 @@ */ #include "trajectory_unit_test.h" +#include #include #include #include @@ -991,7 +992,7 @@ void UnitTestTrajectory::test_vulcano_trajectory() } int i=0; - for (auto &item : qAsConst(trajectoryOut)) + for (auto &item : std::as_const(trajectoryOut)) INFO_LOG(m_logger) << "i = " << i++ << ", item " << item; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.cpp index f6c36c8f1..519411b88 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.cpp @@ -8,6 +8,7 @@ */ #include "trajectory_generator.h" +#include #include "trajectory_generator_vulcano.h" #include #include @@ -199,7 +200,7 @@ bool TrajectoryGenerator::generateTrajectoryVulcano(const QPoint3D &originatorPo { QPoint4D startPoint = trajectoryMetricOut.first(); - for (const QPoint4D &p4D : qAsConst(trajectoryMetricOut)) + for (const QPoint4D &p4D : std::as_const(trajectoryMetricOut)) { output << p4D.x() - startPoint.x() << ";" << p4D.y() - startPoint.y() << ";" @@ -231,7 +232,7 @@ bool TrajectoryGenerator::generateTrajectoryVulcano(const QPoint3D &originatorPo trajectoryTimeAwareOut.clear(); trajectoryTimeAwareOut.reserve(trajectoryMetricOut.size()); - for (const QPoint4D& pnt4d : qAsConst(trajectoryMetricOut)) + for (const QPoint4D& pnt4d : std::as_const(trajectoryMetricOut)) { LtsCoordTrans::UtmCoordinate pntUtm(idealHitUtm.zone, pnt4d.x(), pnt4d.y()); const QPointF &pntGeo = pntUtm.geographic(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.cpp index 3c6fe62a8..17022a657 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.cpp @@ -8,6 +8,7 @@ */ #include "trajectory_generator_vulcano.h" +#include #include #include @@ -171,7 +172,7 @@ bool TrajectoryGeneratorVulcano::trajectoryVulcano(const QPoint3D &origin, const trajectoryOut.reserve(phase1_bal.size()+5); int cnt = 0; - for (const QPointF &xyVertex : qAsConst(phase1_bal)) + for (const QPointF &xyVertex : std::as_const(phase1_bal)) { // translate from XY to XYZ const QPoint3D p3d_offset(xyVertex.x() * factorX, // xyVertex.x() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.h index 8509b5b28..e40d50735 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.h @@ -49,7 +49,9 @@ private: qint64 m_finishedTime; }; -static bool withinTolerance(qint64 measured, qint64 expected, qint64 tolerance) { +// defined but only used by aes_test_fire_automaton.cpp; AUTOMOC pulls the header +// into a separate TU that never calls it, so mark it to suppress -Wunused-function +[[maybe_unused]] static bool withinTolerance(qint64 measured, qint64 expected, qint64 tolerance) { return qAbs(measured-expected) <= tolerance; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Basics/basics_unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Basics/basics_unit_test.cpp index 69afe6c8a..48a75615c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Basics/basics_unit_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Basics/basics_unit_test.cpp @@ -7,6 +7,7 @@ */ #include "basics_unit_test.h" +#include #include #include @@ -183,6 +184,7 @@ struct has_memberDouble { template < typename T, typename std::enable_if < has_memberDouble::value, int >::type = 0 > void getFilterType(const T &obj) { + Q_UNUSED(obj); qCritical() << " HasRequestId"; // sendErrorInternal(request.errorSlot, reason, request.uniqueId, request.sample.data().requestId()); } @@ -191,6 +193,7 @@ void getFilterType(const T &obj) template < typename T, typename std::enable_if < !has_memberDouble::value, int >::type = 0 > void getFilterType(const T &obj) { + Q_UNUSED(obj); qCritical() << " ! HasRequestId"; // sendErrorInternal(request.errorSlot, reason, request.uniqueId, -1); } @@ -246,7 +249,7 @@ void UnitTestBasics::test_fireTimer10() QStringList logSl1 = ft.getLogHistorie(); QVERIFY2(logSl1.size() == 1, "getCommandHistorie failed"); - for (const auto &log : qAsConst(logSl1)) + for (const auto &log : std::as_const(logSl1)) NOTICE_LOG(m_logger) << "log ='" << log << "'"; } @@ -319,7 +322,7 @@ void UnitTestBasics::test_fireTimer20() // QList arguments = spyStateChanged.takeFirst(); // take the first signal // NOTICE_LOG(m_logger) << " spyStateChanged.count() " << spyStateChanged.count(); - // for (const QList &argument : qAsConst(spyStateChanged)) + // for (const QList &argument : std::as_const(spyStateChanged)) // NOTICE_LOG(m_logger) << " spyStateChanged . argument " << argument.first().toInt(); // check order of signal paramter: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Polygons/polygons_unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Polygons/polygons_unit_test.cpp index cfd1194b8..29b53eb80 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Polygons/polygons_unit_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Polygons/polygons_unit_test.cpp @@ -7,6 +7,7 @@ */ #include "polygons_unit_test.h" +#include #include #include @@ -210,7 +211,7 @@ void UnitTestPolygons::test_explosionClusterSingleExplosionsGAUSS_Mtp() qCritical() << "rotation_deg = " << rotation_deg << ", mtpRotationNorthDegree = " << mtpRotationNorthDegree << ", explosionClusterDb = " << singleExplosions; - for (const auto &singleExplosion : qAsConst(singleExplosions)) + for (const auto &singleExplosion : std::as_const(singleExplosions)) qDebug() << "singleExUtm: " << LtsCoordTrans::UtmCoordinate::fromGeographic(singleExplosion).mgrs(); size_t i = 0; @@ -242,7 +243,7 @@ void UnitTestPolygons::test_explosionClusterSingleExplosionsGAUSS_Mtp() qCritical() << "rotation_deg = " << rotation_deg << ", mtpRotationNorthDegree = " << mtpRotationNorthDegree << " explosionClusterDb = " << singleExplosions; - for (const auto &singleExplosion : qAsConst(singleExplosions)) + for (const auto &singleExplosion : std::as_const(singleExplosions)) qCritical() << "singleExUtm: " << LtsCoordTrans::UtmCoordinate::fromGeographic(singleExplosion).mgrs(); size_t i = 0; @@ -279,7 +280,7 @@ void UnitTestPolygons::test_explosionClusterSingleExplosionsGAUSS_Mtp() << ", zog = " << zog << ", mtpRotationNorthDegree = " << mtpRotationNorthDegree << " explosionClusterDb = " << singleExplosions; - for (const auto &singleExplosion : qAsConst(singleExplosions)) + for (const auto &singleExplosion : std::as_const(singleExplosions)) qCritical() << "singleExUtm: " << LtsCoordTrans::UtmCoordinate::fromGeographic(singleExplosion).mgrs(); size_t i = 0; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/icons.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/icons.cpp index 2644dfb23..2211cb94b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/icons.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/icons.cpp @@ -6,6 +6,7 @@ */ #include "icons.h" +#include #include "polygons.h" #include @@ -54,7 +55,7 @@ static QPixmap pixmapFromPolygons(const QVector &datas, for (const PolygonData &data : datas) { polyUtm.clear(); - for (const QPointF &point : qAsConst(data.poly)) + for (const QPointF &point : std::as_const(data.poly)) { LtsCoordTrans::UtmCoordinate pointUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(point, zone); polyUtm << QPointF(pointUtm.x, pointUtm.y); @@ -66,7 +67,7 @@ static QPixmap pixmapFromPolygons(const QVector &datas, bounding.reserve(4 * datas.size()); // Does not matter, how the total polygon looks as we just need the bounding rect. // << is cheaper than .united() - for (const QPolygonF &polyUtmLocal : qAsConst(polysUtm)) + for (const QPolygonF &polyUtmLocal : std::as_const(polysUtm)) bounding << polyUtmLocal; // center to center / Todo:: Does it always work? @@ -89,7 +90,7 @@ static QPixmap pixmapFromPolygons(const QVector &datas, QPainter p(&pix); int i = 0; - for (const PolygonData &d : qAsConst(datas)) + for (const PolygonData &d : std::as_const(datas)) { QPolygonF mPoly = mTrans.map(polysUtm.at(i++)); mPoly = mScale.map(mPoly); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.cpp index 5e313d6c9..9e5753209 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.cpp @@ -6,6 +6,7 @@ */ #include "polygons.h" +#include #include "tne_algorithmen.h" #include @@ -107,7 +108,7 @@ static QPolygonF utmToGeogrphic(const QPolygonF &polyUtm, const LtsCoordTrans::U { QPolygonF poly; poly.reserve(polyUtm.size()); - for (const QPointF &point : qAsConst(polyUtm)) + for (const QPointF &point : std::as_const(polyUtm)) poly << base.geographic(point); return poly; } @@ -124,18 +125,6 @@ static const QString string4poly(const QPolygonF &poly) return QStringLiteral("%1 Values (%2)").arg(poly.count()).arg(pointString.join(QStringLiteral(" --- "))); } -static const QString string4poly(const QPair> &pair) -{ - if (pair.first.isEmpty()) - return (QStringLiteral("Empty Polygon!")); - int zone = LtsCoordTrans::UtmCoordinate::fromGeographic(pair.first[0]).zone; - QStringList pointString; - pointString.reserve(pair.first.size()); - for (int i = 0; i < pair.first.size(); ++i) - pointString << LtsCoordTrans::UtmCoordinate::fromGeographic(pair.first[i], zone).mgrs() << QStringLiteral(" ") << QString::number(pair.second[i], 'f', 1); - return QStringLiteral("%1 Values (%2)").arg(pair.first.count()).arg(pointString.join(QStringLiteral(" --- "))); -} - QPolygonF circle(const QPointF ¢er, qreal radius, int steps) { const LtsCoordTrans::UtmCoordinate ¢erUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(center); @@ -471,7 +460,7 @@ QVector effectClusterSingleExplosionsGAUSS(const Database::AesEffectClu vec.reserve(impactCount); const QTransform trans(fromRotation(-effectCluster.rotationAngle)); // Compass, not mathematical! - for (const QPointF &point : qAsConst(impactsGAUSS)) + for (const QPointF &point : std::as_const(impactsGAUSS)) { QPointF p = impactPositionUtm.geographic(trans.map(point)); DEBUG_LOG(logger) << "Point = " << p; @@ -547,7 +536,7 @@ QVector effectClusterSingleExplosionsGAUSS_Mtp(const Database::AesEffec QVector mtps_asRealUtm; mtps_asRealUtm.reserve(mtps_asUtm.size()); - for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm)) + for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm)) { // convert QPointF back to UtmCoordinate: pay attention to order!!! const LtsCoordTrans::UtmCoordinate mtpUtm(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y()); @@ -586,7 +575,7 @@ QVector effectClusterSingleExplosionsGAUSS_Mtp(const Database::AesEffec int idx = 0; const QTransform transform(fromRotation(-mtpRotationNorthDegree)); // Compass, not mathematical! - for (const QPointF &point : qAsConst(impactsGAUSS)) + for (const QPointF &point : std::as_const(impactsGAUSS)) { // which mtp: int mtpIdx = (idx++ % mtps_asUtm.size()); // modulo @@ -601,7 +590,7 @@ QVector effectClusterSingleExplosionsGAUSS_Mtp(const Database::AesEffec << ", randomNumber=" << randomNumber << " singleWidthOut=" << singleWidthOut << " singleHeightOut=" << singleHeightOut << " rot=" << explosionCluster.rotationAngle; - for (auto item : qAsConst(finalVec)) + for (auto item : std::as_const(finalVec)) { const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(item); qCritical() << " TNE VERIFICATION: CHECK:" @@ -895,7 +884,7 @@ QVector explosionClusterSingleExplosionsGAUSS(const Database::AesExplos vec.reserve(impactCount); const QTransform trans(fromRotation(-explosionCluster.rotationAngle)); // Compass, not mathematical! - for (const QPointF &point : qAsConst(impactsGAUSS)) + for (const QPointF &point : std::as_const(impactsGAUSS)) { QPointF p = impactPositionUtm.geographic(trans.map(point)); DEBUG_LOG(logger) << "Point = " << p; @@ -972,7 +961,7 @@ QVector explosionClusterSingleExplosionsGAUSS_Mtp(const Database::AesEx QVector mtps_asRealUtm; mtps_asRealUtm.reserve(mtps_asUtm.size()); - for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm)) + for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm)) { // convert QPointF back to UtmCoordinate: pay attention to order!!! const LtsCoordTrans::UtmCoordinate mtpUtm(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y()); @@ -1011,7 +1000,7 @@ QVector explosionClusterSingleExplosionsGAUSS_Mtp(const Database::AesEx int idx = 0; const QTransform transform(fromRotation(-mtpRotationNorthDegree)); // Compass, not mathematical! - for (const QPointF &point : qAsConst(impactsGAUSS)) + for (const QPointF &point : std::as_const(impactsGAUSS)) { // which mtp: int mtpIdx = (idx++ % mtps_asUtm.size()); // modulo @@ -1026,7 +1015,7 @@ QVector explosionClusterSingleExplosionsGAUSS_Mtp(const Database::AesEx << ", randomNumber=" << randomNumber << " singleWidthOut=" << singleWidthOut << " singleHeightOut=" << singleHeightOut << " rot=" << explosionCluster.rotationAngle; - for (auto item : qAsConst(finalVec)) + for (auto item : std::as_const(finalVec)) { const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(item); qCritical() << " TNE VERIFICATION: CHECK:" @@ -1673,7 +1662,7 @@ LtsUtils::QPoint3D calculateFiringUnitCenterNonRecursive(const std::shared_ptr

participantPosition(childId); if (childPos.participantId != childId) @@ -1726,7 +1715,7 @@ std::vector dangerAreaDefaultSegments(const QPointF ¢er // polyUtm = QTransform().rotate(0).map(polyUtm); LtsCoordTrans::UtmCoordinate impactPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(centerPos); const QPolygonF poly(utmToGeogrphic(polyUtm, impactPositionUtm)); - for (const auto &p : qAsConst(poly)) + for (const auto &p : std::as_const(poly)) segments.push_back(Core::GeoPosition2D(p.x(), p.y())); return segments; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.cpp index 8f517f177..095f9fe21 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.cpp @@ -6,6 +6,7 @@ */ #include "handler_explosion_single_central.h" +#include #include "main_handler.h" #include @@ -35,7 +36,7 @@ bool HandlerExplosionSingleCentral::init() return true; } // create indirect fire single objects - for (const Database::AesExplosionSingleCentral &dbData : qAsConst(dataVec)) + for (const Database::AesExplosionSingleCentral &dbData : std::as_const(dataVec)) { ObjectExplosionSingleCentral *ifs(new ObjectExplosionSingleCentral(m_mainHandler, this)); connect(ifs, &ObjectExplosionSingleCentral::effectStateChanged, this, &HandlerExplosionSingleCentral::onEffectStateChanged); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_dtc_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_dtc_impl_custom.cpp index 652763bf6..9d56d6baa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_dtc_impl_custom.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_dtc_impl_custom.cpp @@ -6,6 +6,7 @@ * $Author$ */ #include "aes_dtc_impl_custom.h" +#include #include #include #include @@ -120,7 +121,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e QMap bcConts = bCContaminations(); aesItemId = 0; - for (const AreaEffectSimulation::BCContamination &bcCont : qAsConst(bcConts)) + for (const AreaEffectSimulation::BCContamination &bcCont : std::as_const(bcConts)) { if (bcCont.externalId == externalId) { @@ -132,7 +133,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e return AreaEffectSimulation::AesType::AtBCContamination; QMap nConts = nContaminations(); - for (const AreaEffectSimulation::NContamination &nCont: qAsConst(nConts)) + for (const AreaEffectSimulation::NContamination &nCont: std::as_const(nConts)) { if (nCont.externalId == externalId) { @@ -144,7 +145,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e return AreaEffectSimulation::AesType::AtNContamination; QMap explAreas = explosionAreas(); - for (const AreaEffectSimulation::ExplosionArea &explArea : qAsConst(explAreas)) + for (const AreaEffectSimulation::ExplosionArea &explArea : std::as_const(explAreas)) { if (explArea.externalId == externalId) { @@ -156,7 +157,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e return AreaEffectSimulation::AesType::AtExplosionArea; QMap explSingles = explosionSingles(); - for (const AreaEffectSimulation::ExplosionSingle &explSingle : qAsConst(explSingles)) + for (const AreaEffectSimulation::ExplosionSingle &explSingle : std::as_const(explSingles)) { if (explSingle.externalId == externalId) { @@ -168,7 +169,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e return AreaEffectSimulation::AesType::AtExplosionSingle; QMap mAreas = mineAreas(); - for(const AreaEffectSimulation::MineArea &mArea : qAsConst(mAreas)) + for(const AreaEffectSimulation::MineArea &mArea : std::as_const(mAreas)) { if (mArea.externalId == externalId) { @@ -180,7 +181,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e return AreaEffectSimulation::AesType::AtMineArea; QMap mCorridors = mineCorridors(); - for (const AreaEffectSimulation::MineCorridor &mCorridor : qAsConst(mCorridors)) + for (const AreaEffectSimulation::MineCorridor &mCorridor : std::as_const(mCorridors)) { if (mCorridor.externalId == externalId) { @@ -352,7 +353,7 @@ QVector DtcImplCustom::trajectoriesTimeAwareFromOriginatorI const QMap &trajectoryTimeAwareMap = trajectoryTimeAwares(); - for (const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware : qAsConst(trajectoryTimeAwareMap)) + for (const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware : std::as_const(trajectoryTimeAwareMap)) { // be aware of: [E01562-259] use originatorId, originatorTypeId (instead of aesItemId, aesTypeId) if ((trajectoryTimeAware.originatorId == originatorId) && @@ -401,7 +402,7 @@ void DtcImplCustom::initDAO() // // We don´t realy know, how many to reserve: // trajectoriesFromAesIdVec.reserve(120); // 2024-09 N.Thoden: 120 ist maximum per area -// for (const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware : qAsConst(trajectoryTimeAwareMap)) +// for (const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware : std::as_const(trajectoryTimeAwareMap)) // { // if (trajectoryTimeAware.aesItemId() == aesId) // trajectoriesFromAesIdVec.push_back(trajectoryTimeAware); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_air_support_impact.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_air_support_impact.cpp index 979f8dc54..db3c25efe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_air_support_impact.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_air_support_impact.cpp @@ -6,6 +6,7 @@ */ #include "handler_air_support_impact.h" +#include #include "main_handler.h" namespace AreaEffectSimulation @@ -28,7 +29,7 @@ bool HandlerAirSupportImpact::init() } // create air support impact objects - for (const Database::AesAirSupportImpact &dbData : qAsConst(dataVec)) + for (const Database::AesAirSupportImpact &dbData : std::as_const(dataVec)) { ObjectAirSupportImpact *ifs(new ObjectAirSupportImpact(m_mainHandler, this)); connect(ifs, &ObjectAirSupportImpact::effectStateChanged, this, &HandlerAirSupportImpact::onEffectStateChanged); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h index 8f68f9f7c..823500b4f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h @@ -8,6 +8,7 @@ #pragma once #include "main_handler.h" +#include #include "logger.h" #include @@ -132,7 +133,7 @@ public: { m_areaCount = 0; m_areaCountCentral = 0; - for (const Obj *area : qAsConst(m_objectMap)) + for (const Obj *area : std::as_const(m_objectMap)) { if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_borderline.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_borderline.cpp index b64b20bba..b3688f482 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_borderline.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_borderline.cpp @@ -7,6 +7,7 @@ */ #include "handler_borderline.h" +#include #include "object_borderline.h" @@ -47,13 +48,13 @@ bool HandlerBorderline::init() // contains all segments of an borderline in ascending order QVector dbBorderlineSegments; - for (const Database::AesBorderline &dbBorderline : qAsConst(borderlineVec)) + for (const Database::AesBorderline &dbBorderline : std::as_const(borderlineVec)) { if (dbBorderline.effectStateId == AesEffectState::EsRemoved) continue; dbBorderlineSegments.clear(); - for (const Database::AesBorderlineSegment &segment : qAsConst(segmentVec)) + for (const Database::AesBorderlineSegment &segment : std::as_const(segmentVec)) { if (segment.borderlineId == dbBorderline.privBorderlineId) dbBorderlineSegments.insert(segment.positionIndex, segment); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_administration.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_administration.cpp index 522852a09..0f8b79a5d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_administration.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_administration.cpp @@ -7,6 +7,7 @@ */ #include "handler_charge_administration.h" +#include #include "object_charge_administration.h" namespace AreaEffectSimulation @@ -52,7 +53,7 @@ bool HandlerChargeAdministration::init() int HandlerChargeAdministration::getObjectChargeAdministrationId(int partyId, int chargeTypeId, ProjectDataManagement::EffectSource effectSourceId) { - for (ObjectChargeAdministration *val : qAsConst(m_chargeAdminObjMap)) + for (ObjectChargeAdministration *val : std::as_const(m_chargeAdminObjMap)) { if (val->data().partyId == partyId && val->data().chargeTypeId == chargeTypeId && val->data().effectSourceId == effectSourceId) return val->id(); @@ -117,7 +118,7 @@ Core::FunctionReplyObject HandlerChargeAdministration::chargeAdministrationModif Core::FunctionReplyObject HandlerChargeAdministration::claimPlannedCharge(int chargeTypeId, int partyId, int count) { - for (ObjectChargeAdministration *val : qAsConst(m_chargeAdminObjMap)) + for (ObjectChargeAdministration *val : std::as_const(m_chargeAdminObjMap)) { if (val->data().partyId == partyId && val->data().chargeTypeId == chargeTypeId) return val->claimPlannedCharge(count); @@ -142,7 +143,7 @@ Core::FunctionReplyObject HandlerChargeAdministration::consumeCharge(int chargeT DEBUG_LOG(m_logger) << "effectSource: " << effectSource; - for (ObjectChargeAdministration *val : qAsConst(m_chargeAdminObjMap)) + for (ObjectChargeAdministration *val : std::as_const(m_chargeAdminObjMap)) { if (val->data().partyId == partyId && val->data().chargeTypeId == chargeTypeId && val->data().effectSourceId == effectSource) { @@ -157,7 +158,7 @@ Core::FunctionReplyObject HandlerChargeAdministration::consumeCharge(int chargeT int HandlerChargeAdministration::availableCharge(int chargeTypeId, int partyId) const { - for (ObjectChargeAdministration *val : qAsConst(m_chargeAdminObjMap)) + for (ObjectChargeAdministration *val : std::as_const(m_chargeAdminObjMap)) { if (val->data().partyId == partyId && val->data().chargeTypeId == chargeTypeId) return val->availableCharge(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.cpp index 04332f731..24fe39254 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.cpp @@ -1,4 +1,5 @@ #include "handler_charge_effect.h" +#include #include "handler_charge_administration.h" #include "handler_effect_cluster.h" @@ -52,7 +53,7 @@ bool HandlerChargeEffect::init() ObjectChargeEffect::s_afterglowMsecs = Settings::getChargeEffectAfterGlow(); - for (const Database::AesChargeEffect ¤tChargeEffectData : qAsConst(chargeEffectDbData)) + for (const Database::AesChargeEffect ¤tChargeEffectData : std::as_const(chargeEffectDbData)) { ObjectChargeEffect *newChargeEffect = new ObjectChargeEffect(currentChargeEffectData, m_mainHandler, this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp index ced4a5271..408b0d0dd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp @@ -7,6 +7,7 @@ */ #include "handler_danger_area.h" +#include #include "object_danger_area.h" #include @@ -42,11 +43,11 @@ bool HandlerDangerArea::init() // create area mine objects QVector mySegments; - for (const Database::AesDangerArea &area : qAsConst(areaVec)) + for (const Database::AesDangerArea &area : std::as_const(areaVec)) { // Gather segments mySegments.clear(); - for (const Database::AesDangerSegment &mas : qAsConst(segmentVec)) + for (const Database::AesDangerSegment &mas : std::as_const(segmentVec)) { if (mas.dangerAreaId == area.privDangerAreaId) mySegments << mas; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp index 2d1542a21..f4cc39339 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp @@ -8,6 +8,7 @@ */ #include "handler_effect_cluster.h" +#include #include "handler_charge_administration.h" #include "object_effect_cluster.h" #include "settings.h" @@ -390,8 +391,6 @@ void HandlerEffectCluster::onEffectClusterOcModifyRequest(const rti::core::Sampl ecCommonModifyRequest.area = request.area; int impactCount = 0; - for (const auto &effector : request.effectors) - effector.chargeAmount; if (impactCount == 1) ecCommonModifyRequest.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgPoint; else @@ -632,7 +631,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterModifyRequest(const void HandlerEffectCluster::recountActiveAreas() { s_currentAirSupportCount = 0; - for (const auto *area : qAsConst(m_objectMap)) + for (const auto *area : std::as_const(m_objectMap)) { if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused { @@ -681,7 +680,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl QMap effectClusterPartyMap; - for (const auto *area : qAsConst(m_objectMap)) + for (const auto *area : std::as_const(m_objectMap)) { if (area->data().partyId == request.partyId) { @@ -701,7 +700,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_A: // Feuer Halt Allgemein { // all control operations are halted - for (auto *ifs : qAsConst(effectClusterPartyMap)) + for (auto *ifs : std::as_const(effectClusterPartyMap)) { EffectClusterPauseResumeRequest req; @@ -718,7 +717,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl { // Ongoing combat operations are halted after comparing the extent of // the fire hold with the corresponding target coordinate and circular area. - for (auto *ifs : qAsConst(effectClusterPartyMap)) + for (auto *ifs : std::as_const(effectClusterPartyMap)) { const double lonRad = request.longitude.is_set() ? request.longitude.get() * LtsCoordTrans::deg2rad() : 0.0; const double latRad = request.latitude.is_set() ? request.latitude.get() * LtsCoordTrans::deg2rad() : 0.0; @@ -746,7 +745,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl // Unlike "Check Fire" (Feuer Halt), any rounds already loaded in a Panzerhaubitze (PzH) are still fired, // followed by an EX-FQ(FN) report. Once the weapon system confirms execution, // the engagement is closed and the target area status is set to "expired." - for (auto *ifs : qAsConst(effectClusterPartyMap)) + for (auto *ifs : std::as_const(effectClusterPartyMap)) { DEBUG_LOG(m_logger) << "[Feuer Einstellen ----- markAsExpired] " << "effectClusterId: " << ifs->data().id; @@ -755,7 +754,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl break; } case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_C: // Aufheben Feuer Halt Allgemein - for (auto *ifs : qAsConst(effectClusterPartyMap)) + for (auto *ifs : std::as_const(effectClusterPartyMap)) { DEBUG_LOG(m_logger) << "[Aufheben Feuer Halt Allgemein] " << "effectClusterId: " << ifs->data().id; @@ -768,7 +767,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl break; case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_F: // Aufheben Feuer Halt Referenziert { - for (auto *ifs : qAsConst(effectClusterPartyMap)) + for (auto *ifs : std::as_const(effectClusterPartyMap)) { const double lonRad = request.longitude.is_set() ? request.longitude.get() * LtsCoordTrans::deg2rad() : 0.0; // optional const double latRad = request.latitude.is_set() ? request.latitude.get() * LtsCoordTrans::deg2rad() : 0.0; // optional diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp index c48c1807e..043e48914 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp @@ -8,6 +8,7 @@ */ #include "handler_explosion_cluster.h" +#include #include "handler_charge_administration.h" #include #include @@ -611,7 +612,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::modifyPartyParticipant(qint32 void HandlerExplosionCluster::recountActiveAreas() { s_currentAirSupportCount = 0; - for (const auto *area : qAsConst(m_objectMap)) + for (const auto *area : std::as_const(m_objectMap)) { if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_single.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_single.cpp index d3b5e25dc..571eda494 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_single.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_single.cpp @@ -6,6 +6,7 @@ */ #include "handler_explosion_single.h" +#include #include "main_handler.h" #include @@ -30,7 +31,7 @@ bool HandlerExplosionSingle::init() return true; } // create indirect fire single objects - for (const Database::AesExplosionSingle &dbData : qAsConst(dataVec)) + for (const Database::AesExplosionSingle &dbData : std::as_const(dataVec)) { ObjectExplosionSingle *ifs(new ObjectExplosionSingle(m_mainHandler, this)); connect(ifs, &ObjectExplosionSingle::effectStateChanged, this, &HandlerExplosionSingle::onEffectStateChanged); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.cpp index a9ddda9bb..6ba0617fd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.cpp @@ -7,6 +7,7 @@ */ #include "handler_functional_area.h" +#include #include "Utils/polygons.h" #include @@ -51,7 +52,7 @@ bool HandlerFunctionalArea::init() return false; } - for (const Database::AesFunctionalAreaType ¤tFunctionalAreaType : qAsConst(functionalAreaTypeVec)) + for (const Database::AesFunctionalAreaType ¤tFunctionalAreaType : std::as_const(functionalAreaTypeVec)) { FunctionalAreaType *ddsData = new FunctionalAreaType(currentFunctionalAreaType.id, @@ -74,7 +75,7 @@ bool HandlerFunctionalArea::init() // create functional area objects - for (const Database::AesFunctionalArea &dbData : qAsConst(dataVec)) + for (const Database::AesFunctionalArea &dbData : std::as_const(dataVec)) { ObjectFunctionalArea *ifs(new ObjectFunctionalArea(m_mainHandler, this)); connect(ifs, &ObjectFunctionalArea::effectStateChanged, this, &HandlerFunctionalArea::onEffectStateChanged); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp index 7e156d013..b606eccde 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp @@ -7,6 +7,7 @@ */ #include "handler_gas_pipe.h" +#include #include "object_gas_pipe.h" #include #include "Utils/polygons.h" @@ -50,13 +51,13 @@ bool HandlerGasPipe::init() // contains all segments of an gasPipe in ascending order QVector dbGasPipeSegments; - for (const Database::AesGasPipe &dbGasPipe : qAsConst(gasPipeVec)) + for (const Database::AesGasPipe &dbGasPipe : std::as_const(gasPipeVec)) { if (dbGasPipe.effectStateId == AesEffectState::EsRemoved) continue; dbGasPipeSegments.clear(); - for (const Database::AesGasPipeSegment &segment : qAsConst(segmentVec)) + for (const Database::AesGasPipeSegment &segment : std::as_const(segmentVec)) { if (segment.gasPipeId == dbGasPipe.privGasPipeId) dbGasPipeSegments.insert(segment.positionIndex, segment); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp index e601d4a97..874f9b099 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp @@ -7,6 +7,7 @@ */ #include "handler_mine_area.h" +#include #include "Utils/polygons.h" #include "handler_effect_cluster.h" #include "handler_mine_corridor.h" @@ -69,7 +70,7 @@ bool HandlerMineArea::init() } // create area mine objects - for (const Database::AesMineArea &area : qAsConst(areaVec)) + for (const Database::AesMineArea &area : std::as_const(areaVec)) { if (area.layingProcedureTypeId == AesMaLayingProcedureType::LptArtillery && !area.isCentral @@ -159,7 +160,7 @@ void HandlerMineArea::redistributeMines(int aesId, QListid() != aesId) { @@ -185,7 +186,7 @@ void HandlerMineArea::redistributeMines(int aesId, QListisDusMineArea() && mineArea->hasMine(mineId)) { @@ -621,7 +622,7 @@ Core::FunctionReplyObject HandlerMineArea::mineResetRequest(const MineResetReque DEBUG_LOG(m_logger) << "Resetting all unassociated DUS mines (NullArea) and all DUS mine areas"; // Do this first! m_nullArea->resetMines(); - for (auto mineAreaObj : qAsConst(m_objectMap)) + for (auto mineAreaObj : std::as_const(m_objectMap)) { if (!mineAreaObj->isDusMineArea() && !mineAreaObj->isConcreteMine()) continue; @@ -805,7 +806,7 @@ void HandlerMineArea::onNewMineCorridor(const AesItemView &aiv) if (aiv.effectStateId != AesEffectState::EsActivated) return; - for (ObjectMineArea *ma : qAsConst(m_objectMap)) + for (ObjectMineArea *ma : std::as_const(m_objectMap)) { if (intersects(ma->boundingRect(), aiv.form)) ma->clearCorridor(aiv); @@ -1183,7 +1184,7 @@ void HandlerMineArea::onTimeoutEquipNo(int equipNo, int chargeTypeId) std::vector vec; vec.reserve(points.size()); - for (QPointF bbPoint : qAsConst(points)) + for (QPointF bbPoint : std::as_const(points)) { Core::GeoPosition2D pos; pos.lon = bbPoint.x(); @@ -1192,7 +1193,7 @@ void HandlerMineArea::onTimeoutEquipNo(int equipNo, int chargeTypeId) vec.push_back(pos); } // vec.reserve(boundingBox.size()); - // for( QPointF bbPoint : qAsConst(boundingBox)) + // for( QPointF bbPoint : std::as_const(boundingBox)) // { // Core::GeoPosition2D pos; // LtsCoordTrans::UtmCoordinate utm; @@ -1259,7 +1260,7 @@ bool HandlerMineArea::checkIfNullMineIsInArea(const std::vector vecSeg; vecSeg.reserve(segments.size()); - for (const AreaEffectSimulation::MineSegment &seg : qAsConst(segments)) + for (const AreaEffectSimulation::MineSegment &seg : std::as_const(segments)) { Database::AesMineAreaSegment dbSeg; dbSeg.startPosition = QPointF(seg.positionStart.lon, seg.positionStart.lat); @@ -1303,7 +1304,7 @@ bool HandlerMineArea::containsPointInExpandedMinefield(const QPointF &positionGe mineAreaPolygonUtm.push_back(QPointF(pointMineAreaUtm.x, pointMineAreaUtm.y)); } - for (const QPointF &mineAreaPointUTM : qAsConst(mineAreaPolygonUtm)) + for (const QPointF &mineAreaPointUTM : std::as_const(mineAreaPolygonUtm)) { double x = pointUtm.x - mineAreaPointUTM.x(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_corridor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_corridor.cpp index 1d2ef4cc7..4da4bf091 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_corridor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_corridor.cpp @@ -7,6 +7,7 @@ */ #include "handler_mine_corridor.h" +#include #include "object_mine_corridor.h" #include "mine_corridor_creator.h" @@ -47,11 +48,11 @@ bool HandlerMineCorridor::init() // create area mine objects QVector mySegments; - for (const Database::AesMineCorridor &area : qAsConst(areaVec)) + for (const Database::AesMineCorridor &area : std::as_const(areaVec)) { // Gather segments mySegments.clear(); - for (const Database::AesMineCorridorSegment &mas : qAsConst(segmentVec)) + for (const Database::AesMineCorridorSegment &mas : std::as_const(segmentVec)) { if (mas.mineCorridorId == area.id) mySegments << mas; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_ncontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_ncontamination.cpp index 3c0e98597..e3395c8cb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_ncontamination.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_ncontamination.cpp @@ -7,6 +7,7 @@ */ #include "handler_ncontamination.h" +#include #include "Utils/polygons.h" #include @@ -33,7 +34,7 @@ bool HandlerNContamination::init() DEBUG_LOG(m_logger) << "TotalC: " << totalAreasCentral() << " Total: " << totalAreas(); - for (const Database::AesNContamination &dbData : qAsConst(dataVec)) + for (const Database::AesNContamination &dbData : std::as_const(dataVec)) { ObjectNContamination *ifs(new ObjectNContamination(m_mainHandler, this)); connect(ifs, &ObjectNContamination::effectStateChanged, this, &HandlerNContamination::onEffectStateChanged); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.cpp index c60deeac9..d30569a56 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.cpp @@ -7,6 +7,7 @@ */ #include "handler_recon_area.h" +#include #include #include @@ -31,7 +32,7 @@ bool HandlerReconArea::init() } // create Recon area objects - for (const Database::AesReconArea &dbData : qAsConst(dataVec)) + for (const Database::AesReconArea &dbData : std::as_const(dataVec)) { ObjectReconArea *ifs(new ObjectReconArea(m_mainHandler, this)); connect(ifs, &ObjectReconArea::effectStateChanged, this, &HandlerReconArea::onEffectStateChanged); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_technical_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_technical_area.cpp index 9c7d3dfbd..378e5f7d2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_technical_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_technical_area.cpp @@ -7,6 +7,7 @@ */ #include "handler_technical_area.h" +#include #include @@ -31,7 +32,7 @@ bool HandlerTechnicalArea::init() } // create Technical area objects - for (const Database::AesTechnicalArea &dbData : qAsConst(dataVec)) + for (const Database::AesTechnicalArea &dbData : std::as_const(dataVec)) { ObjectTechnicalArea *ifs(new ObjectTechnicalArea(m_mainHandler, this)); connect(ifs, &ObjectTechnicalArea::effectStateChanged, this, &HandlerTechnicalArea::onEffectStateChanged); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/meteo_data_provider.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/meteo_data_provider.cpp index 9ebf7dab7..17591ce80 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/meteo_data_provider.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/meteo_data_provider.cpp @@ -6,6 +6,7 @@ */ #include "meteo_data_provider.h" +#include #include "main_handler.h" #include #include "settings.h" @@ -55,7 +56,7 @@ MeteoDataManagement::MeteoData MeteoDataProvider::getNearestWeather(const Core:: LtsCoordTrans::UtmCoordinate utm(LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon, pos.lat)); double nearestDistanceSquared = std::numeric_limits::max(); MeteoDataManagement::MeteoData retMd; - for (const auto &md : qAsConst(m_meteoData)) + for (const auto &md : std::as_const(m_meteoData)) { if (md.isStaticMeteoData) continue; @@ -95,7 +96,7 @@ void MeteoDataProvider::initWeatherData() return; m_mdmDtc->waitForHistoricalDataMeteoData(); m_meteoData = m_mdmDtc->meteoDatas(); - for (const auto &data : qAsConst(m_meteoData)) + for (const auto &data : std::as_const(m_meteoData)) if (data.isStaticMeteoData) { m_staticWeatherId = data.id; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.cpp index 80b01e31e..41eeb31bc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.cpp @@ -7,6 +7,7 @@ */ #include "mine_corridor_creator.h" +#include #include "object_mine_corridor.h" #include @@ -97,7 +98,7 @@ void MineCorridorCreator::checkCorridorData(bool bFinished) DEBUG_LOG(m_logger) << "Checking corridor data (finished: " << bFinished << ") for equipment " << m_equipNo; std::vector coords; coords.reserve(m_sortedCorridorData.size()); - for (const auto &c : qAsConst(m_sortedCorridorData)) + for (const auto &c : std::as_const(m_sortedCorridorData)) coords.push_back(c); const auto coordsSmoothed = ramerDouglasPeucker(coords, s_smoothDistance); DEBUG_LOG(m_logger) << "Calculated points:"; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h index 502c79035..ff4c0fee1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include #include @@ -148,7 +149,7 @@ class ObjectBase : public QObject { QPolygonF out; out.reserve(in.size()); - for (const auto &pos : qAsConst(in)) + for (const auto &pos : std::as_const(in)) out.push_back(QPointF(pos.lon, pos.lat)); return out; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.cpp index 3055478da..85894fbaf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.cpp @@ -7,6 +7,7 @@ */ #include "object_borderline.h" +#include #include "special_area_provider.h" #include @@ -125,7 +126,7 @@ Core::FunctionReplyObject ObjectBorderline::updateObject(const Database::AesBord } // update all AesBorderlineSegments in database - for (const Database::AesBorderlineSegment &segment : qAsConst(tmpDbSegments)) + for (const Database::AesBorderlineSegment &segment : std::as_const(tmpDbSegments)) { if (!m_mainHandler->db()->update(segment)) return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating AesBorderlineSegment-data in database.")); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.cpp index 27e4afc8a..aabf85cb4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.cpp @@ -6,6 +6,7 @@ */ #include "object_danger_area.h" +#include #include "special_area_provider.h" #include "Utils/polygons.h" @@ -130,7 +131,7 @@ Core::FunctionReplyObject ObjectDangerArea::updateObject(const Database::AesDang for (size_t i = 0; i < segments.size(); ++i) tmpSegments[i].position = QPointF(segments[i].lon, segments[i].lat); - for (const Database::AesDangerSegment &segment : qAsConst(tmpSegments)) + for (const Database::AesDangerSegment &segment : std::as_const(tmpSegments)) { if (!m_mainHandler->db()->update(segment)) return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating AesDangerSegment-data in database.")); @@ -241,7 +242,7 @@ void ObjectDangerArea::removeTopics() auto dts = m_mainHandler->dds()->dts(); dts->removeDangerAreaByKey(m_data.id); dts->removeAesItemViewByKey(1000 * m_data.id + static_cast(AesType::AtDangerArea)); - for (int idx : qAsConst(m_correlatedAesItems)) + for (int idx : std::as_const(m_correlatedAesItems)) dts->removeDangerAreaCorrelatedAesItemByKey(idForCorrelatedItem(idx)); m_correlatedAesItems.clear(); emit removeAiv(m_data.id); @@ -254,7 +255,7 @@ void ObjectDangerArea::onUpdateCorrelation() // If Danger Area is not active, remove correlations and return if (effectState() != AesEffectState::EsActivated) { - for(int oldItem : qAsConst(m_correlatedAesItems)) + for(int oldItem : std::as_const(m_correlatedAesItems)) m_mainHandler->dds()->dts()->removeDangerAreaCorrelatedAesItemByKey(idForCorrelatedItem(oldItem)); m_correlatedAesItems.clear(); return; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp index b0e3c1fbe..42a119a2f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp @@ -7,6 +7,7 @@ */ #include "object_effect_cluster.h" +#include #include "Utils/polygons.h" #include "handler_charge_administration.h" #include "handler_charge_effect.h" @@ -461,9 +462,9 @@ Core::FunctionReplyObject ObjectEffectCluster::updateObject(const Database::AesE int oldImpactCount = 0; int newImpactCount = 0; - for (const auto &oldEffector : qAsConst(m_effectorData)) + for (const auto &oldEffector : std::as_const(m_effectorData)) oldImpactCount += oldEffector.chargeAmount; - for (const auto &newEffector : qAsConst(effectorDatas)) + for (const auto &newEffector : std::as_const(effectorDatas)) newImpactCount += newEffector.chargeAmount; if (oldImpactCount != newImpactCount) @@ -686,7 +687,7 @@ bool ObjectEffectCluster::initialCalculations(QString *reasonOut) mtps_asUtm.resize(m_data.impactCount); m_temporaryData.mhPoints.reserve(mtps_asUtm.size()); - for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm)) + for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm)) { LtsCoordTrans::UtmCoordinate temp(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y()); m_temporaryData.mhPoints.emplace_back(Core::GeoPosition2D(temp.geographic().x(), temp.geographic().y())); @@ -1435,7 +1436,7 @@ void ObjectEffectCluster::publishAiv() const QVector &singleExplosions = Polygons::effectClusterSingleExplosionsGAUSS_Mtp(m_data, m_effectorData); singleEffectsRef.reserve(singleExplosions.size()); - for (const QPointF &singleExplosion : qAsConst(singleExplosions)) + for (const QPointF &singleExplosion : std::as_const(singleExplosions)) { SingleEffect se; se.singleEffectState = AesSingleEffectState::SesScheduled; @@ -1616,7 +1617,7 @@ void ObjectEffectCluster::markAsExpired(bool fireLoadedRound) DEBUG_LOG(m_logger) << "TimerTimeout we will now send Confirmation for " << m_data.id; // send confirmation for all Effectors then mark as expired (with false) - for (const auto effector : qAsConst(m_effectorData)) + for (const auto &effector : m_effectorData) { onSendConfirmationReportToTab(effector.participantId); } @@ -2036,7 +2037,7 @@ void ObjectEffectCluster::onEffectorFired(int participantId, int aesItemId, cons if (chargeEffectIds.size() > 1) // we need to find the last and first one { - for (const auto id : qAsConst(chargeEffectIds)) + for (const auto id : std::as_const(chargeEffectIds)) { const auto &chargeEffect = m_mainHandler->chargeEffectHandler()->getChargeEffectById(id); if (chargeEffect->getEffectStart() > lastChargeEffect.second) @@ -2547,7 +2548,7 @@ bool ObjectEffectCluster::generateTrajectoryVulcanoSpecific(int explosionNumber, // "convert" from time-aware curve 'back' to time-unaware trajectoryGeometry tdRef.trajectoryGeometry.clear(); - for (const Core::GeoPositionRelativeTime &geoPosRelTime : qAsConst(tdRef.trajectoryTimeAware.geometry)) + for (const Core::GeoPositionRelativeTime &geoPosRelTime : std::as_const(tdRef.trajectoryTimeAware.geometry)) tdRef.trajectoryGeometry.emplace_back(geoPosRelTime); // implicit // downcast tdRef.peakHeightAbs = peakHeightRelToOrigin + originatorPosition_geo.z(); @@ -2722,7 +2723,7 @@ void ObjectEffectCluster::sendCalculateTrajectoryAdlerRequest(const QVector #include "Utils/polygons.h" #include "handler_charge_administration.h" #include "handler_trajectory.h" @@ -299,7 +300,7 @@ Core::FunctionReplyObject ObjectExplosionCluster::createObject(const Database::A // DEBUG_LOG(m_logger) << "data.damagePercent() > 80. Check, if m_trajectoryCont contains building:" << data.id() // << " aesItemId=" << m_aiv.aesItemId(); -// for (const TracjectoryData &tracjectoryData : qAsConst(m_trajectoryCont)) +// for (const TracjectoryData &tracjectoryData : std::as_const(m_trajectoryCont)) // { // DEBUG_LOG(m_logger) << "print_m_trajectory" // << " value: index=" << tracjectoryData.index @@ -514,7 +515,7 @@ bool ObjectExplosionCluster::initialCalculations(QString *reasonOut) mtps_asUtm.resize(m_data.impactCount); m_temporaryData.mhPoints.reserve(mtps_asUtm.size()); - for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm)) + for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm)) { LtsCoordTrans::UtmCoordinate temp(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y()); m_temporaryData.mhPoints.emplace_back(Core::GeoPosition2D(temp.geographic().x(), temp.geographic().y())); @@ -1515,7 +1516,7 @@ void ObjectExplosionCluster::publishAiv() int explosionIndex = 0; singleEffectsRef.reserve(singleExplosions.size()); - for (const QPointF &singleExplosion : qAsConst(singleExplosions)) + for (const QPointF &singleExplosion : std::as_const(singleExplosions)) { SingleEffect se; se.singleEffectState = AesSingleEffectState::SesScheduled; @@ -1652,7 +1653,7 @@ void ObjectExplosionCluster::removeTopics() #ifdef USE_TRAJECTORY_VIA_HANDLER // remove TrajectoryTimeAware created via Handler: // topicIds are stored at m_trajectoryHandlerExplosionIndexToTopicId - for (int topicId : qAsConst(m_trajectoryHandlerExplosionIndexToTopicId)) + for (int topicId : std::as_const(m_trajectoryHandlerExplosionIndexToTopicId)) { dts->removeTrajectoryTimeAwareByKey(topicId); } @@ -2478,7 +2479,7 @@ bool ObjectExplosionCluster::generateTrajectoryVulcanoSpecific(int explosionNumb // "convert" from time-aware curve 'back' to time-unaware trajectoryGeometry tdRef.trajectoryGeometry.clear(); - for (const Core::GeoPositionRelativeTime &geoPosRelTime : qAsConst(tdRef.trajectoryTimeAware.geometry)) + for (const Core::GeoPositionRelativeTime &geoPosRelTime : std::as_const(tdRef.trajectoryTimeAware.geometry)) tdRef.trajectoryGeometry.emplace_back(geoPosRelTime); // implicit // downcast tdRef.peakHeightAbs = peakHeightRelToOrigin + originatorPosition_geo.z(); @@ -2749,7 +2750,7 @@ void ObjectExplosionCluster::publishTrajectory(int explosionIndex) #define REDUCED_DISTRIBUTION // [GUEZE-2462] Darstellung Flugparabel Steilfeuer #ifdef REDUCED_DISTRIBUTION const int trajSize = trajectoryGeometry.size(); - for (const Core::GeoPosition &pos3D : qAsConst(trajectoryGeometry)) + for (const Core::GeoPosition &pos3D : std::as_const(trajectoryGeometry)) { // if (!m_isAirSupportSource) { @@ -2777,7 +2778,7 @@ void ObjectExplosionCluster::publishTrajectory(int explosionIndex) } // for #else - for (const Core::GeoPosition &pos3D : qAsConst(trajectoryGeometry)) + for (const Core::GeoPosition &pos3D : std::as_const(trajectoryGeometry)) { geometryRef.emplace_back(Core::GeoPositionRelativeTime(pos3D.lon(), pos3D.lat(), pos3D.z(), idx * flightDurationMSecSeg)); ++idx; @@ -2930,7 +2931,7 @@ void ObjectExplosionCluster::dump(const char *file, int lineNo) const DEBUG_LOG(m_logger) << m_data.id << ", DUMP: m_trajectoryCont.keys()= " << trajectoryContKeys; DEBUG_LOG(m_logger) << m_data.id << ", DUMP: m_publisedTrajectoriesForDebug.size = " << m_publisedTrajectoriesForDebug.size(); - for (const auto &item : qAsConst(m_publisedTrajectoriesForDebug)) + for (const auto &item : std::as_const(m_publisedTrajectoriesForDebug)) DEBUG_LOG(m_logger) << m_data.id << ", DUMP: m_publisedTrajectoriesForDebug = " << item; DEBUG_LOG(m_logger) << "END ******* DUMP: id = " << m_data.id << ", name = '" << m_data.name << "' **************"; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.cpp index 6ebe58565..a9b3224dc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.cpp @@ -7,6 +7,7 @@ */ #include "object_gas_pipe.h" +#include #include "special_area_provider.h" #include @@ -133,7 +134,7 @@ Core::FunctionReplyObject ObjectGasPipe::updateObject(const Database::AesGasPipe } // update all AesGasPipeSegments in database - for (const Database::AesGasPipeSegment &segment : qAsConst(tmpDbSegments)) + for (const Database::AesGasPipeSegment &segment : std::as_const(tmpDbSegments)) { if (!m_mainHandler->db()->update(segment)) return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating AesGasPipeSegment-data in database.")); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp index 1f10e5bc1..cf47346a4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp @@ -6,6 +6,7 @@ */ #include "object_mine_area.h" +#include #include "handler_mine_area.h" #include "qtransform.h" #include "special_area_provider.h" @@ -116,7 +117,7 @@ int ObjectMineArea::getMineIdByIndex(int index) const DEBUG_LOG(m_logger) << "getMineIdByIndex index: " << index; int count = 0; - for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines)) + for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines)) { DEBUG_LOG(m_logger) << "tm: mineId: " << tm.mineId; if (count == index) @@ -150,7 +151,7 @@ void ObjectMineArea::clearCorridor(const AesItemView &aiv) QVector minesToTrigger; minesToTrigger.reserve(m_triggeredMines.size()); - for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines)) + for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines)) { LtsCoordTrans::UtmCoordinate utmMinePos = LtsCoordTrans::UtmCoordinate::fromGeographic(tm.position, zone); if (aivUtmPoly.containsPoint(QPointF(utmMinePos.x, utmMinePos.y), Qt::OddEvenFill)) @@ -170,14 +171,14 @@ void ObjectMineArea::clearBuildings() DEBUG_LOG(m_logger) << "mseIds size: " << mseIds.size(); QVector minesToTrigger; - for (int mseId : qAsConst(mseIds)) + for (int mseId : std::as_const(mseIds)) { DEBUG_LOG(m_logger) << "mseId: " << mseId; const QPolygonF &footprint = m_mainHandler->dds()->ismDtc()->getUtmFootprintById(mseId, zoneOut, isGroundLevel); minesToTrigger.clear(); minesToTrigger.reserve(m_triggeredMines.size()); - for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines)) + for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines)) { const LtsCoordTrans::UtmCoordinate &utmMinePos = LtsCoordTrans::UtmCoordinate::fromGeographic(tm.position, zoneOut); if (footprint.containsPoint(QPointF(utmMinePos.x, utmMinePos.y), Qt::OddEvenFill)) @@ -349,7 +350,7 @@ bool ObjectMineArea::publishTriggeredImpacts() tis.bitfield.resize((m_triggeredMines.size() + 7) / 8); int i = 0; - for (const auto &mine : qAsConst(m_triggeredMines)) + for (const auto &mine : std::as_const(m_triggeredMines)) { // Triggered Impact == 0, if mine is disarmed/exploded LtsUtils::BitArray::setBit(tis.bitfield, i++, !mine.isTriggered); @@ -373,7 +374,7 @@ bool ObjectMineArea::publishDusMineStatus() dms.mines.resize(m_triggeredMines.size()); int i = 0; - for (const auto &mine : qAsConst(m_triggeredMines)) + for (const auto &mine : std::as_const(m_triggeredMines)) { const DusMine entry(mine.mineId, mine.isTriggered, mine.chargeTypeId, {mine.position.x(), mine.position.y()}); dms.mines[i++] = entry; @@ -399,7 +400,7 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines) QVector polyUtm; polyUtm.reserve(m_mineAreaPolygon.size()); - for (const QPointF &point : qAsConst(m_mineAreaPolygon)) + for (const QPointF &point : std::as_const(m_mineAreaPolygon)) { LtsCoordTrans::UtmCoordinate posUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(point.x(), point.y()); DEBUG_LOG(m_logger) << "mineArea Polygon: " << posUtm.mgrs(); @@ -408,14 +409,14 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines) QVector minesUtm; minesUtm.reserve(m_triggeredMines.size()); - for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines)) + for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines)) { LtsCoordTrans::UtmCoordinate posUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(tm.position.x(), tm.position.y()); DEBUG_LOG(m_logger) << "triggeredMines: " << posUtm.mgrs(); minesUtm.append(posUtm); } - for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines)) + for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines)) { Core::GeoPosition2D geoPos = Core::GeoPosition2D(tm.position.x(), tm.position.y()); vec.append(geoPos); @@ -434,7 +435,7 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines) // In case of MineLayerPoisition (Not Sorting) with DUS Mines and more than 2 Mines (1 Segment) we // ignore the mines and just use the segments positions (Start is the startingPos of the the first segment // then add all end Positions of all segments - for (const auto &segment : qAsConst(m_segments)) + for (const auto &segment : std::as_const(m_segments)) { if (vecSorted.empty()) vecSorted.push_back(Core::GeoPosition2D(segment.startPosition.x(), segment.startPosition.y())); @@ -472,7 +473,7 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines) DEBUG_LOG(m_logger) << "Distance between startPos and pos: " << length; Core::GeoPosition2D newPos = pos; - for (const Core::GeoPosition2D &pos2 : qAsConst(vec)) + for (const Core::GeoPosition2D &pos2 : std::as_const(vec)) { if (pos2 == pos || pos2 == startPos) continue; @@ -1034,7 +1035,7 @@ bool ObjectMineArea::containsPointInExpandedMinefield(const QPointF &positionGeo const double distance = 0.5; - for (const QPointF &mineAreaPointUTM : qAsConst(mineAreaPolygonUtm)) + for (const QPointF &mineAreaPointUTM : std::as_const(mineAreaPolygonUtm)) { double x = pointUtm.x - mineAreaPointUTM.x(); @@ -1138,7 +1139,7 @@ void ObjectMineArea::updateMineByOldMineId(Database::AesMineAreaTriggeredMines & int ObjectMineArea::mineCount() { double totalLength = 0.0; - for (const Database::AesMineAreaSegment &segment : qAsConst(m_segments)) + for (const Database::AesMineAreaSegment &segment : std::as_const(m_segments)) { LtsCoordTrans::UtmCoordinate startPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(segment.startPosition); LtsCoordTrans::UtmCoordinate endPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(segment.endPosition, startPositionUtm.zone); @@ -1351,7 +1352,7 @@ void ObjectMineArea::onPublishData() std::vector segVec; segVec.reserve(m_segments.size()); - for (const auto &segment : qAsConst(m_segments)) + for (const auto &segment : std::as_const(m_segments)) segVec.emplace_back( MineSegment(Core::GeoPosition2D(segment.startPosition.x(), segment.startPosition.y()), Core::GeoPosition2D(segment.endPosition.x(), segment.endPosition.y()))); @@ -1442,7 +1443,7 @@ void ObjectMineArea::publishAiv() aiv2.effectStart = toMSec(m_data.effectStart); aiv2.form.clear(); aiv2.form.reserve(m_triggeredMines.size()); - for (const auto &tm : qAsConst(m_triggeredMines)) + for (const auto &tm : std::as_const(m_triggeredMines)) aiv2.form.resize(aiv2.form.size() + 1, Core::GeoPosition(tm.position.x(), tm.position.y(), 0.0)); aiv2.boundingBoxBottomLeft = aiv.boundingBoxBottomLeft; aiv2.boundingBoxTopRight = aiv.boundingBoxTopRight; @@ -1493,7 +1494,7 @@ Core::FunctionReplyObject ObjectMineArea::createGeoSegmentsFromMineData(double & std::vector tempMinePos; tempMinePos.reserve(m_triggeredMines.size() + mineData.size()); - for (const auto &t : qAsConst(m_triggeredMines)) + for (const auto &t : std::as_const(m_triggeredMines)) tempMinePos.emplace_back(Core::GeoPosition2D(t.position.x(), t.position.y())); for (const auto &md : mineData) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area_null.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area_null.cpp index b92e362f7..90034b55f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area_null.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area_null.cpp @@ -6,6 +6,7 @@ */ #include "object_mine_area_null.h" +#include #include "special_area_provider.h" #include @@ -73,7 +74,7 @@ bool ObjectMineAreaNull::isVirtualMine() const int ObjectMineAreaNull::lastConcreteMineNo() { int lastMineNo = 0; - for (const Database::AesMineAreaTriggeredMines &mine : qAsConst(m_triggeredMines)) + for (const Database::AesMineAreaTriggeredMines &mine : std::as_const(m_triggeredMines)) { // NOTE: igniterType/IgniterFunciton = 0 as long as AesMineAreaTriggeredMines does not contain values DEBUG_LOG(m_logger) << "mine: chargeTypeId " << mine.chargeTypeId << ", mineId: " << mine.mineId; @@ -245,7 +246,7 @@ void ObjectMineAreaNull::publishAiv() vec.reserve(m_triggeredMines.size()); QPolygonF tmp; tmp.reserve(m_triggeredMines.size()); - for (const auto &mine : qAsConst(m_triggeredMines)) + for (const auto &mine : std::as_const(m_triggeredMines)) { vec.emplace_back(Core::GeoPosition(mine.position.x(), mine.position.y(), 0)); tmp.push_back(mine.position); @@ -285,7 +286,7 @@ bool ObjectMineAreaNull::publishTriggeredImpacts() tis.setId = dds::core::optional(m_setId); int i = 0; - for (const auto &mine : qAsConst(m_triggeredMines)) + for (const auto &mine : std::as_const(m_triggeredMines)) { // Triggered Impact == 0, if mine is disarmed/exploded LtsUtils::BitArray::setBit(tis.bitfield, i++, !mine.isTriggered); @@ -307,7 +308,7 @@ bool ObjectMineAreaNull::publishDusMineStatus() dms.mines.resize(m_triggeredMines.size()); dms.setId = dds::core::optional(m_setId); int i = 0; - for (const auto &mine : qAsConst(m_triggeredMines)) + for (const auto &mine : std::as_const(m_triggeredMines)) { const DusMine entry(mine.mineId, mine.isTriggered, mine.chargeTypeId, {mine.position.x(), mine.position.y()}); dms.mines[i++] = entry; @@ -328,7 +329,7 @@ QPolygonF ObjectMineAreaNull::generateForm() vec.reserve(m_triggeredMines.size()); QPolygonF tmp; tmp.reserve(m_triggeredMines.size()); - for (const auto &mine : qAsConst(m_triggeredMines)) + for (const auto &mine : std::as_const(m_triggeredMines)) { vec.emplace_back(Core::GeoPosition(mine.position.x(), mine.position.y(), 0)); tmp.push_back(mine.position); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.cpp index 4cbfefe16..f82a87927 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.cpp @@ -6,6 +6,7 @@ */ #include "object_mine_corridor.h" +#include #include "special_area_provider.h" #include "Utils/polygons.h" @@ -140,7 +141,7 @@ Core::FunctionReplyObject ObjectMineCorridor::updateObject(const Database::AesMi for (size_t i = 0; i < segments.size(); ++i) tmpSegments[i].position = QPointF(segments[i].lon, segments[i].lat); - for (const Database::AesMineCorridorSegment &segment : qAsConst(tmpSegments)) + for (const Database::AesMineCorridorSegment &segment : std::as_const(tmpSegments)) { if (!m_mainHandler->db()->update(segment)) return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating AesMineCorridorSegment-data in database.")); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.cpp index b44deaf4f..1cfb20dfa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.cpp @@ -7,6 +7,7 @@ */ #include "handler_training_area.h" +#include #include "object_training_area.h" #include "main_handler.h" #include "convert_db_to_dds.h" @@ -46,7 +47,7 @@ bool HandlerTrainingArea::init() return false; } - for (const Database::AsmMapDescription &data : qAsConst(dataVecMD)) + for (const Database::AsmMapDescription &data : std::as_const(dataVecMD)) { ObjectMapDescription *ifs(new ObjectMapDescription(m_mainHandler)); Core::FunctionReplyObject ret = ifs->createObject(convert(data), data.objOrder); @@ -94,7 +95,7 @@ bool HandlerTrainingArea::init() } // create asm_training_area - for (const Database::AsmTrainingArea &data : qAsConst(dataVec)) + for (const Database::AsmTrainingArea &data : std::as_const(dataVec)) { // insert sequences of map descriptions in data ObjectTrainingArea *ifs(new ObjectTrainingArea(m_mainHandler)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.cpp index 018ba0eab..316489b31 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.cpp @@ -21,6 +21,7 @@ */ #include "avm_vca_tests.h" +#include #include #include #include @@ -193,14 +194,14 @@ void AvmVcaTests::createCnrConfig() void AvmVcaTests::removeTvcConfig() { - for (auto id: qAsConst(m_tvcConfigIds)) + for (auto id: std::as_const(m_tvcConfigIds)) m_ftc->removeTvcConfigRequest(RemoveTvcConfigRequest{id}, this); QTRY_VERIFY(m_tvcConfigIds.isEmpty()); } void AvmVcaTests::removeCnrConfig() { - for (auto id: qAsConst(m_cnrConfigIds)) + for (auto id: std::as_const(m_cnrConfigIds)) m_ftc->removeCnrConfigRequest(RemoveCnrConfigRequest{id}, this); QTRY_VERIFY(m_cnrConfigIds.isEmpty()); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_state.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_state.cpp index 226e2b096..b2f065d68 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_state.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_state.cpp @@ -8,6 +8,7 @@ */ #include "ava_state.h" +#include #include "ava_session.h" #include "ava_control.h" #include "av_helper.h" @@ -40,7 +41,7 @@ AvaState::AvaState(AvaSession *session) QStringList AvaState::currentLiveVideoStreams() const { QStringList streams; - for (const QMap &map : qAsConst(m_videoState)) + for (const QMap &map : std::as_const(m_videoState)) { const QList streamNames = map.keys(); for (const QString &streamName : streamNames) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp index 369dba765..03b3a6cfa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp @@ -8,6 +8,7 @@ */ #include "cnr_handler.h" +#include #include "avm_dts.h" #include "dds_handler.h" #include "exercise_context.h" @@ -235,7 +236,7 @@ bool CnrHandler::init() return false; } - for (const AvmCnrChannel ¤tChannel : qAsConst(m_channels)) + for (const AvmCnrChannel ¤tChannel : std::as_const(m_channels)) m_dts->publish(::AudioVideoManagement::toDds(currentChannel)); // Don't use select with callback here as addConfig() uses the DB, too. @@ -246,7 +247,7 @@ bool CnrHandler::init() return false; } - for (const AvmCnrConfig ¤tConfig : qAsConst(cnrConfigs)) + for (const AvmCnrConfig ¤tConfig : std::as_const(cnrConfigs)) { auto reply = createCnrConfig(toRequest(currentConfig, 0), currentConfig.id); if (reply.error()) @@ -399,7 +400,7 @@ void CnrHandler::updateDeviceConfig() { DBTransaction trans(m_db->database()); - for (const auto &config : qAsConst(m_cache)) + for (const auto &config : std::as_const(m_cache)) if (config.isActive) m_deviceConfig->update(config); @@ -481,7 +482,7 @@ Core::FunctionReplyObject CnrHandler::validateRequest(const ModifyCnrConfigReque */ bool CnrHandler::checkConstraint(const std::function &constraint, const boost::optional &exerciseId, const boost::optional &excludeId) const { - for (const CnrConfig &config : qAsConst(m_cache)) + for (const CnrConfig &config : std::as_const(m_cache)) { if (excludeId == config.id) continue; @@ -707,7 +708,7 @@ QString CnrHandler::exerciseList(const CnrConfig &config) const // Global - all active exercises, no matter if they have active plannings or not QStringList exerciseList; - for (const auto &context : qAsConst(m_activeExercises->allContexts())) + for (const auto &context : std::as_const(m_activeExercises->allContexts())) exerciseList.append(context.toString()); return exerciseList.join(QLatin1Char(',')); } @@ -744,7 +745,7 @@ int CnrHandler::normalizedAddacChannel(int addacChannel) const Database::AvmCnrChannel CnrHandler::channelById(int32_t id) const { - for (const Database::AvmCnrChannel &channel : qAsConst(m_channels)) + for (const Database::AvmCnrChannel &channel : std::as_const(m_channels)) if (channel.id == id) return channel; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp index c7e9356fe..1b4e111fc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp @@ -8,6 +8,7 @@ */ #include "cnr_tvc_profile_handler.h" +#include #include "cnr_handler.h" #include "tvc_handler.h" #include @@ -49,7 +50,7 @@ CnrTvcProfile toDds(const Database::AvmCnrTvcProfile &circuitContainerDb, T circ CnrTvcProfile circuitContainerDds(circuitContainerDb.id, circuitContainerDb.operatorId, circuitContainerDb.exerciseId, {}); circuitContainerDds.data.reserve(circuitsDb.size()); - for (const auto ¤tCircuitDb : qAsConst(circuitsDb)) + for (const auto ¤tCircuitDb : std::as_const(circuitsDb)) circuitContainerDds.data.push_back(toDds(currentCircuitDb)); return circuitContainerDds; } @@ -148,7 +149,7 @@ bool CnrTvcProfileHandler::init() return false; } - for (const auto ¤tCircuitContainer: qAsConst(circuitContainersDb)) + for (const auto ¤tCircuitContainer: std::as_const(circuitContainersDb)) status &= collectAndPublish(currentCircuitContainer); return status; @@ -570,7 +571,7 @@ void CnrTvcProfileHandler::onConfigChanged(int32_t configId, RadioSystem type) // Find all CnrTvcProfiles where this config is referenced and reload those. // Hint: reloading might modify m_cache. Thus the reloading is done in a separate loop. - for (const auto &profile : qAsConst(m_cache)) + for (const auto &profile : std::as_const(m_cache)) for (const auto &data : profile.data) if (data.radioSystemId == type && data.radioCircuitId == configId) { @@ -578,7 +579,7 @@ void CnrTvcProfileHandler::onConfigChanged(int32_t configId, RadioSystem type) break; } - for (const auto &profile : qAsConst(toBeReloaded)) + for (const auto &profile : std::as_const(toBeReloaded)) { Database::AvmCnrTvcProfile profileDb = toDb(profile); const bool isReload = true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp index 4dae55eee..627b93fca 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp @@ -71,13 +71,13 @@ namespace AudioVideoManagement { DefaultAvMenus::DefaultAvMenus(const ExerciseContext &context, Interface::Dts *dts, HandlerVideoTeam *handlerVideoTeams, InfrastructureManagement::Interface::Dtc *ismDtc) - : m_context(context) + : m_logger(getLogger("DefaultAvMenus")) + , m_isInitialized(false) + , m_context(context) , m_dts(dts) , m_videoTeamHandler(handlerVideoTeams) , m_ismDtc(ismDtc) , m_timer(new QTimer) - , m_logger(getLogger("DefaultAvMenus")) - , m_isInitialized(false) { Q_ASSERT(dts); Q_ASSERT(ismDtc); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp index dc1e4732f..015a29cfb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp @@ -7,6 +7,7 @@ */ #include "exercises_handler.h" +#include #include "dds_handler.h" #include "dds_handler_exercise.h" #include "main_handler.h" @@ -80,7 +81,7 @@ bool ExercisesHandler::init() return false; DBTransaction trans(db()->database()); - for (const Database::AvmDeviceConfig &dc : qAsConst(avmDeviceConfig)) + for (const Database::AvmDeviceConfig &dc : std::as_const(avmDeviceConfig)) { // nur hinzufuegen, wenn es record/replay session ist // alle anderen -> aus DB loeschen diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp index 97bbfcbaf..4e71cb4ce 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp @@ -7,6 +7,7 @@ */ #include "frequency_planning_handler.h" +#include #include #include "frequency_set_handler.h" @@ -160,7 +161,7 @@ bool FrequencyPlanningHandler::init() return false; } - for (const Database::AvmFrequencyPlanning &planContainerDb : qAsConst(frequencyPlannings)) + for (const Database::AvmFrequencyPlanning &planContainerDb : std::as_const(frequencyPlannings)) collectAndPublish(planContainerDb); auto cbAfp = [this] (const Database::AvmActiveFrequencyPlanning ¤tDbData) @@ -360,7 +361,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::validateRequest(const Modify for (const FrequencyPlanningData &entry : request.data) { QSet frequencySetEntries = AudioVideoManagement::frequencySetDataIds(entry.properties); - for(const int &setEntry : qAsConst(frequencySetEntries)) + for(const int &setEntry : std::as_const(frequencySetEntries)) { if (setEntry != 0 && !m_frequencySetHandler->isValid(request.frequencySetId, setEntry)) return reply.setStr(tr_lts("dds", "FrequencySetData %1 does not belong to FrequencySet %2")).arg(setEntry).arg(request.frequencySetId); @@ -556,7 +557,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::testActivation(const std::ve for (const FrequencyPlanningData &fpdEntry : entries) { QSet frequencySetEntries = AudioVideoManagement::frequencySetDataIds(fpdEntry.properties); - for(const int &setEntry : qAsConst(frequencySetEntries)) + for(const int &setEntry : std::as_const(frequencySetEntries)) { if(takenSetEntries.contains(setEntry)) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp index d2cf256b7..8573d32a2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp @@ -8,6 +8,7 @@ */ #include "frequency_set_handler.h" +#include #include "dds_handler.h" #include "main_handler.h" #include @@ -37,7 +38,7 @@ bool FrequencySetHandler::init() } DEBUG_LOG(m_logger) << "Found " << frequencySets.size() << " Frequency Sets"; - for (const Database::AvmFrequencySet ¤tfrequencySet : qAsConst(frequencySets)) + for (const Database::AvmFrequencySet ¤tfrequencySet : std::as_const(frequencySets)) addFrequencySet(toDdsFrequencySet(currentfrequencySet)); return true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp index bb11797bd..9c6c06f80 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp @@ -7,6 +7,7 @@ */ #include "handler_frequency_planning_status.h" +#include #include "object_frequency_planning_status.h" #include "avm_db.h" @@ -81,7 +82,7 @@ bool HandlerFrequencyPlanningStatus::init() } // create objects - for (const Database::AvmFrequencyPlanningStatus &data : qAsConst(dataVec)) + for (const Database::AvmFrequencyPlanningStatus &data : std::as_const(dataVec)) { FrequencyPlanningStatus ddsData = ObjectFrequencyPlanningStatus::toDdsData(data); ObjectFrequencyPlanningStatus *ifs(new ObjectFrequencyPlanningStatus(m_dts, m_db)); @@ -112,7 +113,7 @@ void HandlerFrequencyPlanningStatus::onClearFrequencyPlanningStatusRequest(const { Q_UNUSED(request); Core::FunctionReplyObject ret; - for (ObjectFrequencyPlanningStatus *ifs : qAsConst(m_data)) + for (ObjectFrequencyPlanningStatus *ifs : std::as_const(m_data)) { ret = ifs->clearValues(); if (ret.error()) @@ -125,7 +126,7 @@ void HandlerFrequencyPlanningStatus::onRemoveFrequencyPlanningStatusByClientRequ { Core::FunctionReplyObject ret; QVector clients; - for (ObjectFrequencyPlanningStatus *ifs : qAsConst(m_data)) + for (ObjectFrequencyPlanningStatus *ifs : std::as_const(m_data)) { if (request.client == 0 || ifs->getData().client == request.client) { @@ -137,7 +138,7 @@ void HandlerFrequencyPlanningStatus::onRemoveFrequencyPlanningStatusByClientRequ clients << client; } } - for (int client : qAsConst(clients)) + for (int client : std::as_const(clients)) { // delete ObjectVideoReceiver delete m_data[client]; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp index f672bcaf8..e2cd8d524 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp @@ -7,6 +7,7 @@ */ #include "handler_video_receiver.h" +#include #include "object_video_receiver.h" #include @@ -68,7 +69,7 @@ bool HandlerVideoReceiver::init() } // create objects - for (const Database::AvmVideoReceiver &data : qAsConst(dataVec)) + for (const Database::AvmVideoReceiver &data : std::as_const(dataVec)) { AudioVideoManagement::VideoReceiver ddsData = ObjectVideoReceiver::toDdsData(data); ObjectVideoReceiver *ifs(new ObjectVideoReceiver(m_dts, m_db)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp index fb48ae323..2ec86c67a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp @@ -7,6 +7,7 @@ */ #include "handler_video_team.h" +#include #include "object_video_team.h" #include "default_av_menus.h" @@ -143,7 +144,7 @@ bool HandlerVideoTeam::init() } // create objects - for (const Database::AvmVideoTeam &data : qAsConst(dataVec)) + for (const Database::AvmVideoTeam &data : std::as_const(dataVec)) { VideoTeam ddsData = ObjectVideoTeam::toDdsData(data); ObjectVideoTeam *ifs(new ObjectVideoTeam(m_dts, m_db)); @@ -168,7 +169,7 @@ bool HandlerVideoTeam::init() QMap HandlerVideoTeam::videoTeams() const { QMap ret; - for (const auto &videoTeam : qAsConst(m_videoTeamObjMap)) + for (const auto &videoTeam : std::as_const(m_videoTeamObjMap)) ret.insert(videoTeam->getId(), videoTeam->getData()); return ret; } @@ -193,7 +194,7 @@ bool HandlerVideoTeam::needDeviceConfig(const VideoTeam &videoTeam) const void HandlerVideoTeam::onContextActivated(const ExerciseContext &context) { - for (const auto *ifs : qAsConst(m_videoTeamObjMap)) + for (const auto *ifs : std::as_const(m_videoTeamObjMap)) { VideoTeam ddsData = ifs->getData(); if (ddsData.exerciseId == context.id()) @@ -203,7 +204,7 @@ void HandlerVideoTeam::onContextActivated(const ExerciseContext &context) void HandlerVideoTeam::onContextDeactivated(const ExerciseContext &context) { - for (ObjectVideoTeam *ifs : qAsConst(m_videoTeamObjMap)) + for (ObjectVideoTeam *ifs : std::as_const(m_videoTeamObjMap)) { if (ifs->exerciseId() == context.id()) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp index 1badc0abc..24e65f620 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp @@ -8,6 +8,7 @@ */ #include "tvc_handler.h" +#include #include "dds_handler.h" #include "exercise_context.h" #include "active_exercises.h" @@ -201,7 +202,7 @@ bool TvcHandler::init() return false; } - for (const AvmTvcChannel ¤tChannel : qAsConst(m_channels)) + for (const AvmTvcChannel ¤tChannel : std::as_const(m_channels)) m_dts->publish(toDds(currentChannel)); QVector tvcConfigs; @@ -212,7 +213,7 @@ bool TvcHandler::init() return false; } - for (const AvmTvcConfig ¤tConfig : qAsConst(tvcConfigs)) + for (const AvmTvcConfig ¤tConfig : std::as_const(tvcConfigs)) createTvcConfig(toRequest(currentConfig, 0), currentConfig.id); return true; @@ -412,7 +413,7 @@ Database::AvmDeviceConfig TvcHandler::toDeviceConfig(const TvcConfig &tvcConfig) Database::AvmTvcChannel TvcHandler::channelById(int32_t id) const { - for (const Database::AvmTvcChannel &channel : qAsConst(m_channels)) + for (const Database::AvmTvcChannel &channel : std::as_const(m_channels)) if (channel.id == id) return channel; @@ -424,7 +425,7 @@ void TvcHandler::onContextActivated(const ExerciseContext &context) { bool isFirstActiveExercise = m_activeExercises->count() == 1; - for (const TvcConfig &tvcConfig : qAsConst(m_cache)) + for (const TvcConfig &tvcConfig : std::as_const(m_cache)) { bool isLocal = tvcConfig.exerciseId.is_set(); if (isLocal) @@ -446,7 +447,7 @@ void TvcHandler::onContextDeactivated(const ExerciseContext &context) { bool haveActiveExercise = m_activeExercises->count() > 0; - for (const TvcConfig &tvcConfig : qAsConst(m_cache)) + for (const TvcConfig &tvcConfig : std::as_const(m_cache)) { bool isLocal = tvcConfig.exerciseId.is_set(); @@ -526,7 +527,7 @@ Core::FunctionReplyObject TvcHandler::validateRequest(const ModifyTvcConfigReque */ bool TvcHandler::checkConstraint(const std::function &constraint, const boost::optional &exerciseId, const boost::optional &excludeId) const { - for (const TvcConfig &config : qAsConst(m_cache)) + for (const TvcConfig &config : std::as_const(m_cache)) { if (excludeId == config.id) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp index b1fc109ce..6a1300ca6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp @@ -7,6 +7,7 @@ */ #include "handler_participant_borderline.h" +#include #include #include @@ -126,7 +127,7 @@ void HandlerParticipantBorderline::onParticipantPositionChanged(const CentralEff << " participantTypeId=" << partPos.participantTypeId() << " Anzahl Borderlines=" << m_borderlines.size(); - for (const BorderlineUtm &borderline : qAsConst(m_borderlines)) + for (const BorderlineUtm &borderline : std::as_const(m_borderlines)) { DEBUG_LOG(m_logger) << "borderline id = " << borderline.id << ", Box bottomLeft = " << CentralEffectSimulation::debug(borderline.boundingBox.bottomLeft()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp index 2fa7580b9..675f66c15 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp @@ -6,6 +6,7 @@ * Created by gr, SLSE, 2017-02-20 */ #include "handler_simulated_movement.h" +#include #include #include @@ -65,7 +66,7 @@ bool HandlerSimulatedMovement::loadSimulatedMovementFromDb() DEBUG_LOG(m_logger) << "loadSimulatedMovementSegmentsFromDb size =" << simMoveSegVec.size(); // add to internal buffer - for (const CentralEffectSimulation::Database::CesSimulatedMovement &data : qAsConst(simMoveVec)) + for (const CentralEffectSimulation::Database::CesSimulatedMovement &data : std::as_const(simMoveVec)) { CentralEffectSimulation::SimulatedMovement request; request.id(data.id); @@ -77,14 +78,14 @@ bool HandlerSimulatedMovement::loadSimulatedMovementFromDb() DEBUG_LOG(m_logger) << "Loading SimulatedMovement: " << request; QMap segDbMap; // QMap to get it sorted - for (const CentralEffectSimulation::Database::CesSimulatedMovementSegment &segData : qAsConst(simMoveSegVec)) + for (const CentralEffectSimulation::Database::CesSimulatedMovementSegment &segData : std::as_const(simMoveSegVec)) { if (segData.simulatedMovementId == data.id) segDbMap.insert(segData.positionIndex, segData); } request.segments().reserve(segDbMap.size()); CentralEffectSimulation::SimulatedMovementSegment seg; - for (const CentralEffectSimulation::Database::CesSimulatedMovementSegment &segDb : qAsConst(segDbMap)) + for (const CentralEffectSimulation::Database::CesSimulatedMovementSegment &segDb : std::as_const(segDbMap)) { seg.delay(segDb.delay); seg.name(segDb.name.toStdString()); @@ -280,7 +281,7 @@ void HandlerSimulatedMovement::onSimulatedMovementRemoveByParticipantIdRequest(c DEBUG_LOG(m_logger) << "onSimulatedMovementRemoveByParticipantIdRequest: " << request; int id = 0; - for (const SimulationMovement *simMovement : qAsConst(m_simulationMovements)) + for (const SimulationMovement *simMovement : std::as_const(m_simulationMovements)) { if (simMovement->participantId() == request.participantId()) { @@ -299,7 +300,7 @@ SimulationMovement *HandlerSimulatedMovement::findSimulationMovement(int id, int { if (id) return m_simulationMovements.value(id); - for (SimulationMovement *s : qAsConst(m_simulationMovements)) + for (SimulationMovement *s : std::as_const(m_simulationMovements)) { if (s->participantId() == participantId) return s; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp index 83b613ea5..613046361 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp @@ -7,6 +7,7 @@ */ #include "ces_building_model.h" +#include #include #include @@ -103,7 +104,7 @@ bool BuildingModel::init( << ", m_refPos=" << m_refPos; - for (const InfrastructureManagement::FootprintElement &footprintElement : qAsConst(mfp.elements())) + for (const InfrastructureManagement::FootprintElement &footprintElement : std::as_const(mfp.elements())) m_footprint << QPointF(footprintElement.relPosition().offsetX(), footprintElement.relPosition().offsetY()); if (m_footprint.isEmpty()) { @@ -122,10 +123,10 @@ bool BuildingModel::init( m_height = DBL_MIN; const QMap &roomMap = rooms(); - for (const BuildingControlUnit::VWM::Room &room : qAsConst(roomMap)) - for (const BuildingControlUnit::VWM::OuterWall &outerWall : qAsConst(room.outerWalls())) - for (const BuildingControlUnit::VWM::WallElement &wallElement : qAsConst(outerWall.elements())) - for (const LtsUtils::QPoint3D &point : qAsConst(wallElement)) + for (const BuildingControlUnit::VWM::Room &room : std::as_const(roomMap)) + for (const BuildingControlUnit::VWM::OuterWall &outerWall : std::as_const(room.outerWalls())) + for (const BuildingControlUnit::VWM::WallElement &wallElement : std::as_const(outerWall.elements())) + for (const LtsUtils::QPoint3D &point : std::as_const(wallElement)) if (point.z() > m_height) m_height = point.z(); @@ -311,7 +312,7 @@ QVector BuildingModel::fromGeographic(const std::vector ret; ret.reserve(points.size()); - for (const Core::GeoPosition &point : qAsConst(points)) + for (const Core::GeoPosition &point : std::as_const(points)) ret.append(fromGeographic(point)); return ret; } @@ -326,7 +327,7 @@ std::vector BuildingModel::toGeographic(const QVector ret; ret.reserve(points.size()); - for (const LtsUtils::QPoint3D &point : qAsConst(points)) + for (const LtsUtils::QPoint3D &point : std::as_const(points)) ret.push_back(toGeographic(point)); return ret; } @@ -341,7 +342,7 @@ QVector BuildingModel::fromReference(const QVector ret; ret.reserve(points.size()); - for (const LtsUtils::QPoint3D &point : qAsConst(points)) + for (const LtsUtils::QPoint3D &point : std::as_const(points)) ret.append(fromReference(point)); return ret; } @@ -355,7 +356,7 @@ QVector BuildingModel::toReference(const QVector ret; ret.reserve(points.size()); - for (const LtsUtils::QPoint3D &point : qAsConst(points)) + for (const LtsUtils::QPoint3D &point : std::as_const(points)) ret.append(toReference(point)); return ret; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp index ce7666f9e..7e00a25b7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp @@ -7,6 +7,7 @@ */ #include "handler_aes_data.h" +#include #include #include @@ -234,7 +235,7 @@ void HandlerAesData::calculateBuildingExplosion(const AreaEffectSimulation::Char // Bounding-Box-Check // QMap m_handlerBuildingData.getFootprints(); - for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : qAsConst(footprints)) + for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : std::as_const(footprints)) { const Core::GeoPosition2D impactPosition2D(impactPosition.lon(), impactPosition.lat()); @@ -406,7 +407,7 @@ void HandlerAesData::onEffectsChanged(const AreaEffectSimulation::Effects &effec // calculate for every building of our exercise: const QHash &footprints = m_handlerBuildingData->getFootprints(); - for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : qAsConst(footprints)) + for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : std::as_const(footprints)) { calculateImpacts(effects, footprint); } @@ -493,7 +494,7 @@ void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredIm // Vulnerability should be calculated const QHash &footprints = m_handlerBuildingData->getFootprints(); - for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : qAsConst(footprints)) + for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : std::as_const(footprints)) { calculateImpacts(data, aesItemView, footprint); } // for @@ -585,7 +586,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac CentralEffectSimulation::BitfieldStates &bitfieldStates = m_bitfieldStatesBld[footprint.mseId]; QSet &bitfieldState = bitfieldStates[aesItemId]; - for (int i : qAsConst(bitfieldState)) + for (int i : std::as_const(bitfieldState)) DEBUG_LOG(m_logger) << "bitfieldState for " << aesItemId << ": " << i; for (int32_t bitFieldIdx = 0; bitFieldIdx < data.impactCount(); ++bitFieldIdx) @@ -710,7 +711,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec const std::vector &singleEffectsRef = effects.singleEffects(); int indexBitFieldIdx = -1; - for (const AreaEffectSimulation::SingleEffect &singleEffect : qAsConst(singleEffectsRef)) + for (const AreaEffectSimulation::SingleEffect &singleEffect : std::as_const(singleEffectsRef)) { ++indexBitFieldIdx; @@ -855,7 +856,7 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView & DEBUG_LOG(m_logger) << "AtBoobyTrapSecondary data.form().size()=" << data.form().size(); // BoobyTrap polyGeo.reserve(data.form().size()); - for (const auto &pointGeo : qAsConst(data.form())) + for (const auto &pointGeo : std::as_const(data.form())) { QPointF point; point.setX(pointGeo.lon()); @@ -872,7 +873,7 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView & << " exerciseId=" << exerciseId; // only include buildings within the radius - for (const int buildingId : qAsConst(buildingIdsInside)) + for (const int buildingId : std::as_const(buildingIdsInside)) { DEBUG_LOG(m_logger) << " BuildingId=" << buildingId; Buildings::Building tmpBldg; @@ -958,7 +959,7 @@ QVector HandlerAesData::findBuildingsBetween(const LtsCoordTrans::LtsCoordi // check all exercise specific footprints except our: const QHash &allFootprintsOfEx = m_handlerBuildingData->getFootprints(); buildingIdsInBetween.reserve(allFootprintsOfEx.size()); - for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprintToCheck : qAsConst(allFootprintsOfEx)) + for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprintToCheck : std::as_const(allFootprintsOfEx)) { // do not check ourself if (footprintToCheck.mseId == targetFootprint.mseId) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp index bccb626e1..eb5e80498 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp @@ -7,6 +7,7 @@ */ #include "handler_building_model.h" +#include #include @@ -321,7 +322,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel:: QPolygonF polygon2D; polygon2D.reserve(polylineRef.size()); - for (const Core::GeoPosition &geoPos : qAsConst(polylineRef)) + for (const Core::GeoPosition &geoPos : std::as_const(polylineRef)) polygon2D << QPointF(geoPos.lon(), geoPos.lat()); // Only the buildings where the line/trajectory flies over the building footprint are taken into account. @@ -332,7 +333,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel:: if (m_logger.isDebugEnabled()) { DEBUG_LOG(m_logger) << "relevantBuildings.size=" << relevantBuildings.size(); - for (const int bldgId : qAsConst(relevantBuildings)) + for (const int bldgId : std::as_const(relevantBuildings)) DEBUG_LOG(m_logger) << "relevantBuilding: bldgId = " << bldgId; } @@ -368,8 +369,8 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel:: << " , end=" << segEnd; int buildingId = -1; // for debugging purposes - //for (BuildingModel *buildingModel : qAsConst(m_buildingModels)) - for (const int bldgId : qAsConst(relevantBuildings)) + //for (BuildingModel *buildingModel : std::as_const(m_buildingModels)) + for (const int bldgId : std::as_const(relevantBuildings)) { BuildingModel *buildingModel = m_buildingModels.value(bldgId, nullptr); if (!buildingModel) @@ -487,7 +488,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel:: } // if - } // for (const int bldgId : qAsConst(relevantBuildings)) + } // for (const int bldgId : std::as_const(relevantBuildings)) } // for(lineIt = polylineRef.begin(); lineIt != polylineRef.end()-1; ++lineIt) DEBUG_LOG(m_logger) << "END getLineBuildingIntersectionInternal, request '" << request.requestId() << "'" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp index fd8544b37..e09e07982 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp @@ -7,6 +7,7 @@ */ #include "handler_contamination.h" +#include #include #include @@ -156,7 +157,7 @@ void HandlerContamination::onAesItemViewChanged(const AreaEffectSimulation::AesI bool isGroundLevel = false; const QVector &buildingIds = dtcIsm.get()->getBuildingByPolygon(exerciseId, polygonGeo, completeEnclosed, isGroundLevel); DEBUG_LOG(m_logger) << "buildingIds.size=" << buildingIds.size(); - for (int buildingId : qAsConst(buildingIds)) + for (int buildingId : std::as_const(buildingIds)) { calculateBuilding(buildingId, data, chargeHeight, chargeDepression); } @@ -192,7 +193,7 @@ void HandlerContamination::calculateBuilding(int buildingId, DEBUG_LOG(m_logger) << "buildingId=" << buildingId; effectedRooms.clear(); effectedFloors = getEffectedFloors(buildingId, chargeHeight, chargeDepression); - for (int effectedFloor : qAsConst(effectedFloors)) + for (int effectedFloor : std::as_const(effectedFloors)) effectedRooms += dtcIsm.get()->getRoomIdsFromFloorId(buildingId, effectedFloor); if (!effectedRooms.empty()) { @@ -255,7 +256,7 @@ void HandlerContamination::onBuildingStateChanged(const Buildings::BuildingState // Buildings that have been reset or decontaminated will be recontaminated as long as the nuclear weapon is still present const auto aesItemViews = m_ddsHandler->dtcAes()->aesItemViews(); - for (const auto &aesItemView : qAsConst(aesItemViews)) + for (const auto &aesItemView : std::as_const(aesItemViews)) { if (aesItemView.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated) { @@ -370,7 +371,7 @@ QVector HandlerContamination::getEffectedFloors(const int buildingId, const const QVector &floorIds = dtcIsm->getFloorIdsFromBuilding(buildingId); QVector effectedFloorIds; effectedFloorIds.reserve(floorIds.size()); - for (int floorId : qAsConst(floorIds)) + for (int floorId : std::as_const(floorIds)) { double halfFloorHeight = dtcIsm->getHalfFloorHeight(buildingId, floorId); DEBUG_LOG(m_logger) << " floorId=" << floorId @@ -451,6 +452,8 @@ bool HandlerContamination::isInsideInnerCircle(int buildingId, int aesId) DEBUG_LOG(m_logger) << "isInsideInnerCircle return false"; return false; } + // unreachable fallback (silences -Wreturn-type; macro uses a for-loop that confuses GCC control flow) + return false; } // Returns true if the building is in the inner circle at the time of impact and should fail as a result. @@ -482,6 +485,8 @@ bool HandlerContamination::isInsideBCContamination(int buildingId, int aesId) DEBUG_LOG(m_logger) << "isInsideInnerCircle return false"; return false; } + // unreachable fallback (silences -Wreturn-type; macro uses a for-loop that confuses GCC control flow) + return false; } // Returns true if the building is located in range 1 at the time of impact and is to be contaminated as a result. @@ -514,6 +519,8 @@ bool HandlerContamination::isInsideRange1(int buildingId, int aesId) DEBUG_LOG(m_logger) << "isInsideRange1 return false"; return false; } + // unreachable fallback (silences -Wreturn-type; macro uses a for-loop that confuses GCC control flow) + return false; } } // namespace CesBuildings diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp index 29c15a3fb..0ec62d82e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp @@ -7,6 +7,7 @@ */ #include "handler_aes_data.h" +#include #include "settings.h" #include @@ -181,7 +182,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos // Bounding-Box-Check // QMap m_footprints; - for (const Footprint &footprint : qAsConst(m_footprints)) + for (const Footprint &footprint : std::as_const(m_footprints)) { const QPointF impactPos(CentralEffectSimulation::geographic2Utm(data.impactPosition(), footprint.zone)); const QPolygonF polyBldgRadius({QPointF(footprint.boundingBoxPolyUtm.bottomLeft().rx() - impactRadius, @@ -304,7 +305,7 @@ void HandlerAesData::calculateFootprint(const InfrastructureManagement::MainFoot footprint.geoPosition = mse.geoPosition(); const QPointF utmFpPosition = CentralEffectSimulation::geographic2Utm(footprint.geoPosition, &footprint.zone); footprint.polyUtm.reserve(poly.size()); - for (const QPointF &point : qAsConst(poly)) + for (const QPointF &point : std::as_const(poly)) footprint.polyUtm.push_back(utmFpPosition + point); footprint.boundingBoxPolyUtm = footprint.polyUtm.boundingRect(); @@ -351,7 +352,7 @@ void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredIm } // Bounding-Box-Check // QMap m_footprints; - for (const Footprint &footprint : qAsConst(m_footprints)) + for (const Footprint &footprint : std::as_const(m_footprints)) { //if (boundingBoxImpact.contains(footprint.boundingBoxPolyUtm)) calculateImpacts(data, footprint); @@ -407,7 +408,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac BitfieldStates &bitfieldStates = m_bitfieldStatesBld[footprint.mseId]; QSet &bitfieldState = bitfieldStates[data.aesItemId()]; - for (int i : qAsConst(bitfieldState)) + for (int i : std::as_const(bitfieldState)) DEBUG_LOG(m_logger) << "bitfieldState for " << data.aesItemId() << ": " << i; const AreaEffectSimulation::AesItemView &aesItemView = *it; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp index e7a57c6f7..c39048a7e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp @@ -7,6 +7,7 @@ */ #include "handler_participant_area.h" +#include #include "settings.h" #include "CentralEffectSimulation/handler_participant.h" @@ -498,7 +499,7 @@ void HandlerParticipantArea::calculateAesParticipant(const CentralEffectSimulati return; DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantPos.participantId(); - for (const CentralEffectSimulation::AesItemViewUtm &itemView : qAsConst(m_aesItemViews)) + for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews)) { DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId; switch (itemView.aesTypeId.underlying()) @@ -837,7 +838,7 @@ void HandlerParticipantArea::onExplosionSingleCentralChanged(const AreaEffectSim const int effectType = static_cast(EffectType::ExplosionSingle) & 0xffff; const QMap buildingModels = m_handlerBuildingModel->buildingModels(); const QList participantPositions = m_handlerParticipant->positions().values(); - for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition : qAsConst(participantPositions)) + for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition : std::as_const(participantPositions)) { if (participantPosition.insideBuilding()) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.cpp index eae735baa..ea0920103 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.cpp @@ -7,6 +7,7 @@ */ #include "expand_polygon.h" +#include #include @@ -28,7 +29,7 @@ QPolygonF bufferUtmPolygon(const QPolygonF &polygonUtmIn, const int zone, const Esri::ArcGISRuntime::PolygonBuilder polygonBuilder(Esri::ArcGISRuntime::SpatialReference(32600 + zone)); DEBUG_LOG(logger) << "ExpandPolygon::bufferUtmPolygon"; - for (const QPointF &pointUtm : qAsConst(polygonUtmIn)) + for (const QPointF &pointUtm : std::as_const(polygonUtmIn)) polygonBuilder.addPoint(Esri::ArcGISRuntime::Point(pointUtm.x(), pointUtm.y(), 0)); const Esri::ArcGISRuntime::Geometry &esriGeometry = polygonBuilder.toGeometry(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp index a2f9125c8..950cb4427 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp @@ -7,6 +7,7 @@ */ #include "handler_explosions.h" +#include #include "expand_polygon.h" #include @@ -229,7 +230,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem const int remaining = 1; // ICD GUEZSB60_ICD-0052_Zentrale_Tne.doc Wirkfeldtyp Gefahrenbereich Steilfeuer const auto &participantPositions = m_handlerParticipant->positions(); - for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : qAsConst(participantPositions)) + for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions)) { if (!allParticipantIdsInArea.contains(pPos.participantId())) continue; @@ -358,7 +359,7 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect AreaEffectSimulation::ChargeStruct chargeStruct(data.chargeTypeId(),data.igniterTypeId(), data.igniterFunctionId()); const double impactRadius = m_ddsHandler->chargeTypeRadius(chargeStruct); - for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : qAsConst(participantPositions)) + for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions)) { if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number continue; @@ -555,7 +556,7 @@ void HandlerExplosions::onExplosionSingleChanged(const AreaEffectSimulation::Exp return; } - for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : qAsConst(participantPositions)) + for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions)) { if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number continue; @@ -646,7 +647,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef triggeredEffectsLtsCoord.reserve(singleEffectsRef.size()); int curSeIndex = -1; - for (const AreaEffectSimulation::SingleEffect &se : qAsConst(singleEffectsRef)) + for (const AreaEffectSimulation::SingleEffect &se : std::as_const(singleEffectsRef)) { ++curSeIndex; if (se.singleEffectState() != AreaEffectSimulation::AesSingleEffectState::SesTriggered) @@ -670,7 +671,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef // Now call calculateImpacts() (createEvent if in circle...) const auto &participantPositions = m_handlerParticipant->positions(); - for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : qAsConst(participantPositions)) + for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions)) { if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) continue; @@ -906,7 +907,7 @@ void HandlerExplosions::calculateSmartEffect(const AreaEffectSimulation::Effects bool itemAvailable = m_ddsHandler->dtcAes()->aesItemFromId(effects.aesItemId(), aesItem); if ( itemAvailable) { - for (const AreaEffectSimulation::SingleEffect &se : qAsConst(effects.singleEffects())) + for (const AreaEffectSimulation::SingleEffect &se : std::as_const(effects.singleEffects())) { DEBUG_LOG(m_logger) << LOGFUNCTION << " ---> singleEffect=" << se << ", aesItem= " << aesItem; @@ -947,7 +948,7 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId, bool bHumanFound = false; const auto &participantPositions = m_handlerParticipant->positions(); - for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition : qAsConst(participantPositions)) + for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition : std::as_const(participantPositions)) { if (m_handlerParticipant->isOutdated(participantPosition)) // Participant Position is not valid Todo Magic Number continue; @@ -1090,7 +1091,7 @@ void HandlerExplosions::calculateImpacts(const AreaEffectSimulation::TriggeredIm return; const auto &participantPositions = m_handlerParticipant->positions(); - for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : qAsConst(participantPositions)) + for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions)) { if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number continue; @@ -1120,7 +1121,7 @@ void HandlerExplosions::calculateImpacts(const CentralEffectSimulation::AesItemV DEBUG_LOG(m_logger) << "XXXXXXXXXXXX calculateImpacts2a impactsToCheck.size " << impactsToCheck.size(); - for (int bitFieldIdx : qAsConst(impactsToCheck)) + for (int bitFieldIdx : std::as_const(impactsToCheck)) { if (itemView.form.size() <= bitFieldIdx) continue; @@ -1178,7 +1179,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae DEBUG_LOG(m_logger) << "shiftedParticipantLtsCoord = " << shiftedParticipantLtsCoord.toString(true); - for (const LtsCoordinate &newTriggeredImpactLtsCoord : qAsConst(triggeredEffectsLtsCoord)) + for (const LtsCoordinate &newTriggeredImpactLtsCoord : std::as_const(triggeredEffectsLtsCoord)) { // const int zoneToUse = itemView.zone; // 2D or 3D?? @@ -1343,7 +1344,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul DEBUG_LOG(m_logger) << "calculateImpactsEffect 1 triggeredEffectsUtmPos.size " << triggeredEffectsUtmPos.size(); int idx = -1; - for (const QPointF &newTriggeredImpactUtm : qAsConst(triggeredEffectsUtmPos)) + for (const QPointF &newTriggeredImpactUtm : std::as_const(triggeredEffectsUtmPos)) { ++idx; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp index 7adc27311..cbd24b431 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp @@ -7,6 +7,7 @@ */ #include "handler_vulcano.h" +#include #include "expand_polygon.h" #include "isInCone.h" #include "settings.h" @@ -244,7 +245,7 @@ void HandlerVulcano::onTrajectoryTimeAwareTimeout() const auto &designationsVec = dpd.designations(); DEBUG_LOG(m_logger) << "onTimerTimeout participantId=" << participantId; - for (const auto &designation : qAsConst(designationsVec)) + for (const auto &designation : std::as_const(designationsVec)) { if (designation.code() == prf && designation.outputPower() > 0) { @@ -368,7 +369,7 @@ Core::GeoPosition HandlerVulcano::getTrajectoryPosFromTime(int aesId, long long Core::GeoPosition result; int i = 0; - for (const auto &point : qAsConst(trajectoryTimeAwareValue.geometry())) + for (const auto &point : std::as_const(trajectoryTimeAwareValue.geometry())) { DEBUG_LOG(m_logger) << "time=" << point.relativeTime(); if ( (point.relativeTime() > relTime) && (i > 0)) @@ -404,7 +405,7 @@ void HandlerVulcano::onDynamicParticipantChanged(const ParticipantManagement::Dy << data.designations().size(); if (data.designations().size() > 0) { - for (const ParticipantManagement::LaserDesignation &designation : qAsConst(data.designations())) + for (const ParticipantManagement::LaserDesignation &designation : std::as_const(data.designations())) { DEBUG_LOG(m_logger) << "gearId=" << designation.gearId() << " code=" << designation.code() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp index 4ebf36c67..055403f9c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp @@ -7,6 +7,7 @@ */ #include "handler_functional_area.h" +#include #include #include @@ -302,7 +303,7 @@ void HandlerFunctionalAreas::onNewParticipantPosition(const CentralEffectSimulat } DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantData.participantId(); - for (const CentralEffectSimulation::AesItemViewUtm &itemView : qAsConst(m_aesItemViews)) + for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews)) { DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId; switch (itemView.aesTypeId.underlying()) @@ -345,7 +346,7 @@ void HandlerFunctionalAreas::onNewIndoorParticipantPosition(const CentralEffectS } DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantData.participantId(); - for (const CentralEffectSimulation::AesItemViewUtm &itemView : qAsConst(m_aesItemViews)) + for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews)) { DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId; switch (itemView.aesTypeId.underlying()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp index 80e959773..18c77ffd5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp @@ -7,6 +7,7 @@ */ #include "handler_aes_data.h" +#include #include //#include "main_handler.h" #include "settings.h" @@ -135,7 +136,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos // Bounding-Box-Check // QMap m_footprints; - for (const Footprint &footprint : qAsConst(m_footprints)) + for (const Footprint &footprint : std::as_const(m_footprints)) { const QPointF impactPos(CentralEffectSimulation::geographic2Utm(data.impactPosition(), footprint.zone)); const QPolygonF polyBldgRadius({QPointF(footprint.boundingBoxPolyUtm.bottomLeft().rx() - impactRadius, @@ -258,7 +259,7 @@ void HandlerAesData::calculateFootprint(const InfrastructureManagement::MainFoot footprint.geoPosition = mse.geoPosition(); const QPointF utmFpPosition = CentralEffectSimulation::geographic2Utm(footprint.geoPosition, &footprint.zone); footprint.polyUtm.reserve(poly.size()); - for (const QPointF &point : qAsConst(poly)) + for (const QPointF &point : std::as_const(poly)) footprint.polyUtm.push_back(utmFpPosition + point); footprint.boundingBoxPolyUtm = footprint.polyUtm.boundingRect(); @@ -305,7 +306,7 @@ void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredIm } // Bounding-Box-Check // QMap m_footprints; - for (const Footprint &footprint : qAsConst(m_footprints)) + for (const Footprint &footprint : std::as_const(m_footprints)) { //if (boundingBoxImpact.contains(footprint.boundingBoxPolyUtm)) calculateImpacts(data, footprint); @@ -361,7 +362,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac BitfieldStates &bitfieldStates = m_bitfieldStatesBld[footprint.mseId]; QSet &bitfieldState = bitfieldStates[data.aesItemId()]; - for (int i : qAsConst(bitfieldState)) + for (int i : std::as_const(bitfieldState)) DEBUG_LOG(m_logger) << "bitfieldState for " << data.aesItemId() << ": " << i; const AreaEffectSimulation::AesItemView &aesItemView = *it; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp index cf3f7843d..9827aac64 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp @@ -7,6 +7,7 @@ */ #include "handler_participant_gas_pipe.h" +#include #include #include @@ -202,7 +203,7 @@ void HandlerParticipantGasPipe::onParticipantPositionChanged(const CentralEffect << " Anzahl GasPipes=" << m_gasPipes.size(); - for (const CentralEffectSimulation::AesItemViewUtm &gasPipe : qAsConst(m_gasPipes)) + for (const CentralEffectSimulation::AesItemViewUtm &gasPipe : std::as_const(m_gasPipes)) { calculateGasPipeParticipant(gasPipe, partPos); @@ -317,7 +318,7 @@ void HandlerParticipantGasPipe::onSendCesHitReply(const Core::FunctionReplyObjec void HandlerParticipantGasPipe::sendFtcCesHitRequestTimeout() { auto ftcTab = m_ddsHandler->ftcTab(); - for (const TrainingAreaBase::SendCesHitRequest &hr : qAsConst(m_requestMap)) + for (const TrainingAreaBase::SendCesHitRequest &hr : std::as_const(m_requestMap)) { DEBUG_LOG(m_logger) << "sendFtcCesHitRequestTimeout: " << hr; ftcTab->sendCesHitRequest(hr, this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/BallisticService.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/BallisticService.cpp index e9f94b282..7feca2082 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/BallisticService.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/BallisticService.cpp @@ -79,6 +79,7 @@ bool BallisticService::createInterfaceOf(IUnknown **app_interface, E_TypeOfInter } Ammunition *configuredAmmunition; + Ammunition foundAmmunition; // function-scope copy: loop-local would dangle (use-after-free) E_TypeOfImpl e_impl = e_ImplBase; DEBUG_LOG(m_logger) << "Target Interface Pointer : " << app_interface ; @@ -91,9 +92,9 @@ bool BallisticService::createInterfaceOf(IUnknown **app_interface, E_TypeOfInter QVector* ammunitions = m_ammuConfig->GetAmmunitions(); for ( int i = 0; i < ammunitions->size(); i++) { - N_Ballistic::Ammunition ammunition = m_ammuConfig->GetAmmunitions()->at(i); + foundAmmunition = m_ammuConfig->GetAmmunitions()->at(i); //find ammunition - configuredAmmunition = &ammunition; + configuredAmmunition = &foundAmmunition; DEBUG_LOG(m_logger) << "Ammunition found: " << configuredAmmunition->m_AmmunInfo.m_Name ; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp index ba2ca2b01..f57048a27 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp @@ -7,6 +7,7 @@ */ #include "handler_geopairing.h" +#include #include "settings.h" #include "GBL_ConfigSystem/geoconfig.h" #include "GeoPairingImpl/GeoPairingImpl.hpp" @@ -539,7 +540,7 @@ void HandlerGeoPairing::onSendGeopairingDataReply(const Core::FunctionReplyObjec void HandlerGeoPairing::sendFtcCesHitRequestTimeout() { auto ftcTab = m_ddsHandlerAes->ftcTab(); - for (const TrainingAreaBase::SendCesHitRequest &hr : qAsConst(m_requestMap)) + for (const TrainingAreaBase::SendCesHitRequest &hr : std::as_const(m_requestMap)) { DEBUG_LOG(m_logger) << "sendFtcCesHitRequest: " << hr; ftcTab->sendCesHitRequest(hr, this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp index 78f3b8399..9967bb09a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp @@ -7,6 +7,7 @@ */ #include "handler_mine_areas.h" +#include #include "CentralEffectSimulation/handler_participant.h" #include "settings.h" @@ -373,7 +374,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl // const QVector utmStepPoly = m_handlerParticipant->getParticipantStep(participantPos.participantId(), m_zone); - for (const CentralEffectSimulation::AesItemViewUtm &itemView : qAsConst(m_aesItemViews)) + for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews)) { int remaining = m_ddsHandler->remainingTasCode(itemView.chargeStruct); DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp index 485ce7883..9f5275c63 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp @@ -7,6 +7,7 @@ */ #include "handler_nbc.h" +#include #include #include @@ -497,7 +498,7 @@ void HandlerNBC::onNewOutdoorParticipantPosition(const CentralEffectSimulation:: DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantData.participantId() << " m_aesItemViews.size()=" << m_aesItemViews.size(); - for (const CentralEffectSimulation::AesItemViewUtm &itemView : qAsConst(m_aesItemViews)) + for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews)) { DEBUG_LOG(m_logger) << " xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.cpp index 44d32e278..02e74d75a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.cpp @@ -7,6 +7,7 @@ */ #include "handler_participant_building.h" +#include #include #include @@ -302,7 +303,7 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi void HandlerParticipantBuilding::sendFtcCesHitRequestTimeout() { auto ftcTab = m_ddsHandler->ftcTab(); - for (const TrainingAreaBase::SendCesHitRequest &hr : qAsConst(m_requestMap)) + for (const TrainingAreaBase::SendCesHitRequest &hr : std::as_const(m_requestMap)) { DEBUG_LOG(m_logger) << "sendFtcCesHitRequest: " << hr; ftcTab->sendCesHitRequest(hr, this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp index 683a8f43e..effcde26d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp @@ -7,6 +7,7 @@ */ #include "handler_participant_booby_trap.h" +#include #include @@ -502,7 +503,7 @@ void HandlerParticipantBoobyTrap::onParticipantPositionChanged(const CentralEffe return; } - for (const CentralEffectSimulation::AesItemViewUtm &boobyTrap : qAsConst(m_boobyTrapItems)) + for (const CentralEffectSimulation::AesItemViewUtm &boobyTrap : std::as_const(m_boobyTrapItems)) { if (!calculateBoobyTrapParticipant(boobyTrap, partPos)) continue; @@ -675,7 +676,7 @@ void HandlerParticipantBoobyTrap::sendFtcBoobyTrapTrigger(int aesItemId) void HandlerParticipantBoobyTrap::sendFtcCesHitRequestTimeout() { auto ftcTab = m_ddsHandler->ftcTab(); - for (const TrainingAreaBase::SendCesHitRequest &hr : qAsConst(m_requestMap)) + for (const TrainingAreaBase::SendCesHitRequest &hr : std::as_const(m_requestMap)) { DEBUG_LOG(m_logger) << "sendFtcCesHitRequestTimeout: " << hr; ftcTab->sendCesHitRequest(hr, this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp index f382cc457..e68b6ac37 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp @@ -7,6 +7,7 @@ */ #include "handler_participant_off_route_mine.h" +#include #include @@ -346,7 +347,7 @@ void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralE return; } - for (const CentralEffectSimulation::AesItemViewUtm &offRouteMine : qAsConst(m_offRouteMineItems)) + for (const CentralEffectSimulation::AesItemViewUtm &offRouteMine : std::as_const(m_offRouteMineItems)) { calculateOffRouteMineParticipant(offRouteMine, partPos); @@ -518,7 +519,7 @@ void HandlerParticipantOffRouteMine::sendFtcOffRouteMineTrigger(int aesItemId) void HandlerParticipantOffRouteMine::sendFtcCesHitRequestTimeout() { auto ftcTab = m_ddsHandler->ftcTab(); - for (const TrainingAreaBase::SendCesHitRequest &hr : qAsConst(m_requestMap)) + for (const TrainingAreaBase::SendCesHitRequest &hr : std::as_const(m_requestMap)) { DEBUG_LOG(m_logger) << "sendFtcCesHitRequestTimeout: " << hr; ftcTab->sendCesHitRequest(hr, this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp index d0b22992d..42543eca7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp @@ -7,6 +7,7 @@ */ #include "handler_building_data.h" +#include #include "settings.h" #include "handler_participant.h" #include @@ -78,7 +79,7 @@ void HandlerBuildingData::onMainStructureElementChanged(const InfrastructureMana m_mainStructureElements.insert(data.id, data); DEBUG_LOG(m_logger) << "Got MainStructureElement: " << data; - for (const InfrastructureManagement::StructureElement &ele : qAsConst(data.elements)) + for (const InfrastructureManagement::StructureElement &ele : std::as_const(data.elements)) { if (ele.structureElementTypeId == InfrastructureManagement::StructureElementType::Room) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.cpp index d25d6bd65..3e76e371d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.cpp @@ -7,6 +7,7 @@ */ #include "handler_codification_data.h" +#include #include "object_codification_data.h" using namespace CodificationManagement; @@ -39,7 +40,7 @@ bool HandlerCodificationData::init() } // create objects - for (const Database::CodCodificationTable &data : qAsConst(dataVec)) + for (const Database::CodCodificationTable &data : std::as_const(dataVec)) { CodificationManagement::CodificationData ddsData = ObjectCodificationData::toDdsData(data); ObjectCodificationData *ifs(new ObjectCodificationData(m_ddsHandler, m_dbHandler)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp index e317bd602..0a4902b09 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp @@ -7,6 +7,7 @@ */ #include "handler_effect_show.h" +#include #include "handler_ppm_data.h" #include "handler_tab_data.h" #include "handler_mdm_data.h" @@ -610,7 +611,7 @@ void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract) //------------------------------------------------------------------------------- void HandlerEffectShow::updateEffectShowsRelatedToMineArea(const AreaEffectSimulation::MineArea &data) { - for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap)) + for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap)) { if (obj->getIdAES() == data.id) { @@ -624,7 +625,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToMineArea(const AreaEffectSimul //------------------------------------------------------------------------------- void HandlerEffectShow::updateEffectShowsRelatedToExplosionArea(const AreaEffectSimulation::ExplosionArea &data) { - for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap)) + for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap)) { if (obj->getIdAES() == data.id) { @@ -638,7 +639,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToExplosionArea(const AreaEffect void HandlerEffectShow::updateEffectShowsRelatedToExplosionCluster(const AreaEffectSimulation::ExplosionCluster &data) { - for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap)) + for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap)) { if (obj->getIdAES() == data.id) { @@ -652,7 +653,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToExplosionCluster(const AreaEff void HandlerEffectShow::updateEffectShowsRelatedToEffectCluster(const AreaEffectSimulation::EffectCluster &data) { - for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap)) + for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap)) { if (obj->getIdAES() == data.id) { @@ -726,7 +727,7 @@ void HandlerEffectShow::modifyEffectShows(const QVector //------------------------------------------------------------------------------- void HandlerEffectShow::updateEffectShowOrdersRelatedToAes(int idAes) { - for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap)) + for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap)) { if (obj->getIdAES() == idAes) triggerEffectShowOrder(obj); @@ -735,7 +736,7 @@ void HandlerEffectShow::updateEffectShowOrdersRelatedToAes(int idAes) //------------------------------------------------------------------------------- void HandlerEffectShow::pauseEffectShowsRelatedToAes(int idAes) { - for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap)) + for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap)) { if (obj->getIdAES() == idAes) triggerEffectShowStop(obj); @@ -744,7 +745,7 @@ void HandlerEffectShow::pauseEffectShowsRelatedToAes(int idAes) //------------------------------------------------------------------------------- void HandlerEffectShow::continueEffectShowsRelatedToAes(int idAes) { - for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap)) + for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap)) { if (obj->getIdAES() == idAes) triggerEffectShowContinue(obj); @@ -891,7 +892,7 @@ void HandlerEffectShow::triggerMeteoData(const ObjectEffectShow *ifs) //----------------------------------------------------------------------------- void HandlerEffectShow::onSendMeteoData() { - for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap)) + for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap)) { const Database::EsmEffectShow &effectShow = obj->getData(); if (effectShow.esmParticipantId == -1) @@ -909,7 +910,7 @@ void HandlerEffectShow::onCleanUp() { DEBUG_LOG(m_logger) << "Start Cleanup "; QVector objects; - for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap)) + for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap)) { const Database::EsmEffectShow &effectShow = obj->getData(); if (effectShow.orderConfirmation == static_cast(OrderConfirmation_e::OrderCarriedOut) || effectShow.startTime <= 0 || effectShow.id <= 0) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.cpp index 4309438cd..e94f53a38 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.cpp @@ -6,6 +6,7 @@ */ #include "handler_mdm_data.h" +#include #include "initialization.h" #include #include "settings.h" @@ -49,7 +50,7 @@ bool HandlerMdmData::getNearestWeather(const Core::GeoPosition2D &pos, double nearestDistanceSquared = std::numeric_limits::max(); bool found = false; - for (const auto &md : qAsConst(m_meteoData)) + for (const auto &md : std::as_const(m_meteoData)) { if (md.isStaticMeteoData) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp index 78b4f18e0..8e8344173 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp @@ -6,6 +6,7 @@ */ #include "handler_san_nine_liner.h" +#include #include "object_san_nine_liner.h" #include "object_san_category_line.h" #include "san_category_line_json.h" @@ -75,7 +76,7 @@ bool HandlerSanNineLiner::init() } // publish - for (ObjectSanNineLiner *objSan : qAsConst(m_mapObjectSanNineLiner)) + for (ObjectSanNineLiner *objSan : std::as_const(m_mapObjectSanNineLiner)) objSan->onPublishData(); return true; @@ -142,7 +143,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde QVector linesCategory = SanCategoryLine::fromJson(request.lines, data.id); INFO_LOG(m_logger) << "LinesCategory count: " << linesCategory.count(); - for (Database::SanCategoryLine cl : qAsConst(linesCategory)) + for (Database::SanCategoryLine cl : std::as_const(linesCategory)) { ObjectSanCategoryLine *ifsCl(new ObjectSanCategoryLine(m_ddsHandler, m_db)); ret = ifsCl->createObject(cl); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.cpp index 0c0528a69..d8bf042f0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.cpp @@ -6,6 +6,7 @@ */ #include "object_criterium.h" +#include #include "object_evaluation_element.h" namespace Evaluations @@ -55,7 +56,7 @@ Core::FunctionReplyObject ObjectCriterium::removeObject() if (!m_db->removeEvlCriterium(m_data.id)) return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "EvlCriterium with id %1 can not be removed")).arg(m_data.id); - for (ObjectEvaluationElement *oee : qAsConst(m_elementsMap)) + for (ObjectEvaluationElement *oee : std::as_const(m_elementsMap)) oee->removeObject(); qDeleteAll(m_elementsMap); m_elementsMap.clear(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp index 54b54261f..b4610a0ea 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp @@ -6,6 +6,7 @@ */ #include "san_category_line_json.h" +#include #include #include @@ -54,7 +55,7 @@ QVector SanCategoryLine::fromJson(const std::string & QJsonDocument SanCategoryLine::toJson(std::vector vecCategoryLines) { QJsonArray arr; - for (const Database::SanCategoryLine &cl : qAsConst(vecCategoryLines)) + for (const Database::SanCategoryLine &cl : std::as_const(vecCategoryLines)) { QJsonObject obj; obj[QStringLiteral("id")] = cl.id; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp index 3e98bfa49..51fa7b0ef 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp @@ -7,6 +7,7 @@ */ #include "web_socket_handler.h" +#include #include #include @@ -32,7 +33,7 @@ WebSocketHandler::WebSocketHandler(QObject *parent) WebSocketHandler::~WebSocketHandler() { - for (auto s : qAsConst(m_webSockets)) + for (auto s : std::as_const(m_webSockets)) { s->disconnect(this); s->close(); @@ -64,7 +65,7 @@ bool WebSocketHandler::sendTelegram(const QString &jsonStr) ERROR_LOG(m_logger) << "jsonStr" << jsonStr; bool bOk = false; - for (QWebSocket *ws : qAsConst(m_webSockets)) + for (QWebSocket *ws : std::as_const(m_webSockets)) { if (ws->sendTextMessage(jsonStr)) bOk = true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp index d45f1b584..412ace7e4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp @@ -7,6 +7,7 @@ */ #include "handler_dynamic_participant_data.h" +#include #include #include @@ -177,6 +178,7 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData, case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization: case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout: return; + default: break; } QJsonObject obj; @@ -528,7 +530,7 @@ void HandlerDynamicParticipantData::onBuildingStateChanged(const Buildings::Buil for (const auto &cs: data.contaminationStates) { QJsonArray roomArr; - for (const auto &roomId : qAsConst(cs.rooms)) + for (const auto &roomId : std::as_const(cs.rooms)) roomArr.append(QJsonValue(roomId)); contaminationArr.append(QJsonObject({{QStringLiteral("aesId") , cs.aesId}, diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp index 54c32f993..9d51d6f90 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp @@ -8,6 +8,7 @@ #include "web_socket_avs.h" +#include #include "web_socket_server.h" #include "main_handler.h" #include "settings.h" @@ -388,7 +389,7 @@ void WebSocketAvs::openWebSocket() DEBUG_LOG(m_logger) << "openWebSocket"; closeWebSocket(); m_wsSocket = new QWebSocket; - connect(m_wsSocket, QOverload::of(&QWebSocket::error), + connect(m_wsSocket, &QWebSocket::errorOccurred, this, &WebSocketAvs::onWebSocketError); connect(m_wsSocket, &QWebSocket::connected, this, &WebSocketAvs::onWebSocketConnected); @@ -564,7 +565,7 @@ void WebSocketAvs::onCleanUpDbInternal() } - for (const AvsData &oldEntry : qAsConst(ntpRangeSortLocal)) + for (const AvsData &oldEntry : std::as_const(ntpRangeSortLocal)) { const auto &item = collection.value(oldEntry.eventTime); @@ -680,7 +681,7 @@ QMap> WebSocketAvs::getAllInternalDbData() //qCritical() << "END select reading internal db "; DEBUG_LOG(m_logger) << "START Sync read local DB at " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString(); int j = 0; - for (const auto &dataI : qAsConst(dataVec)) + for (const auto &dataI : std::as_const(dataVec)) { if (m_lastUpdate > 0 && dataI.sampleTime < m_lastUpdate) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp index a36e5c59a..defffe8f9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp @@ -8,6 +8,7 @@ #include "web_socket_server.h" +#include #include #include @@ -34,7 +35,7 @@ WebSocketEventServer::WebSocketEventServer(const QSqlDatabase &db, QObject *pare WebSocketEventServer::~WebSocketEventServer() { - for (auto s : qAsConst(m_liveSockets)) + for (auto s : std::as_const(m_liveSockets)) { s->disconnect(this); s->close(); @@ -83,7 +84,7 @@ void WebSocketEventServer::sendEvent(const QJsonObject &obj) { const QJsonDocument doc(obj); const QString msg = QString::fromUtf8(doc.toJson(QJsonDocument::Compact)); - for (QWebSocket *ws : qAsConst(m_liveSockets)) + for (QWebSocket *ws : std::as_const(m_liveSockets)) ws->sendTextMessage(msg); m_liveHistory[time(nullptr)].push_back(msg); } @@ -104,7 +105,7 @@ void WebSocketEventServer::onNewConnection() { connect(ws, &QWebSocket::disconnected, this, &WebSocketEventServer::onSocketDisconnected); - for (const auto &historyVec : qAsConst(m_liveHistory)) + for (const auto &historyVec : std::as_const(m_liveHistory)) { for (const auto &msg : historyVec) ws->sendTextMessage(msg); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.cpp index 28d649620..f310fd16e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.cpp @@ -7,6 +7,7 @@ */ #include "exercise_state_machine.h" +#include #include "exercise_state_manager.h" #include "exercise_state_base.h" @@ -77,7 +78,7 @@ ExerciseStateMachine::ExerciseStateMachine(ObjectExercise* objExe, QObject *pare // ---------------------------------------------------------------------------------------------------------- //States zur StateMachine hinzufügen - for (ExerciseStateBase *state : qAsConst(m_exerciseStates)) + for (ExerciseStateBase *state : std::as_const(m_exerciseStates)) { DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": state: " << state->exerciseState(); m_stateMachine->addState(state); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp index 1d4092043..797810035 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp @@ -7,6 +7,7 @@ */ #include "handler_exercise.h" +#include #include "exm_db.h" #include "handler_exercise_phase.h" #include "main_handler.h" @@ -70,7 +71,7 @@ bool HandlerExercise::init() QVector> exerciseStates; exerciseStates.reserve(dataVec.size()); // create exercise objects - for (const Database::ExmExercise &data : qAsConst(dataVec)) + for (const Database::ExmExercise &data : std::as_const(dataVec)) { ObjectExercise *ifs(new ObjectExercise(m_ddsHandler, m_db, m_exTblGen, this)); Core::FunctionReplyObject ret = ifs->createObject(data); @@ -106,7 +107,7 @@ bool HandlerExercise::init() return a.first < b.first; }); - for (const auto &p : qAsConst(exerciseStates)) + for (const auto &p : std::as_const(exerciseStates)) m_exercisesToStart.enqueue(p.first); m_startupExerciseTimer->start(); @@ -211,7 +212,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseCreateRequest(const ExerciseC int iCnt = 0; QSet linkedExerciseIds; - for (const ObjectExercise *ex : qAsConst(m_exeObjMap)) + for (const ObjectExercise *ex : std::as_const(m_exeObjMap)) { const auto state = ex->exerciseState(); @@ -313,7 +314,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseM int iCntRunningExercises = 0; QSet linkedExerciseIds; - for (const ObjectExercise *ex : qAsConst(m_exeObjMap)) + for (const ObjectExercise *ex : std::as_const(m_exeObjMap)) { const auto state = ex->exerciseState(); @@ -350,7 +351,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseM if (request.newState == ExerciseState::Stopped) { int iCnt = 0; - for (const ObjectExercise *ex : qAsConst(m_exeObjMap)) + for (const ObjectExercise *ex : std::as_const(m_exeObjMap)) { const auto state = ex->exerciseState(); if (ex->id() != request.id && state == ExerciseState::Stopped) @@ -365,7 +366,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseM request.newState == ExerciseState::Paused)) { int iCnt = 0; - for (const ObjectExercise *ex : qAsConst(m_exeObjMap)) + for (const ObjectExercise *ex : std::as_const(m_exeObjMap)) { if (ex->id() != request.id && ex->data().hasHlaInterface && (ex->exerciseState() == ExerciseState::Started || ex->exerciseState() == ExerciseState::Paused)) @@ -730,7 +731,7 @@ bool HandlerExercise::checkEquipmentNumbersOnAllExercises(int exerciseIdToBeStar (ifs->exerciseState() == ExerciseState::Paused)) { const std::vector &mapping = equipmentExerciseMapping.mapping; - for (const auto &eq2p : qAsConst(mapping)) + for (const auto &eq2p : std::as_const(mapping)) if (eqNoForEx.contains(eq2p.equipmentNumber)) { DEBUG_LOG(m_logger) << LOGFUNCTION << " !!! eq = " << eq2p.equipmentNumber << " is already used in exercise =" << exerciseId; @@ -811,7 +812,7 @@ QStringList HandlerExercise::doubleChannels(int exerciseAId, int exerciseBId) co doubleChannelNames.reserve(exerciseAChannelIds.size()); - for (int exerciseAChannelId : qAsConst(exerciseAChannelIds)) + for (int exerciseAChannelId : std::as_const(exerciseAChannelIds)) { if (exerciseBChannelIds.contains(exerciseAChannelId)) doubleChannelNames.append(QString::fromStdString(m_ddsHandler->avmDtc()->cnrChannel(exerciseAChannelId).name)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp index 19a1300c2..5948f737b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp @@ -11,6 +11,7 @@ */ #include "flm_tests.h" +#include #include #include @@ -690,7 +691,7 @@ void FlmTests::tryGetAllTemplates() } DEBUG_LOG(m_logger) << "Found " << allTemplates.size() << " templates"; - for (const FileContent &fc : qAsConst(allTemplates)) + for (const FileContent &fc : std::as_const(allTemplates)) DEBUG_LOG(m_logger) << "Found template (id, name) = (" << fc.id << ", " << fc.name << ")"; QTest::qWait(1000); @@ -710,7 +711,7 @@ void FlmTests::tryGetAllPlans() } DEBUG_LOG(m_logger) << "Found " << allPlans.size() << " plans"; - for (const QString &plan : qAsConst(allPlans)) + for (const QString &plan : std::as_const(allPlans)) DEBUG_LOG(m_logger) << "Found plan = " << plan; QTest::qWait(1000); @@ -730,7 +731,7 @@ void FlmTests::tryGetAllFavs() } DEBUG_LOG(m_logger) << "Found " << allFavs.size() << " favs"; - for (const QString &fav : qAsConst(allFavs)) + for (const QString &fav : std::as_const(allFavs)) DEBUG_LOG(m_logger) << "Found fav = " << fav; QTest::qWait(1000); @@ -750,7 +751,7 @@ void FlmTests::tryGetAllSymbols() } DEBUG_LOG(m_logger) << "Found " << allSymbols.size() << " symbols"; - for (const QString &symbol : qAsConst(allSymbols)) + for (const QString &symbol : std::as_const(allSymbols)) DEBUG_LOG(m_logger) << "Found symbol = " << symbol; QTest::qWait(1000); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp index f8125609b..740307111 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp @@ -1,4 +1,5 @@ #include "thp_script_httq.h" +#include #include "logger.h" #include @@ -162,7 +163,7 @@ ThpScriptServer::ThpScriptServer(QObject *parent) } - connect(cli, QOverload::of(&QWebSocket::error), + connect(cli, &QWebSocket::errorOccurred, this, [cli]() { cli->deleteLater(); @@ -348,7 +349,7 @@ void ThpScriptServer::changeList(const ThpServerInformation &tsi, httq::HttpRequ QVector tsiArray; tsiArray.reserve(arr.size() + 1); - for (const QJsonValue &val : qAsConst(arr)) + for (const QJsonValue &val : std::as_const(arr)) { ThpServerInformation tsix(fromJson(val)); if (tsix.scriptId == tsi.scriptId && tsix.exerciseId == tsi.exerciseId) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp index f4a93b651..c8e0d7818 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp @@ -7,6 +7,7 @@ */ #include "handler_ied.h" +#include #include "object_ied.h" #include "main_handler.h" #include "gim_db.h" @@ -75,7 +76,7 @@ bool HandlerIed::init() } // create Ied objects - for (const Database::GimIed &data : qAsConst(dataVec)) + for (const Database::GimIed &data : std::as_const(dataVec)) { ObjectIed *ifs(new ObjectIed(m_ddsHandler, m_db, m_ppmDtc, this)); Core::FunctionReplyObject ret = ifs->createObject(data); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp index 009263a33..115f634f2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp @@ -8,6 +8,7 @@ */ #include "ism_tests.h" +#include #include #include @@ -1052,7 +1053,7 @@ void IsmTests::checkSchedule() else { ERROR_LOG(m_logger) << "Instrumentation plan not complete !!!"; - for (const MountingPointPlan &mpp : qAsConst(diff)) + for (const MountingPointPlan &mpp : std::as_const(diff)) ERROR_LOG(m_logger) << "Diff - # mpp.structureElementId() = " << mpp.structureElementId; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.cpp index 696d67754..eb7343637 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.cpp @@ -8,6 +8,7 @@ */ #include "handler_effect_area.h" +#include #include "handler_main_structure_element.h" #include "handler_mounting_point_asset.h" #include "object_main_structure_element.h" @@ -41,7 +42,7 @@ HandlerEffectArea::~HandlerEffectArea() bool HandlerEffectArea::init() { const QHash &objMseMap = m_mainHandler->getHandlerMainStructureElement()->getMainStructureElementsMap(); - for (const auto &objMse : qAsConst(objMseMap)) + for (const auto &objMse : std::as_const(objMseMap)) { ObjectEffectArea *effectAreaObj = createEffectAreaForMse(objMse->getData()); if (effectAreaObj) @@ -51,7 +52,7 @@ bool HandlerEffectArea::init() if (m_logger.isDebugEnabled()) { DEBUG_LOG(m_logger) << "number of EffectAreas: " << m_objectEffectAreaMap.size(); - for (const auto &EffectAreaObj : qAsConst(m_objectEffectAreaMap)) + for (const auto &EffectAreaObj : std::as_const(m_objectEffectAreaMap)) DEBUG_LOG(m_logger) << "EffectArea ID: " << EffectAreaObj->getId() << " | area EGCU ID: " << EffectAreaObj->getAreaEgcuId(); } @@ -128,7 +129,7 @@ std::vector HandlerEffectArea::egcuIdsFromJsonObject(const QJsonObject const QJsonArray &egcuMountPoints = jsonObj.value(QStringLiteral("egcuMountpoints")).toArray(); // qAsConst does not work with r-value DEBUG_LOG(m_logger) << "egcuMountPoints.size=" << egcuMountPoints.size(); - for (const auto &egcuMountPnt : qAsConst(egcuMountPoints)) + for (const auto &egcuMountPnt : std::as_const(egcuMountPoints)) { QJsonObject element = egcuMountPnt.toObject(); int mountingPointId = element.value(QStringLiteral("id")).toInt(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp index 53147f4bb..8f018ada8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp @@ -8,6 +8,7 @@ */ #include "handler_main_structure_element.h" +#include #include "handler_mounting_point_asset.h" #include "handler_instrumentation_asset.h" #include "object_main_structure_element.h" @@ -66,7 +67,7 @@ bool HandlerMainStructureElement::init() std::sort(dataVecSE.begin(), dataVecSE.end(), sortSE); // create MSE objects - for (const Database::IsmMainStructureElement &dbData : qAsConst(dataVec)) + for (const Database::IsmMainStructureElement &dbData : std::as_const(dataVec)) { ObjectMainStructureElement *ifs(new ObjectMainStructureElement(dbData, m_mainHandler)); m_objectMainStructureElementMap.insert(ifs->getId(), ifs); @@ -74,7 +75,7 @@ bool HandlerMainStructureElement::init() DEBUG_LOG(m_logger) << "m_objectMainStructureElementMap.size() = " << m_objectMainStructureElementMap.size(); // create SE objects, add them to MSE - for (const Database::IsmStructureElement &dbData : qAsConst(dataVecSE)) + for (const Database::IsmStructureElement &dbData : std::as_const(dataVecSE)) { ObjectMainStructureElement *objMse = m_objectMainStructureElementMap.value(dbData.mainStructureElementId); if (!objMse || !objMse->isValid()) @@ -93,7 +94,7 @@ bool HandlerMainStructureElement::init() } // add structure elements to global map for lookup (e.g. in 'add Footprints to MSE objects') - for (ObjectMainStructureElement *objMse : qAsConst(m_objectMainStructureElementMap)) + for (ObjectMainStructureElement *objMse : std::as_const(m_objectMainStructureElementMap)) m_objectStructureElementMap.unite(objMse->getStructureElements()); // add Footprints to MSE objects @@ -111,7 +112,7 @@ bool HandlerMainStructureElement::init() } } - for (const QMap &cont : qAsConst(footprintSorted)) + for (const QMap &cont : std::as_const(footprintSorted)) { if (cont.empty()) continue; @@ -581,7 +582,7 @@ void HandlerMainStructureElement::onExerciseStateChanged(const ExerciseManagemen if (data.state != ExerciseManagement::ExerciseState::Terminated) return; - for (auto mseObj : qAsConst(m_objectMainStructureElementMap)) + for (auto mseObj : std::as_const(m_objectMainStructureElementMap)) { const MainStructureElement &mse = mseObj->getData(); QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromStdString(mse.properties)).object(); @@ -601,7 +602,7 @@ void HandlerMainStructureElement::onExerciseStateChanged(const ExerciseManagemen modReq.modelId = mse.modelId; modReq.name = mse.name; std::vector resElements; - for (auto element : qAsConst(mse.elements)) + for (auto element : std::as_const(mse.elements)) { QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(element.properties)); QJsonObject objEle = doc.object(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom.cpp index 0a27e50f2..0d3dd4a4c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom.cpp @@ -8,6 +8,7 @@ */ #include "ism_dtc_impl_custom.h" +#include #include "ism_dtc_impl_custom_p.h" #include @@ -818,7 +819,7 @@ QPolygonF DtcImplCustom::getUtmFootprintById(int mseId, int &zoneOut, bool isGro // QPolygonF poly; // poly.reserve(mfElements.size()); // DEBUG_LOG(m_logger) << "mseId: " << mseId << " isGroundLevel: " << isGroundLevel; -// for (const InfrastructureManagement::FootprintElement &element : qAsConst(mfElements)) +// for (const InfrastructureManagement::FootprintElement &element : std::as_const(mfElements)) // { // // maybe this is easier? // // // if different, continue @@ -839,7 +840,7 @@ QPolygonF DtcImplCustom::getUtmFootprintById(int mseId, int &zoneOut, bool isGro // // Get other footprint if groundLevel footprint is not available // if (poly.isEmpty() && isGroundLevel) // { -// for (const InfrastructureManagement::FootprintElement &element : qAsConst(mfElements)) +// for (const InfrastructureManagement::FootprintElement &element : std::as_const(mfElements)) // { // const auto &relPos = element.relPosition(); // poly.push_back(QPointF(relPos.offsetX(), relPos.offsetY())); @@ -857,7 +858,7 @@ QPolygonF DtcImplCustom::getUtmFootprintById(int mseId, int &zoneOut, bool isGro // QPolygonF retPolyUtm; // retPolyUtm.reserve(poly.size()); -// for (const QPointF &point : qAsConst(poly)) +// for (const QPointF &point : std::as_const(poly)) // { // const QPointF finalUtmPoint(utmFpPosition + point); // retPolyUtm.push_back(finalUtmPoint); @@ -883,7 +884,7 @@ QVector DtcImplCustom::getBuildingByPolygon(int exerciseId, const QPolygon // Convert Form to UTM int zone = -1; - for (const QPointF &point : qAsConst(polygon)) + for (const QPointF &point : std::as_const(polygon)) { auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(point, zone); DEBUG_LOG(m_logger) << "geo=" << point.x() << "/" << point.y() @@ -912,7 +913,7 @@ QVector DtcImplCustom::getBuildingByPolygon(int exerciseId, const QPolygon if (completeEnclosed) { const QPolygonF &footprintPolygonRef = footprintPolygon.value(); - for (const QPointF &fpPoint : qAsConst(footprintPolygonRef)) + for (const QPointF &fpPoint : std::as_const(footprintPolygonRef)) { if (!polygonUtm.containsPoint(fpPoint, Qt::OddEvenFill)) { @@ -949,7 +950,7 @@ int DtcImplCustom::getSurroundingBuildingByPolygon(int exerciseId, const QPolygo // Convert Form to UTM int zone = -1; - for (const QPointF &point : qAsConst(polygon)) + for (const QPointF &point : std::as_const(polygon)) { auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(point, zone); DEBUG_LOG(m_logger) << "geo=" << point.x() << "/" << point.y() @@ -976,7 +977,7 @@ int DtcImplCustom::getSurroundingBuildingByPolygon(int exerciseId, const QPolygo DEBUG_LOG(m_logger) << "getBuildingByPolygon Append Building id=" << footprintPolygon.key(); if (completeEnclosed) { - for (const QPointF &fpPoint : qAsConst(polygonUtm)) + for (const QPointF &fpPoint : std::as_const(polygonUtm)) { if (!footprintPolygon.value().containsPoint(fpPoint, Qt::OddEvenFill)) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom_p.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom_p.h index 86f72dcbf..9b361b5ed 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom_p.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom_p.h @@ -9,6 +9,7 @@ #pragma once #include "ism_dtc_impl_custom.h" +#include #include #include @@ -66,7 +67,7 @@ public: const std::vector &mfElements = mf.elements; QPolygonF poly; poly.reserve(mfElements.size()); - for (const InfrastructureManagement::FootprintElement &element : qAsConst(mfElements)) + for (const InfrastructureManagement::FootprintElement &element : std::as_const(mfElements)) { // if different, continue if (isGroundLevel != element.isGroundLevel) @@ -78,7 +79,7 @@ public: // Get other footprint if groundLevel footprint is not available if (poly.isEmpty() && isGroundLevel) { - for (const InfrastructureManagement::FootprintElement &element : qAsConst(mfElements)) + for (const InfrastructureManagement::FootprintElement &element : std::as_const(mfElements)) { const auto &relPos = element.relPosition; poly.push_back(QPointF(relPos.offsetX, relPos.offsetY)); @@ -99,7 +100,7 @@ public: // QPolygonF retPolyUtm; // retPolyUtm.reserve(poly.size()); - // for (const QPointF &point : qAsConst(poly)) + // for (const QPointF &point : std::as_const(poly)) // { // const QPointF finalUtmPoint(utmFpPosition + point); // retPolyUtm.push_back(finalUtmPoint); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp index 6c3985449..964fa3c78 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp @@ -8,6 +8,7 @@ */ #include "object_main_structure_element.h" +#include #include "handler_main_structure_element.h" #include "object_structure_element.h" #include "main_handler.h" @@ -439,7 +440,7 @@ Core::FunctionReplyObject ObjectMainStructureElement::updateObject(const MainStr m_mainHandler->getHandlerMainStructureElement()->removedStructureElements(oldStructureElements); m_mainHandler->getHandlerMainStructureElement()->addedStructureElements(m_objectStructureElements); QMap newObjectStructureElements; - for (ObjectStructureElement *ose : qAsConst(m_objectStructureElements)) + for (ObjectStructureElement *ose : std::as_const(m_objectStructureElements)) { // only delete the old ones // and also not the one for the mse and bcu @@ -488,7 +489,7 @@ Core::FunctionReplyObject ObjectMainStructureElement::removeObject() dts()->removeMainStructureElementByKey(m_data.id); dts()->removeMainFootprintByKey(m_footprint.id); - for (ObjectStructureElement *ose : qAsConst(m_objectStructureElements)) + for (ObjectStructureElement *ose : std::as_const(m_objectStructureElements)) { ose->removeObject(); delete ose; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.cpp index 8a53a3de8..8a38236cc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.cpp @@ -8,6 +8,7 @@ */ #include "object_special_area.h" +#include #include #include @@ -89,7 +90,7 @@ SpecialArea ObjectSpecialArea::toDdsData(const Database::IsmSpecialArea &dbData) QPolygonF tmp; tmp.reserve(ddsData.polygon.size()); - for (const Core::GeoPosition2D &pos : qAsConst(ddsData.polygon)) + for (const Core::GeoPosition2D &pos : std::as_const(ddsData.polygon)) tmp.push_back(QPointF(pos.lon, pos.lat)); QRectF boundingBox = tmp.boundingRect(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp index a56abead3..92a25498d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp @@ -332,10 +332,9 @@ QDomDocument ParseBuildingXml::openXml(const QString &fileName) const // read Xml file QDomDocument metaDoc; - int errLine = 0, errColumn = 0; - QString err; - if (!metaDoc.setContent(&f, &err, &errLine, &errColumn)) - throw XmlImportException(tr("Error parsing file content: %1 at %2.%3").arg(err).arg(errLine).arg(errColumn)); + const auto parseResult = metaDoc.setContent(&f); + if (!parseResult) + throw XmlImportException(tr("Error parsing file content: %1 at %2.%3").arg(parseResult.errorMessage).arg(int(parseResult.errorLine)).arg(int(parseResult.errorColumn))); // close metaFile f.close(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.cpp index 34453321c..5bcbe6abd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.cpp @@ -7,6 +7,7 @@ */ #include "schedule_status_state_machine.h" +#include #include "schedule_status_manager.h" #include "schedule_status_base.h" @@ -74,7 +75,7 @@ ScheduleStatusMachine::ScheduleStatusMachine(ObjectMainSchedule* objSchedule, QO // ---------------------------------------------------------------------------------------------------------- //States zur StateMachine hinzufügen - for (ScheduleStatusBase *state : qAsConst(m_ScheduleStatuses)) + for (ScheduleStatusBase *state : std::as_const(m_ScheduleStatuses)) { DEBUG_LOG(m_logger) << "Schedule " << scheduleId() << ": state: " << state->scheduleStatus(); m_stateMachine->addState(state); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.cpp index 66acdccb1..a132b77b8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.cpp @@ -7,6 +7,7 @@ */ #include "handler_marker.h" +#include #include "object_marker.h" #include "dds_handler.h" @@ -51,7 +52,7 @@ bool HandlerMarker::init() // alle Descriptions zu der Marke eintragen // TODO: select descBymarkerId - for (const Database::MrkMarkerDescription &desc : qAsConst(dataDescriptionVec)) + for (const Database::MrkMarkerDescription &desc : std::as_const(dataDescriptionVec)) { if (desc.markerId == ddsMoData.id) ddsMoData.descriptions.push_back(ObjectMarker::toDdsData(desc)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.cpp index 1ec69966f..861d8b9a1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.cpp @@ -95,7 +95,6 @@ void SocketHandler::reconnectTimerSlot() void SocketHandler::readyRead() { - bool hasData = true; INFO_LOG(m_logger) << "Reading..."; // QByteArray ba = socket->readDatagram(); @@ -123,6 +122,7 @@ void SocketHandler::readyRead() void SocketHandler::onTurnRadioMasterOffRequest(const rti::core::SampleIdentity &cookie, const TurnRadioMasterOffRequest &request) { + Q_UNUSED(request); //patric: Du hattest den Reply 端berschrieben nicht den Request ;) Core::FunctionReplyObject reply; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.cpp index a5b26697b..d3393b0c5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.cpp @@ -7,6 +7,7 @@ */ #include "handler_notification.h" +#include #include "object_notification.h" #include "dds_handler.h" #include "settings.h" @@ -64,7 +65,7 @@ bool HandlerNotification::init() } // alle Addressen zu der NomNotification eintragen - for (const Database::NomAddress &addr : qAsConst(dataAddressVec)) + for (const Database::NomAddress &addr : std::as_const(dataAddressVec)) { if (addr.notificationId == notif.id) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp index d8dc611d9..a2ab01756 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp @@ -7,6 +7,7 @@ */ #include "object_notification.h" +#include #include "dds_handler.h" #include @@ -96,7 +97,7 @@ QString ObjectNotification::contentArgsToJson() int i = 1; QJsonArray jsonArray; - for (const std::string& arg : qAsConst(m_dataNotificationObject.contentArgs)) + for (const std::string& arg : std::as_const(m_dataNotificationObject.contentArgs)) { DEBUG_LOG(m_logger) << ".arg() ersetzt immer den kleinsten freien Platzhalter" << ", arg=" << arg; @@ -138,7 +139,7 @@ std::vector ObjectNotification::jsonToContentArgs(const QString &js { // 3. Für schnellen Zugriff nach ID indizieren QHash sucheMap; - for (const QJsonValue &wert : qAsConst(jsonArray)) + for (const QJsonValue &wert : std::as_const(jsonArray)) { QJsonObject obj = wert.toObject(); int id = obj[CONTENT_ID].toInt(); @@ -168,7 +169,7 @@ Core::FunctionReplyObject ObjectNotification::readReceipt(const ReadReceipt &dat Database::NomAddress dbDataAddr; - for (const Address &recipientAddr : qAsConst(m_dataNotificationObject.recipientIds)) + for (const Address &recipientAddr : std::as_const(m_dataNotificationObject.recipientIds)) { if (data.operatorId > 0 && recipientAddr.addressType == AddressType::Operator && recipientAddr.addressId != data.operatorId) continue; @@ -223,7 +224,7 @@ Core::FunctionReplyObject ObjectNotification::readReceipt(const ReadReceipt &dat m_dataNotificationObject = toDdsData(dbDataNotification); m_dataNotificationObject.sender = sender; - for (const Address &addr : qAsConst(recipients)) + for (const Address &addr : std::as_const(recipients)) { if (addr.id == dbDataAddr.id) m_dataNotificationObject.recipientIds.push_back(toDdsData(dbDataAddr)); @@ -247,7 +248,7 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage Database::NomAddress dbDataAddr; - for (const Address &recipientAddr : qAsConst(m_dataNotificationObject.recipientIds)) + for (const Address &recipientAddr : std::as_const(m_dataNotificationObject.recipientIds)) { DEBUG_LOG(m_logger) << "recipientAddr=" << ", id: " << recipientAddr.id << ", addressId: " << recipientAddr.addressId << ", isDeleted: " << recipientAddr.isDeleted; @@ -282,7 +283,7 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage m_dataNotificationObject = toDdsData(dbDataNotification); m_dataNotificationObject.sender = sender; - for (const Address &addr : qAsConst(recipients)) + for (const Address &addr : std::as_const(recipients)) { DEBUG_LOG(m_logger) << "addr=" << ", id: " << addr.id << ", addressId: " << addr.addressId << ", isDeleted: " << addr.isDeleted; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.cpp index b0f4af220..123eed3d3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.cpp @@ -7,6 +7,7 @@ * Created by Philipp Dassow, SLST, 2017-12-05 */ #include "client_message.h" +#include #include #include @@ -250,7 +251,7 @@ void PdfListMessage::process() QJsonArray arr = m_data.toArray(); - for (const QJsonValue ¤t : qAsConst(arr)) + for (const QJsonValue ¤t : std::as_const(arr)) { if (!current.isObject()) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp index b654f67ff..6f552afc9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp @@ -7,6 +7,7 @@ */ #include "handler_base_download.h" +#include #include #include @@ -1126,7 +1127,7 @@ void HandlerBaseDownload::removeOldExercises() } QVector exercises; exmDbHandler->db()->select(exercises); - for (const auto &ex : qAsConst(exercises)) + for (const auto &ex : std::as_const(exercises)) { if (m_exTblGen->dropExerciseSchema(ex.id, false)) continue; @@ -1718,7 +1719,7 @@ void HandlerBaseDownload::copyFromOldDatabase() //TODO: add more tables if needed, check data in these tables, z.B. in rec_equipment_position.equipment_number is always negative (?!) DBTransaction trans(m_dbConnection); - for (const QString &table : qAsConst(tableList)) + for (const QString &table : std::as_const(tableList)) { if (!copyTable(dbIn, m_dbConnection, table)) ERROR_LOG(m_logger) << "Failed to copy table " << table; @@ -1852,7 +1853,7 @@ void HandlerBaseDownload::copyOldFlmData(const QSqlDatabase &dbIn, const QSqlDat QVector flmFolderData; dbIfcNew->select(flmFolderData); qint64 folderId = -1; - for (const auto &folder : qAsConst(flmFolderData)) + for (const auto &folder : std::as_const(flmFolderData)) { if (folder.name == QStringLiteral("Snapshots")) { @@ -1868,7 +1869,7 @@ void HandlerBaseDownload::copyOldFlmData(const QSqlDatabase &dbIn, const QSqlDat if (folderId > 0) // found Snapshots folder for the exercise id { - for (auto data : qAsConst(flmData)) + for (auto data : std::as_const(flmData)) { if (data.folderId == folderId || //snapshots (data.fileTypeId == FileManagement::FileType::Pdf)) //old PDF diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp index 20266093b..ff640529b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp @@ -7,6 +7,7 @@ */ #include "handler_pdf_download.h" +#include #include "WebSocketInterface/Messages/reply_message.h" #include @@ -172,7 +173,7 @@ void HandlerPdfDownload::onStartPdfDownloadRequest(const rti::core::SampleIdenti return false; }; QVector pdfInfoVec; - for (const auto ¤t : qAsConst(m_pdfData)) + for (const auto ¤t : std::as_const(m_pdfData)) { if (!containsId(request.documentIds, current.id)) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp index bd4b478af..9da4d3ef9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp @@ -7,6 +7,7 @@ */ #include "handler_oc_aes_data.h" +#include #include @@ -177,7 +178,7 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos) m_aesFtc->dangerAreaModifyRequest(req, this); } - for (int id : qAsConst(aesToBeDeleted)) + for (int id : std::as_const(aesToBeDeleted)) { if (m_aesDtc->dangerArea(id).isCentral) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp index 37beaae7d..9d5209ecb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp @@ -7,6 +7,7 @@ */ #include "handler_oc_data.h" +#include #include #include @@ -74,7 +75,7 @@ bool HandlerOcData::init() return false; } - for (const auto &data : qAsConst(dataVec)) + for (const auto &data : std::as_const(dataVec)) { switch (data.aesTypeId) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp index 81ef25407..0f4af938e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp @@ -7,6 +7,7 @@ */ #include "handler_oc_situation_data.h" +#include #include #include @@ -97,7 +98,7 @@ void HandlerOcSituationData::process(const QByteArray &data, bool bIsInitial) int ownEquipmentNumber = m_tabocDtc->specificsEquipment(1).equipmentNumber; int ownParticipantId = -1; - for (const int &participantId : qAsConst(m_participantId2EqId)) + for (const int &participantId : std::as_const(m_participantId2EqId)) { if (m_participantId2EqId.value(participantId) == ownEquipmentNumber) { @@ -138,7 +139,7 @@ void HandlerOcSituationData::removeAllPositions() invalidPos.position.reportingSource = Core::PositionReportingSource::SetByOperator; // SetByOperator -> nan is allowed invalidPos.sampleTime = m_dds->currentPartitionTime(); - for (const auto eqNumber : qAsConst(m_participantId2EqId)) + for (const auto eqNumber : std::as_const(m_participantId2EqId)) { invalidPos.equipmentNumber = eqNumber; m_tabDts->publish(invalidPos); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_builder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_builder.cpp index 8b8a147d1..39ce60b99 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_builder.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_builder.cpp @@ -7,6 +7,7 @@ */ #include "central_aes_data_builder.h" +#include #include "LtsUtils/LtsUtilsCore/qbytearray_byteaccess.h" #include "QLineF" @@ -455,7 +456,7 @@ void addSegments(QByteArray &buf, const std::vector #include #include @@ -61,7 +62,7 @@ bool HandlerOcAesData::init() return false; } - for (const auto &data : qAsConst(dataVec)) + for (const auto &data : std::as_const(dataVec)) { switch (data.aesTypeId) { @@ -199,7 +200,7 @@ void HandlerOcAesData::sendIedPositions() LtsUtils::set1Byte(OcSituation::AesType::IedPositions, data); LtsUtils::set1Byte(cnt, data); - for (const auto &pos : qAsConst(m_iedPositionsToBeSend)) + for (const auto &pos : std::as_const(m_iedPositionsToBeSend)) { LtsUtils::set2Byte(m_gimDtc->ied(pos.id).equipmentNumber, data); const QPointF relCoord(m_positionConverter->relativeFromGeographic(pos.position)); @@ -252,7 +253,7 @@ void HandlerOcAesData::collectionTimeout(OcSituation::AesType type, const std::f if (m_demandingEquipments[type].size() > 5) sendFunction(0); // broadcast else - for (int eqNumber : qAsConst(m_demandingEquipments[type])) + for (int eqNumber : std::as_const(m_demandingEquipments[type])) sendFunction(eqNumber); //cleanup diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp index 7a2c75c0c..c8052d743 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp @@ -7,6 +7,7 @@ */ #include "handler_oc_central_aes_data.h" +#include #include #include @@ -472,7 +473,7 @@ void HandlerOcCentralAesData::handleSituation() QMultiMap distances; - for (qint32 currentAesItemId : qAsConst(m_aesItemsInRange)) + for (qint32 currentAesItemId : std::as_const(m_aesItemsInRange)) { qreal distance = calculateDistanceToCircleCenter(currentAesItemId); @@ -638,7 +639,7 @@ QPolygonF HandlerOcCentralAesData::polygonFromForm(const std::vector &aesIte AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtUnknown; - for (qint32 currentAesItemId : qAsConst(kickedOutAesItems)) + for (qint32 currentAesItemId : std::as_const(kickedOutAesItems)) { if (m_allCentralAesItemViews.contains(currentAesItemId)) aesType = m_allCentralAesItemViews.value(currentAesItemId).aesTypeId; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp index 6ba491570..6afb64e7e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp @@ -7,6 +7,7 @@ */ #include "handler_oc_situation_data.h" +#include #include #include @@ -183,7 +184,7 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen if (m_centerEquipmentId > 0) { ParticipantManagement::Participant centerParticipant; - for (const auto &participant : qAsConst(m_allParticipants)) + for (const auto &participant : std::as_const(m_allParticipants)) { if (participant.equipmentNumber.is_set() && participant.equipmentNumber.get() == m_centerEquipmentId) { @@ -433,7 +434,7 @@ void HandlerOcSituationData::onAesItemViewChanged(const AreaEffectSimulation::Ae void HandlerOcSituationData::onDusMineStateChanged(const AreaEffectSimulation::DusMineState &/*data*/, DataModification /*modType*/) { auto copy = m_dynamicParticpantData; - for (const ParticipantManagement::DynamicParticipantData &dynPartData : qAsConst(copy)) + for (const ParticipantManagement::DynamicParticipantData &dynPartData : std::as_const(copy)) { if (!m_participantWithMaybeMissingPartyId.contains(dynPartData.participantId)) continue; @@ -528,7 +529,7 @@ void HandlerOcSituationData::fetchParticipantsInRange() QSet curParticipants; const QHash oldParticipants = m_participants; - for (const auto &position : qAsConst(m_allParticipantPositions)) + for (const auto &position : std::as_const(m_allParticipantPositions)) { if (!LtsUtils::isPositionTimeOutdated(m_partitionTime, position.sampleTime)) // only if position is not outdated { @@ -562,7 +563,7 @@ void HandlerOcSituationData::fetchParticipantsInRange() DEBUG_LOG(m_logger) << "Participant in range equipment number: " << participant.equipmentNumber.get() << " pos: " << relPartPos.x() << "/" << relPartPos.y() << " distance: " << std::sqrt(distanceSqr) << " distanceSqr: " << distanceSqr; - curParticipantsInRange.insertMulti(distanceSqr, participant.id); + curParticipantsInRange.insert(distanceSqr, participant.id); } } m_participantOverloaded = quint32(curParticipantsInRange.count()) > Settings::maxParticipantsInSituation(); @@ -645,7 +646,7 @@ QVector> HandlerOcSituationData::createPrioQueue() const QVector> participantsPrioQueue; participantsPrioQueue.reserve(m_participantsToSend.size()); - for (auto participantId : qAsConst(m_participantsToSend)) + for (auto participantId : std::as_const(m_participantsToSend)) { // ignore (currently) outdated players if (m_outdatedParticipants.contains(participantId)) @@ -691,7 +692,7 @@ QByteArray HandlerOcSituationData::createDataStream(int maxSize, // first: participants that are not in range any more DEBUG_LOG(m_logger) << "m_newlyOutdatedParticipants: " << m_newlyOutdatedParticipants.size(); QSet copyOfOutdated = m_newlyOutdatedParticipants; - for (const auto participantId : qAsConst(m_newlyOutdatedParticipants)) + for (const auto participantId : std::as_const(m_newlyOutdatedParticipants)) { addParticipantId(ret, participantId, OcSituation::ModificationFlag::eNone); copyOfOutdated.remove(participantId); @@ -909,6 +910,7 @@ void HandlerOcSituationData::addVBG(QByteArray &buf, const ParticipantManagement case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout: // not yet used break; + default: break; } LtsUtils::set1Byte(injuryPartyId, buf); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.cpp index 298c8aaf2..817659eb6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.cpp @@ -9,6 +9,7 @@ #include "handler_active_apps.h" +#include #include "dds_handler.h" #include "main_handler.h" @@ -69,7 +70,7 @@ void HandlerActiveApps::cleanupOperator(int operatorId) void HandlerActiveApps::cleanup() { auto dtsPtr = dts(); - for (const ActiveApp &item : qAsConst(m_activeApps)) + for (const ActiveApp &item : std::as_const(m_activeApps)) dtsPtr->removeActiveAppByKey(item.id); m_activeApps.clear(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.cpp index aa29f131c..5a8ef0655 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.cpp @@ -7,6 +7,7 @@ */ #include "handler_group.h" +#include #include "object_group.h" #include "handler_operator.h" #include "opm_db.h" @@ -152,7 +153,7 @@ Core::FunctionReplyObject HandlerGroup::create(const GroupCreateRequest &request { Database::OpmGroup group; group.name = QString::fromStdString(request.name); - for (const ObjectGroup *g : qAsConst(m_groupObjMap)) + for (const ObjectGroup *g : std::as_const(m_groupObjMap)) { if (g->name().compare(group.name, Qt::CaseInsensitive) == 0) return Core::FunctionReplyObject(-1, tr_lts("dds", "Name '%1' already exists")).arg(group.name); @@ -193,7 +194,7 @@ Core::FunctionReplyObject HandlerGroup::changeName(const OperatorManagement::Gro group.name = QString::fromStdString(request.name); group.description = QString::fromStdString(request.description); - for (const ObjectGroup *g : qAsConst(m_groupObjMap)) + for (const ObjectGroup *g : std::as_const(m_groupObjMap)) { if (g == ifs) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp index cef5b0230..3b04257b0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp @@ -7,6 +7,7 @@ */ #include "handler_operator.h" +#include #include "handler_locked_topics.h" #include "handler_active_apps.h" #include "object_operator.h" @@ -75,7 +76,7 @@ bool HandlerOperator::init() OperatorManagement::OperatorWorkstationAlive alive; alive.lastAlive = QDateTime::currentMSecsSinceEpoch(); - for (const Database::OpmOperator &op : qAsConst(dataVec)) + for (const Database::OpmOperator &op : std::as_const(dataVec)) { ObjectOperator *ifs(new ObjectOperator(m_mainHandler)); Core::FunctionReplyObject ret = ifs->createObject(op, opMap[op.id]); @@ -299,7 +300,7 @@ Core::FunctionReplyObject HandlerOperator::operatorModifyRequest(const OperatorC { op.name = QString::fromStdString(request.name.get()); - for (const ObjectOperator *o : qAsConst(m_operatorObjMap)) + for (const ObjectOperator *o : std::as_const(m_operatorObjMap)) { if (o == ifs) continue; @@ -619,7 +620,7 @@ Core::FunctionReplyObject HandlerOperator::operatorUpdateVisiblePartiesByExercis void HandlerOperator::reloadAcls() { - for (ObjectOperator *ifs : qAsConst(m_operatorObjMap)) + for (ObjectOperator *ifs : std::as_const(m_operatorObjMap)) ifs->reloadAcls(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp index 0945d191f..436797ed8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp @@ -6,6 +6,7 @@ */ #include "object_operator.h" +#include #include "main_handler.h" #include @@ -292,7 +293,7 @@ QSet ObjectOperator::calculateEffectiveAcls() const QSet allowances; QSet denials; - for (int group : qAsConst(effectiveGroups)) + for (int group : std::as_const(effectiveGroups)) { addValuesToSet(allowMap, group, allowances); addValuesToSet(denyMap, group, denials); @@ -352,8 +353,6 @@ std::vector ObjectOperator::toDdsData(con { PartiesByExercise pbe; pbe.exerciseId = ooe.exerciseId; - pbe.visibleParties; - pbe.hiddenParties; std::vector visibleParty; for (const auto &elem : ooe.visibleParties()) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp index e9e47da2a..d2bc4acc2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp @@ -7,6 +7,7 @@ * Created by Hannes Baeuerle, SLSE, 2016-05-12 */ #include "participant_handler.h" +#include #include "participant.h" #include "ppm_common.h" @@ -43,7 +44,7 @@ void ParticipantHandler::clearParticipants() dts()->removeHitLineInfoByKey(it.value().id()); m_hitLineInfoMap.clear(); - for (auto p : qAsConst(m_participants)) + for (auto p : std::as_const(m_participants)) { p->removeFromDds(); delete p; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp index fddb5b57e..2d6cb83d3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp @@ -7,6 +7,7 @@ * Created by Hannes Baeuerle, SLSE, 2016-05-12 */ #include "participant_handler_for_exercise.h" +#include #include "convert_db_to_dds.h" #include "firing_unit_validator.h" @@ -168,7 +169,7 @@ bool ParticipantHandlerForExercise::init() } // remove the 'unused' EquipmentExerciseMappings (for whatever reason there are some...) - for (const auto &eem : qAsConst(localEquipmentExerciseMappings)) + for (const auto &eem : std::as_const(localEquipmentExerciseMappings)) dbEx0->removeEquipmentExerciseMapping(eem); // after m_publishEquipmentExerciseMappings has been set and participants are created @@ -189,7 +190,7 @@ bool ParticipantHandlerForExercise::init() bool isOwnPositionParticipant = false; // publish participants in dds - for (Participant *p : qAsConst(m_participants)) + for (Participant *p : std::as_const(m_participants)) { if (p->equipmentNumber() == 1) isOwnPositionParticipant = true; @@ -309,7 +310,7 @@ bool ParticipantHandlerForExercise::init() dtc->equipmentExerciseMappings([this](const EquipmentExerciseMapping &data) { onEquipmentExerciseMappingChanged(data, DataModification::eAdded); }); auto pub = dts(); - for (const ParticipantOrganisation &partOrga : qAsConst(m_participantOrganisations)) + for (const ParticipantOrganisation &partOrga : std::as_const(m_participantOrganisations)) pub->publish(partOrga); if (m_mainHandler->exerciseId() > 0) @@ -351,7 +352,7 @@ bool ParticipantHandlerForExercise::init() m_pdmDtc->waitForHistoricalDataGearTypeChargeType(); } - // for(const auto &participant : qAsConst(m_participants)) + // for(const auto &participant : std::as_const(m_participants)) // customedSetGearCharges(participant); return true; @@ -454,7 +455,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe checkLongActionBreak(); - for (const ParticipantManagement::ParticipantData ¤tParticipant : qAsConst(validateData.participantsToBeCreatedOrModified)) + for (const ParticipantManagement::ParticipantData ¤tParticipant : std::as_const(validateData.participantsToBeCreatedOrModified)) { auto ret = validateParticipantData(validateData, currentParticipant); if (ret.error()) @@ -596,7 +597,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe DEBUG_LOG(m_logger) << "New participants created and existing participants updated"; // build hierarchy - for (const ParticipantData ¤tData : qAsConst(validateData.participantsToBeCreatedOrModified)) // first set superiorIds + for (const ParticipantData ¤tData : std::as_const(validateData.participantsToBeCreatedOrModified)) // first set superiorIds { Participant *participantToUpdate = participantById(validateData.modIdToParticipantId.value(currentData.modId())); if (currentData.superiorModId() >= 0) // superiorModId < 0 -> no change in superior @@ -612,7 +613,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe QHash> inferiors; inferiors.reserve(m_participants.size() / 2); // first collect all inferiors per superior - for (const Participant *currentParticipant : qAsConst(m_participants)) + for (const Participant *currentParticipant : std::as_const(m_participants)) { int superiorId = currentParticipant->superiorId(); inferiors[superiorId].push_back(currentParticipant->id()); @@ -625,7 +626,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe } } // now update all participants with newly collected inferiors - for (Participant *currentParticipant : qAsConst(m_participants)) + for (Participant *currentParticipant : std::as_const(m_participants)) { if (currentParticipant->hasNewInferiorStructure(inferiors.value(currentParticipant->id()))) participantsWithChanges.insert(currentParticipant); @@ -635,7 +636,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe // update in Database std::vector dbParticipantsToUpdate; dbParticipantsToUpdate.reserve(participantsWithChanges.size()); - for (Participant *currentParticipant : qAsConst(participantsWithChanges)) + for (Participant *currentParticipant : std::as_const(participantsWithChanges)) { dbParticipantsToUpdate.push_back(currentParticipant->toDbParticipant()); partiesUsed.insert(currentParticipant->partyId()); @@ -651,13 +652,13 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe // mark parties in use ChangePartyUsedStateRequest req; - for (int partyId : qAsConst(partiesUsed)) + for (int partyId : std::as_const(partiesUsed)) { req.partyId(partyId); req.isUsedBy(true); m_mainHandler->partyHandler()->changePartyUsedStateRequest(req); } - for (int partyId : qAsConst(partiesWithDeletedOrMovedOutParticipants)) + for (int partyId : std::as_const(partiesWithDeletedOrMovedOutParticipants)) { req.partyId(partyId); req.isUsedBy(false); @@ -726,7 +727,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe QJsonArray jsonArray; // finally ... publish participant data via dds if no error occured - for (Participant *currentParticipant : qAsConst(participantsWithChanges)) + for (Participant *currentParticipant : std::as_const(participantsWithChanges)) { currentParticipant->publishParticipant(); NOTICE_LOG(m_logger) << "publishParticipant id=" << currentParticipant->id(); @@ -1292,7 +1293,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::selectiveReammunitionRe tabRequest.participantId(request.id()); tabRequest.gearId(request.gearId()); INFO_LOG(m_logger) << "Gear id = " << request.gearId(); - for (const Reammunition ra : qAsConst(request.reammunition())) + for (const Reammunition ra : std::as_const(request.reammunition())) { TrainingAreaBase::Reammunition tabRa; tabRa.chargeTypeId(ra.chargeTypeId()); @@ -1367,7 +1368,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::setSimulatedPositionReq { if (request.participantId() <= 0) { - for (Participant *participant : qAsConst(m_participants)) + for (Participant *participant : std::as_const(m_participants)) { if (participant->isDeleted() || participant->superiorId() != 0) continue; @@ -1507,7 +1508,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData DEBUG_LOG(m_logger) << "checking superiorIds"; // superior exists? bool isExistingSuperiorId = false; - for (const ParticipantData &dat : qAsConst(data.participantsToBeCreatedOrModified)) + for (const ParticipantData &dat : std::as_const(data.participantsToBeCreatedOrModified)) { if (participantToValidate.superiorModId() == dat.modId()) { @@ -1529,7 +1530,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData // all hierarchy numbers with same superior unique? DEBUG_LOG(m_logger) << "checking hierarchyNumbers"; - for (const ParticipantData &dat : qAsConst(data.participantsToBeCreatedOrModified)) + for (const ParticipantData &dat : std::as_const(data.participantsToBeCreatedOrModified)) { // operator==() on optionals returns false if not set ... if (dat.modId() != participantToValidate.modId() && dat.superiorModId() == participantToValidate.superiorModId() @@ -1803,7 +1804,7 @@ void ParticipantHandlerForExercise::onEquipmentExerciseMappingChanged(const Equi case DataModification::eModified: { QSet oldEqIds; - for (const auto &db : qAsConst(m_equipmentExerciseMappings)) + for (const auto &db : std::as_const(m_equipmentExerciseMappings)) { if (db.exerciseId != data.exerciseId()) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party_handler.cpp index ab735074b..bf6094a83 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party_handler.cpp @@ -8,6 +8,7 @@ */ #include "PartyHandling/party_handler.h" +#include #include "PartyHandling/party.h" #include #include @@ -63,7 +64,7 @@ bool PartyHandling::PartyHandler::init() return false; } - for ( Database::PpmParty currentParty : qAsConst(partyVec)) + for ( Database::PpmParty currentParty : std::as_const(partyVec)) { resetAdlerProperties(currentParty.properties, currentParty.id); PartyHandling::Party *newParty = new PartyHandling::Party(currentParty); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/participant_handler_for_replay.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/participant_handler_for_replay.cpp index 08a38f06b..4793d68ef 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/participant_handler_for_replay.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/participant_handler_for_replay.cpp @@ -8,6 +8,7 @@ #include "participant_handler_for_replay.h" +#include #include "participant_for_replay.h" #include "ppm_record_replay_plugin_custom.h" @@ -88,7 +89,7 @@ void ParticipantHandlerForReplay::setDynamicParticipantData(const ParticipantMan void ParticipantHandlerForReplay::publishData() { - for (auto p : qAsConst(m_participants)) + for (auto p : std::as_const(m_participants)) { p->publishParticipant(); p->publishDynamicData(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/ppm_record_replay_plugin_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/ppm_record_replay_plugin_custom.cpp index 3f5032e1e..48b029328 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/ppm_record_replay_plugin_custom.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/ppm_record_replay_plugin_custom.cpp @@ -7,6 +7,7 @@ */ #include "ppm_record_replay_plugin_custom.h" +#include #include "participant_handler_for_replay.h" #include #include @@ -179,11 +180,11 @@ bool RecordReplayPluginCustom::setReplayStartTime(NSqlQuery &q, qint64 startTime m_participantHandler->clearParticipants(); INFO_LOG(m_logger) << "setReplayStartTime-clearParticipants " << startTime << " DONE"; - for (const auto &ddsParticipant : qAsConst(m_participantMap)) + for (const auto &ddsParticipant : std::as_const(m_participantMap)) m_participantHandler->createUpdateParticipant(ddsParticipant); INFO_LOG(m_logger) << "setReplayStartTime-createUpdateParticipant " << startTime << " DONE"; - for (const auto &dynParticipant : qAsConst(m_dynamicParticipantDataMap)) + for (const auto &dynParticipant : std::as_const(m_dynamicParticipantDataMap)) m_participantHandler->setDynamicParticipantData(dynParticipant); INFO_LOG(m_logger) << "setReplayStartTime-setDynamicParticipantData " << startTime << " DONE"; @@ -223,9 +224,9 @@ bool RecordReplayPluginCustom::publishData(qint64 desiredTime) return false; } - for (const Participant &p : qAsConst(m_participantMap)) + for (const Participant &p : std::as_const(m_participantMap)) m_participantHandler->createUpdateParticipant(p); - for (const Participant &p : qAsConst(m_participantDisposedMap)) + for (const Participant &p : std::as_const(m_participantDisposedMap)) m_participantHandler->removeParticipant(p); setDataForParticipants(desiredTime); @@ -289,7 +290,7 @@ QVector> RecordReplayPluginCustom::makeConcurrentWithoutEquipNo(T it = content.erase(it); } // while - for (auto contentIndex : qAsConst(contentVec)) + for (auto contentIndex : std::as_const(contentVec)) { // execute in workerThread result.append(QtConcurrent::run([this, contentIndex]() @@ -325,7 +326,7 @@ QVector> RecordReplayPluginCustom::makeConcurrent(T &content, qint it = content.erase(it); } // while - for (auto contentIndex : qAsConst(contentVec)) + for (auto contentIndex : std::as_const(contentVec)) { // execute in workerThread result.append(QtConcurrent::run([this, contentIndex]() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TemplateHandling/template_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TemplateHandling/template_handler.cpp index 6947f780c..f606c393b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TemplateHandling/template_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TemplateHandling/template_handler.cpp @@ -7,6 +7,7 @@ * Created by Hannes Baeuerle, SLSE, 2016-07-27 */ #include "template_handler.h" +#include #include "template.h" #include "main_handler.h" #include @@ -114,7 +115,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti futureVec += fut; } - for (const QFuture ¤tFut : qAsConst(futureVec)) + for (const QFuture ¤tFut : std::as_const(futureVec)) { Core::FunctionReplyObject ret = currentFut.result(); if (ret.error()) @@ -123,7 +124,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti } else { - for (const ParticipantManagement::TemplateData ¤tTemplate : qAsConst(templatesToBeCreatedOrModified)) + for (const ParticipantManagement::TemplateData ¤tTemplate : std::as_const(templatesToBeCreatedOrModified)) { DEBUG_LOG(m_logger) << "Validating template: " << currentTemplate; auto ret = validateTemplateData(templatesToBeCreatedOrModified, modIdToTemplateId, currentTemplate); @@ -139,7 +140,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti // create new and update existing templates DEBUG_LOG(m_logger) << "Creating new and updating existing templates ..."; - for (const TemplateData ¤tData : qAsConst(templatesToBeCreatedOrModified)) + for (const TemplateData ¤tData : std::as_const(templatesToBeCreatedOrModified)) { Template *templateToUpdate = m_templates.value(modIdToTemplateId.value(currentData.modId())); if (!templateToUpdate) @@ -164,7 +165,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti DEBUG_LOG(m_logger) << "New templates created and existing templates updated"; // build hierarchy - for (const TemplateData ¤tData : qAsConst(templatesToBeCreatedOrModified)) // first set superiorIds + for (const TemplateData ¤tData : std::as_const(templatesToBeCreatedOrModified)) // first set superiorIds { Template *templateToUpdate = m_templates.value(modIdToTemplateId.value(currentData.modId()), nullptr); const int superiorId = modIdToTemplateId.value(currentData.superiorModId()); @@ -174,7 +175,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti templatesWithChanges.append(templateToUpdate); } - for (Template *currentTemplate : qAsConst(m_templates)) // set inferiorIds + for (Template *currentTemplate : std::as_const(m_templates)) // set inferiorIds { if (!currentTemplate->hasNewInferiorStructure(inferiorIdsForTemplate(currentTemplate->id())) || templatesWithChanges.contains(currentTemplate)) @@ -184,7 +185,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti } // update in Database - for (Template *currentTemplate : qAsConst(templatesWithChanges)) + for (Template *currentTemplate : std::as_const(templatesWithChanges)) { if (!m_mainHandler->db()->update(currentTemplate->dbEntry())) return Core::FunctionReplyObject(tr_lts("dds", "Could not update template data in database, template data may be inconsistent")); @@ -192,7 +193,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti trans.commit(); // finally ... publish template data via dds if no error occured - for (Template *currentTemplate : qAsConst(templatesWithChanges)) + for (Template *currentTemplate : std::as_const(templatesWithChanges)) m_mainHandler->exAnyDts()->publish(currentTemplate->toDdsTemplateParticipant()); return Core::FunctionReplyObject(); @@ -203,7 +204,7 @@ std::vector TemplateHandler::inferiorIdsForTemplate(int32_t superiorTem std::vector result; result.reserve(10); - for (Template *currentTemplate : qAsConst(m_templates)) + for (Template *currentTemplate : std::as_const(m_templates)) { if (currentTemplate->superiorId() == superiorTemplateId) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.cpp index 721d5d854..60b2cdbee 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.cpp @@ -8,6 +8,7 @@ */ #include +#include #include #include "main_handler.h" #include "ParticipantHandling/participant.h" @@ -90,7 +91,7 @@ bool MissionPlanHandler::loadMissionPlansFromDb() <<" Items size = "< #include namespace ParticipantManagement @@ -78,7 +79,7 @@ void ObjectMissionPlan::setDbMissionItems(const QMap #include "uas.h" #include #include "main_handler.h" @@ -53,7 +54,7 @@ bool UasHandler::init() return false; } - for (const Database::PpmUas ¤tUas : qAsConst(uasVec)) + for (const Database::PpmUas ¤tUas : std::as_const(uasVec)) { UasHandling::Uas *newUas = new UasHandling::Uas(currentUas); @@ -283,7 +284,7 @@ void UasHandler::onUASRadioLinkConnectionStatusChanged(const UASRadioLinkConnect bool UasHandler::hostNameHostPortExists(const QString &hostname, int hostport, int uasId) { - for (Uas *uas : qAsConst(m_uass)) + for (Uas *uas : std::as_const(m_uass)) { if (uas->id() == uasId) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp index 2d7e3cff6..5ac930209 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp @@ -7,6 +7,7 @@ */ #include "ppm_common.h" +#include #include #include @@ -36,7 +37,7 @@ StateInformation youngestStateInformation(const std::vector> printing all SIs"; - for (const ParticipantManagement::StateInformation &si : qAsConst(sortedStateList)) + for (const ParticipantManagement::StateInformation &si : std::as_const(sortedStateList)) qWarning() << ">>>> si" << "siVulnId" << (uint8_t)si.vulnerabilityState << "bits" << si.vulnerabilityBits << "time" << si.stateTime; qWarning() << ">> checking SIs"; } - for (const ParticipantManagement::StateInformation &si : qAsConst(sortedStateList)) + for (const ParticipantManagement::StateInformation &si : std::as_const(sortedStateList)) { const uint8_t siVulnId = static_cast(si.vulnerabilityState); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc_impl_custom.cpp index 7fb3745be..25d77d3fe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc_impl_custom.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc_impl_custom.cpp @@ -7,6 +7,7 @@ */ #include "ppm_dtc_impl_custom.h" +#include #include "ppm_common.h" #include #include @@ -744,7 +745,7 @@ int DtcImplCustom::getParticipantFromPrf(int prf) const for (const DynamicParticipantData &sample : m_dtcDynamicParticipantData->readAlive()) { - for (const auto &designation : qAsConst(sample.designations)) + for (const auto &designation : std::as_const(sample.designations)) { DEBUG_LOG(m_logger) << " code=" << designation.code; if (designation.code == prf) @@ -768,7 +769,7 @@ int DtcImplCustom::getPrfFromParticipant(int participantId) const if (participantId == sample.participantId) { DEBUG_LOG(m_logger) << "participantId=" << sample.participantId << " designations.size()=" << sample.designations.size(); - for (const auto &designation : qAsConst(sample.designations)) + for (const auto &designation : std::as_const(sample.designations)) { DEBUG_LOG(m_logger) << " code=" << designation.code; if (designation.code > 0) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.cpp index 15cc8b590..f5893e5cd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.cpp @@ -7,6 +7,7 @@ */ #include "web_socket_handler.h" +#include #include #include @@ -25,7 +26,7 @@ WebSocketHandler::WebSocketHandler(QObject *parent) WebSocketHandler::~WebSocketHandler() { - for (const auto& ws : qAsConst(m_webSockets)) + for (const auto& ws : std::as_const(m_webSockets)) { ws->disconnect(this); } @@ -70,7 +71,7 @@ bool WebSocketHandler::sendTelegramInternal(const ParticipantPosition &pos, int const QString jsonStr = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)); bool ret = false; - for (const auto &wsw : qAsConst(m_webSockets)) + for (const auto &wsw : std::as_const(m_webSockets)) { if (wsw->sendTextMessage(jsonStr)) ret = true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.cpp index e8cf109e3..6a2aa32d8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.cpp @@ -8,6 +8,7 @@ */ #include "handler_presentation.h" +#include #include "object_presentation.h" #include "initialization.h" #include "dds_handler.h" @@ -73,7 +74,7 @@ bool HandlerPresentation::init() } // publish - for (ObjectPresentation *objPre : qAsConst(m_objectPresentationMap)) + for (ObjectPresentation *objPre : std::as_const(m_objectPresentationMap)) objPre->onPublishData(); return true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.cpp index 6f0d492b6..b8f1d092f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.cpp @@ -8,6 +8,7 @@ */ #include "object_presentation.h" +#include #include "initialization.h" #include "dds_handler.h" #include @@ -112,7 +113,7 @@ Core::FunctionReplyObject ObjectPresentation::updateObject(const PresentationMod if (!m_mainHandler->db()->update(dbData)) return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating Presentation-data into database")); - for (const auto &content : qAsConst(m_content)) + for (const auto &content : std::as_const(m_content)) { if (m_mainHandler->db()->removePrePresentationContent(content.id)) DEBUG_LOG(m_logger) << "Removed presentation content id " << content.id; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp index ec66288bd..a987c2670 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp @@ -1,4 +1,5 @@ #include "static_pvsan_import.h" +#include #include #include @@ -292,7 +293,7 @@ bool PvSanImport::addProcedures(const QVector &procedures) QVector translations; m_db->select(translations); QSet idsToRemove; - for (const auto &tr : qAsConst(translations)) + for (const auto &tr : std::as_const(translations)) { if (tr.context == myContext) idsToRemove.insert(tr.id); @@ -417,7 +418,7 @@ bool PvSanImport::addMaterial(const QVector &material) QVector translations; m_db->select(translations); QSet idsToRemove; - for (const auto &tr : qAsConst(translations)) + for (const auto &tr : std::as_const(translations)) { if (tr.context == myContext) idsToRemove.insert(tr.id); @@ -480,7 +481,7 @@ bool PvSanImport::addInjuryPlaces(const QVector &kind, const QVector translations; m_db->select(translations); QSet idsToRemove; - for (const auto &tr : qAsConst(translations)) + for (const auto &tr : std::as_const(translations)) { if (tr.context == myContext) idsToRemove.insert(tr.id); @@ -494,7 +495,7 @@ bool PvSanImport::addInjuryPlaces(const QVector &kind, const QVector &kind, const QVectortruncatePdmSanitationInjuryPlace1(); idsToRemove.clear(); - for (const auto &tr : qAsConst(translations)) + for (const auto &tr : std::as_const(translations)) { if (tr.context == myContext) idsToRemove.insert(tr.id); @@ -539,7 +540,7 @@ bool PvSanImport::addInjuryPlaces(const QVector &kind, const QVector &kind, const QVectortruncatePdmSanitationInjuryPlace2(); idsToRemove.clear(); - for (const auto &tr : qAsConst(translations)) + for (const auto &tr : std::as_const(translations)) { if (tr.context == myContext) idsToRemove.insert(tr.id); @@ -585,7 +586,7 @@ bool PvSanImport::addInjuryPlaces(const QVector &kind, const QVector &injuries) trans.context = myContext; Database::PdmSanitationInjury injuryDb; int id = 1; - for (const QString &injury : qAsConst(injuries)) + for (const QString &injury : std::as_const(injuries)) { QStringList kde = injury.split(QStringLiteral(";")); if (kde.size() < 29 ) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp index 3baff32ae..f690ee4cd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp @@ -6,6 +6,7 @@ */ #include "translation.h" +#include #include "dds_handler.h" #include #include @@ -61,7 +62,7 @@ void Translation::collectAndPublishData() void Translation::publishData() { QJsonArray arr; - for (const QJsonObject &obj : qAsConst(m_jsonData)) + for (const QJsonObject &obj : std::as_const(m_jsonData)) arr += obj; const QJsonObject jObj{ {QStringLiteral("translations"), arr} }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.cpp index fa88c2cdd..67b1e0dfc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.cpp @@ -5,6 +5,7 @@ * $Author$ */ #include "db_writer.h" +#include #include "db_writer_snapshot.h" #include "rec_db.h" @@ -119,7 +120,7 @@ void DbWriter::ddsTopicsToDatabase() QHash minRecordSampleTimes; // for each plugin - for (RecordReplay::RecordReplayPlugin *recPlugin : qAsConst(m_plugins)) + for (RecordReplay::RecordReplayPlugin *recPlugin : std::as_const(m_plugins)) { if (!recPlugin->ddsTopicsToDatabase(*m_query, minRecordSampleTimes)) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.cpp index 53f49a064..f0121ffcb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.cpp @@ -5,6 +5,7 @@ * $Author$ */ #include "db_writer_snapshot.h" +#include #include "logger.h" @@ -163,7 +164,7 @@ void DbWriterSnapshot::initSnapshot() // Recording already initialised => read last arrays for each plugin/topic to // get a hint where to start with indexing each topic - for (RecordReplay::RecordReplayPlugin *recPlugin : qAsConst(m_plugins)) + for (RecordReplay::RecordReplayPlugin *recPlugin : std::as_const(m_plugins)) { // get all record topics and check if there's a index for them // if not -> check if there's a sample for this topic where we've to start indexing @@ -227,7 +228,7 @@ void DbWriterSnapshot::writeSnapshotData() // shortcut to avoid DBTransaction and loop over all plugins qint64 startTime = std::numeric_limits::max(); - for(const qint64 st : qAsConst(minRecSampleTimes)) + for(const qint64 st : std::as_const(minRecSampleTimes)) startTime = std::min(startTime, st); INFO_LOG(m_logger) << "writeSnapshotData - lastSnapshotTimeToGenerateNow: " << lastSnapshotTimeToGenerateNow << ", minRecTime is " << startTime; @@ -251,7 +252,7 @@ void DbWriterSnapshot::writeSnapshotData() << " lastSnapshotTimeToGenerateNow: " << lastSnapshotTimeToGenerateNow << " - BEGIN"; DBTransaction trans(QSqlDatabase::database(dbConnectionName())); NSqlQuery recSnapshotQuery(QSqlDatabase::database(dbConnectionName())); - for (RecordReplay::RecordReplayPlugin *recPlugin : qAsConst(m_plugins)) + for (RecordReplay::RecordReplayPlugin *recPlugin : std::as_const(m_plugins)) writeSnapshotDataPlugin(lastSnapshotTimeToGenerateNow, recSnapshotQuery, recPlugin, minRecSampleTimes); trans.commit(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp index 63b42c9a2..e83a6db56 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp @@ -7,6 +7,7 @@ */ #include "handler_dynamic_participant_data.h" +#include #include "rep_db.h" #include "settings.h" #include @@ -915,7 +916,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic } // Has Turm/Wanne Map been filled? - for (Database::RepChargeResupplyData turmWanneCrData : qAsConst(turmWanneMap)) + for (Database::RepChargeResupplyData turmWanneCrData : std::as_const(turmWanneMap)) { QPair pair; pair.first = turmWanneCrData.gearTypeId; @@ -974,7 +975,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic DEBUG_LOG(m_logger) << "Qualification = " << sanData.qualification; - for ( ParticipantManagement::SanitationMaterial sanMat : qAsConst(data.sanitationMaterialStock)) + for ( ParticipantManagement::SanitationMaterial sanMat : std::as_const(data.sanitationMaterialStock)) { sanData.materialId = sanMat.materialId; sanData.materialAmount = sanMat.materialCount; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_building_damage.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_building_damage.cpp index 2b5c6f198..85d9fd030 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_building_damage.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_building_damage.cpp @@ -7,6 +7,7 @@ */ #include "handler_report_data.h" +#include #include #include @@ -105,7 +106,7 @@ bool HandlerReportData::generateBuildingDamageResult(const CreateModifyReportReq qInsert.bindValue(QStringLiteral(":reportId"), reportId); - for (const BuildingDamageData &bdData : qAsConst(m_buildingDamageData)) + for (const BuildingDamageData &bdData : std::as_const(m_buildingDamageData)) { qInsert.bindValue(QStringLiteral(":bldId"), bdData.buildingId); qInsert.bindValue(QStringLiteral(":time"), bdData.timePoint); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_charge_resupply.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_charge_resupply.cpp index 4dbd66c3c..d1a77d2ee 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_charge_resupply.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_charge_resupply.cpp @@ -7,6 +7,7 @@ */ #include "handler_report_data.h" +#include #include #include @@ -85,7 +86,7 @@ bool HandlerReportData::generateChargeResupplyResult(const CreateModifyReportReq { QStringList strList; strList.reserve(usedGears.size()); - for (int gearId : qAsConst(usedGears)) + for (int gearId : std::as_const(usedGears)) strList += QString::number(gearId); QString gears = strList.join(QLatin1String(", ")); stmt += QLatin1String(" AND gear_id IN (") + gears + QLatin1String(")"); @@ -195,7 +196,7 @@ bool HandlerReportData::generateChargeResupplyResult(const CreateModifyReportReq } // Now examine the remaining weapons: - for (const participant_map2_t &p : qAsConst(m_crGear)) + for (const participant_map2_t &p : std::as_const(m_crGear)) { QMap temp; for (const QVector &datas : p) @@ -207,7 +208,7 @@ bool HandlerReportData::generateChargeResupplyResult(const CreateModifyReportReq int p_before = temp.begin().value().participantId; int pt_before = temp.begin().value().participantTypeId; - for (const Database::RepChargeResupplyData &d : qAsConst(temp)) + for (const Database::RepChargeResupplyData &d : std::as_const(temp)) { if (p_before != d.participantId) { @@ -283,8 +284,7 @@ bool HandlerReportData::generateChargeResupplyResult(const CreateModifyReportReq { checkElapsedTimer(timeoutTimer); bool bGearIsBlankCharge = false; - ChargeResupplyResult res; - memset(&res, 0, sizeof(ChargeResupplyResult)); + ChargeResupplyResult res{}; const time_map_t &tmap = ctIt.value(); int start = -1; @@ -293,7 +293,8 @@ bool HandlerReportData::generateChargeResupplyResult(const CreateModifyReportReq int given = 0; int end = -1; - const Database::RepChargeResupplyData &x = tmap.begin().value(); + const auto tIt = tmap.cbegin(); + const Database::RepChargeResupplyData &x = tIt.value(); if (x.chargeFired > 0) { start = x.chargeFired + x.chargeRemain; @@ -331,7 +332,7 @@ bool HandlerReportData::generateChargeResupplyResult(const CreateModifyReportReq int current = start; - for (const Database::RepChargeResupplyData &d : qAsConst(tmap)) // Per Timestamp + for (const Database::RepChargeResupplyData &d : std::as_const(tmap)) // Per Timestamp { if (d.chargeTypeId < 0) { @@ -431,9 +432,9 @@ bool HandlerReportData::generateChargeResupplyResult(const CreateModifyReportReq QMap finalMap; - for (const charge_type_map2_t &ctmap : qAsConst(m_crResData)) // Per Participant + for (const charge_type_map2_t &ctmap : std::as_const(m_crResData)) // Per Participant { - for (const ChargeResupplyResult &res : qAsConst(ctmap)) // Per ChargeType + for (const ChargeResupplyResult &res : std::as_const(ctmap)) // Per ChargeType { if (request.participantIds.size() > 0 && !contains(request.participantIds, res.participantId)) continue; @@ -463,9 +464,9 @@ bool HandlerReportData::generateChargeResupplyResult(const CreateModifyReportReq DEBUG_LOG(m_logger) << "finalMap.size: " << finalMap.size(); - for (const charge_type_map2_t &ctmap : qAsConst(finalMap)) + for (const charge_type_map2_t &ctmap : std::as_const(finalMap)) { - for (const ChargeResupplyResult &res : qAsConst(ctmap)) + for (const ChargeResupplyResult &res : std::as_const(ctmap)) { checkElapsedTimer(timeoutTimer); DEBUG_LOG(m_logger) << "res.chargeTypeId: " << res.chargeTypeId; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_firings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_firings.cpp index 6a086dbae..93533ce10 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_firings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_firings.cpp @@ -7,6 +7,7 @@ */ #include "handler_report_data.h" +#include #include #include @@ -64,7 +65,7 @@ bool HandlerReportData::generateFiringsResult(const CreateModifyReportRequest &r QElapsedTimer timeoutTimer; timeoutTimer.start(); - for (const int &chargeId : qAsConst(request.chargeTypeIds)) + for (const int &chargeId : std::as_const(request.chargeTypeIds)) { if (chargeId == 0) continue; // skip 0 diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp index 9e94f3c78..80ecc468a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp @@ -7,6 +7,7 @@ */ #include "handler_report_data.h" +#include #include #include @@ -81,7 +82,7 @@ bool HandlerReportData::generateMaintenanceResult(const CreateModifyReportReques qInsert.bindValue(QStringLiteral(":reportId"), reportId); - for (const auto &vrData : qAsConst(m_maintenanceData)) + for (const auto &vrData : std::as_const(m_maintenanceData)) { const auto participant = ppmDtc->participant(vrData.participantId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp index cc73f296c..f1196eaf7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp @@ -7,6 +7,7 @@ */ #include "handler_report_data.h" +#include #include #include @@ -126,7 +127,7 @@ bool HandlerReportData::generateTreatmentResult(const CreateModifyReportRequest QElapsedTimer timeoutTimer; timeoutTimer.start(); - for (const TreatmentData &tData : qAsConst(m_treatmentData)) + for (const TreatmentData &tData : std::as_const(m_treatmentData)) { checkElapsedTimer(timeoutTimer); const auto participant = ppmDtc->participant(tData.participantId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp index 38f06d4d9..6d8f43302 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp @@ -7,6 +7,7 @@ */ #include "handler_report_data.h" +#include #include #include @@ -102,7 +103,7 @@ bool HandlerReportData::generateTreatmentTimelineResult(const CreateModifyReport qInsert.bindValue(QStringLiteral(":reportId"), reportId); - for (const TreatmentTimelineData &tData : qAsConst(m_treatmentTimelineData)) + for (const TreatmentTimelineData &tData : std::as_const(m_treatmentTimelineData)) { const auto participant = ppmDtc->participant(tData.participantId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp index 7580c3463..54b42a797 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp @@ -7,6 +7,7 @@ */ #include "handler_report_data.h" +#include #include "rep_db.h" #include @@ -98,7 +99,7 @@ bool HandlerReportData::getParticipantInitial(const QVector &participantIds qBeforeStart.bindValue(QStringLiteral(":startTime"), startTime); qAfterStart.bindValue(QStringLiteral(":startTime"), startTime); qAfterStart.bindValue(QStringLiteral(":endTime"), endTime); - for (int participantId : qAsConst(participantIds)) + for (int participantId : std::as_const(participantIds)) { qBeforeStart.bindValue(QStringLiteral(":participant_id"), participantId); if (!qBeforeStart.exec()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_sanitation_material.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_sanitation_material.cpp index 029dc6762..bded3794c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_sanitation_material.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_sanitation_material.cpp @@ -7,6 +7,7 @@ */ #include "handler_report_data.h" +#include #include #include @@ -67,7 +68,7 @@ bool HandlerReportData::generateSanitationMaterialResult(const CreateModifyRepor qInsert.prepare(QLatin1String("INSERT INTO rep_sanitation_material_result (report_id, sanitation_unique_id, qualification, material_id ) VALUES (:reportId, :uqId, :qualif, :materialId )")); qInsert.bindValue(QLatin1String(":reportId"), reportId); - for (qint64 sanitationId : qAsConst(sanitationIds)) + for (qint64 sanitationId : std::as_const(sanitationIds)) { qInsert.bindValue(QLatin1String(":uqId"), sanitationId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group.cpp index 26f3166d3..4227c223f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group.cpp @@ -7,6 +7,7 @@ */ #include "group.h" +#include #include #include @@ -52,7 +53,7 @@ Group::Group(const std::shared_ptr &ddsHandler, Group::~Group() { setRunningState(Core::RunningState::StoppedNormally); - for (ServiceProcess *serviceProc :qAsConst(m_serviceProcs)) + for (ServiceProcess *serviceProc :std::as_const(m_serviceProcs)) m_ddsHandler->dts()->removeServiceInformationByKey(serviceProc->serviceProcessId()); qDeleteAll(m_serviceProcs); // in Service they are removed via ServiceProcess::destroyed signal m_ddsHandler->dts()->removeGroupInformationByKey(m_groupId); @@ -60,7 +61,7 @@ Group::~Group() void Group::init() { - for (int serviceId : qAsConst(m_scheme->services)) + for (int serviceId : std::as_const(m_scheme->services)) { if (m_serviceProcs.contains(serviceId)) continue; @@ -92,11 +93,11 @@ bool Group::setRunningState(Core::RunningState newState) case Core::RunningState::Starting: // make sure all services are there init(); - for (ServiceProcess *serviceProc : qAsConst(m_serviceProcs)) + for (ServiceProcess *serviceProc : std::as_const(m_serviceProcs)) serviceProc->start(); return true; case Core::RunningState::StoppedNormally: - for (ServiceProcess *serviceProc : qAsConst(m_serviceProcs)) + for (ServiceProcess *serviceProc : std::as_const(m_serviceProcs)) serviceProc->terminate(); return true; default: @@ -118,7 +119,7 @@ void Group::startCore() init(); // ExerciseManagement must be started ... - for (ServiceProcess *proc : qAsConst(m_serviceProcs)) + for (ServiceProcess *proc : std::as_const(m_serviceProcs)) { if (proc->serviceName() == QLatin1String("ExerciseManagement")) { @@ -160,7 +161,7 @@ void Group::start() // make sure all services are there init(); // get list of prio - for (ServiceProcess *proc : qAsConst(m_serviceProcs)) + for (ServiceProcess *proc : std::as_const(m_serviceProcs)) { if ( !prioList.contains(proc->prio())) { @@ -176,7 +177,7 @@ void Group::start() // m_actPrio = getNextPrio(prioList); //} - for (ServiceProcess *proc : qAsConst(m_serviceProcs)) + for (ServiceProcess *proc : std::as_const(m_serviceProcs)) { if ( m_actPrio == proc->prio()) { @@ -198,7 +199,7 @@ void Group::start() void Group::stop() { - for (ServiceProcess *proc : qAsConst(m_serviceProcs)) + for (ServiceProcess *proc : std::as_const(m_serviceProcs)) { if (proc->state() != QProcess::NotRunning) proc->stopFromRequest(); @@ -209,7 +210,7 @@ void Group::restart() { // make sure all services are there init(); - for (ServiceProcess *proc : qAsConst(m_serviceProcs)) + for (ServiceProcess *proc : std::as_const(m_serviceProcs)) proc->restart(); } @@ -269,7 +270,7 @@ void Group::onNewServiceInfo() m_elapsedTimer.start(); std::vector serviceIds; serviceIds.reserve(m_serviceProcs.size()); - for (ServiceProcess *proc : qAsConst(m_serviceProcs)) + for (ServiceProcess *proc : std::as_const(m_serviceProcs)) serviceIds.push_back(proc->serviceProcessId()); GroupInformation info(m_groupId, @@ -297,7 +298,7 @@ void Group::onCompleteCoreTick() ServiceProcess *exmProc = nullptr; // get EXM proc - for (ServiceProcess *proc : qAsConst(m_serviceProcs)) + for (ServiceProcess *proc : std::as_const(m_serviceProcs)) { if (proc->serviceName() == QLatin1String("ExerciseManagement")) { @@ -315,7 +316,7 @@ void Group::onCompleteCoreTick() if (exmProc->runningState() == Core::RunningState::Running) { // get list of prio - for (ServiceProcess *proc : qAsConst(m_serviceProcs)) + for (ServiceProcess *proc : std::as_const(m_serviceProcs)) { if ( !prioList.contains(proc->prio())) { @@ -327,7 +328,7 @@ void Group::onCompleteCoreTick() } // start rest of group core - for (ServiceProcess *proc : qAsConst(m_serviceProcs)) + for (ServiceProcess *proc : std::as_const(m_serviceProcs)) { if (proc->state() != QProcess::Running && proc->prio() == m_actPrio) { @@ -352,7 +353,7 @@ void Group::onCompleteCoreTick() ServiceProcess *Group::procFromPid(qint64 pid) { - for (ServiceProcess *proc :qAsConst(m_serviceProcs)) + for (ServiceProcess *proc :std::as_const(m_serviceProcs)) { if (proc->processId() == pid) return proc; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group_handler.cpp index 71aa73bb9..b179514a5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group_handler.cpp @@ -7,6 +7,7 @@ */ #include "group_handler.h" +#include #include "group.h" #include "heartbeat_listener.h" #include "service_donator.h" @@ -65,7 +66,7 @@ QVector GroupHandler::groups() const GroupScheme *GroupHandler::groupSchemeFromType(Core::ServiceGroupType type) { - for (GroupScheme *scheme : qAsConst(m_groupSchemes)) + for (GroupScheme *scheme : std::as_const(m_groupSchemes)) { if (scheme->groupType == type) return scheme; @@ -240,7 +241,7 @@ Core::FunctionReplyObject GroupHandler::onStopAllForExercise(int domainId, int e int cntStopped = 0; int cntAlive = 0; - for (Group *group : qAsConst(m_groups)) + for (Group *group : std::as_const(m_groups)) { if (group->exercisePartitionId() == exercisePartitionId && group->domainId() == domainId) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.cpp index 929c4e067..0c98a23e6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.cpp @@ -7,6 +7,7 @@ */ #include "licence_handler.h" +#include #include "dds_handler.h" #include #include @@ -28,7 +29,7 @@ LicenceHandler::LicenceHandler(const std::shared_ptr &ddsHandler, co LicenceHandler::~LicenceHandler() { - for (const LtsLicence::Licence &info : qAsConst(m_licenceVec)) + for (const LtsLicence::Licence &info : std::as_const(m_licenceVec)) m_ddsHandler->dts()->removeLicenceInformationByKey(info.name.toStdString()); } // end of dtor() //----------------------------------------------------------------------------- @@ -302,7 +303,7 @@ QString LicenceHandler::dumpLicenceInformation(const LtsLicence::Licence &licenc void LicenceHandler::publishAllData() { - for (const LtsLicence::Licence &info : qAsConst(m_licenceVec)) + for (const LtsLicence::Licence &info : std::as_const(m_licenceVec)) publishData(info); } // end of publishAllData() //----------------------------------------------------------------------------- diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/main.cpp index 46db63fe0..2c0497c84 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/main.cpp @@ -54,9 +54,12 @@ static void daemonize() exit(EXIT_FAILURE); /* Redirect standard files to /dev/null */ - freopen("/dev/null", "r", stdin); - freopen("/dev/null", "w", stdout); - freopen("/dev/null", "w", stderr); + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wunused-result" + (void)freopen("/dev/null", "r", stdin); + (void)freopen("/dev/null", "w", stdout); + (void)freopen("/dev/null", "w", stderr); + #pragma GCC diagnostic pop #endif } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service.cpp index f6ee046c3..329f885d9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service.cpp @@ -7,6 +7,7 @@ */ #include "service.h" +#include #include @@ -83,7 +84,7 @@ ServiceManagement::ServiceProcess *ServiceManagement::Service::toServiceProcess( ServiceManagement::ServiceProcess *ServiceManagement::Service::procFromPid(qint64 pid) { - for (ServiceProcess *currentProc : qAsConst(m_procs)) + for (ServiceProcess *currentProc : std::as_const(m_procs)) { if (currentProc->usablePid() == pid) return currentProc; @@ -93,7 +94,7 @@ ServiceManagement::ServiceProcess *ServiceManagement::Service::procFromPid(qint6 ServiceManagement::ServiceProcess *ServiceManagement::Service::procFromServiceProcId(int32_t id) { - for (ServiceProcess *currentProc : qAsConst(m_procs)) + for (ServiceProcess *currentProc : std::as_const(m_procs)) { if (currentProc->serviceProcessId() == id) return currentProc; @@ -103,13 +104,13 @@ ServiceManagement::ServiceProcess *ServiceManagement::Service::procFromServicePr void ServiceManagement::Service::stopAllProcs() { - for (ServiceProcess *currentProc : qAsConst(m_procs)) + for (ServiceProcess *currentProc : std::as_const(m_procs)) currentProc->terminate(); } void ServiceManagement::Service::waitForStopped() { - for (ServiceProcess *currentProc : qAsConst(m_procs)) + for (ServiceProcess *currentProc : std::as_const(m_procs)) currentProc->waitForFinished(5000); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp index ec9774d5b..136c1ab82 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp @@ -7,6 +7,7 @@ */ #include "service_handler.h" +#include #include #include @@ -111,9 +112,9 @@ void ServiceManagement::ServiceHandler::stopAllServices() INFO_LOG(m_logger) << "Stopping all Services ..."; // shutdown async - for (Service *service : qAsConst(m_services)) + for (Service *service : std::as_const(m_services)) service->stopAllProcs(); - for (Service *service : qAsConst(m_services)) + for (Service *service : std::as_const(m_services)) service->waitForStopped(); INFO_LOG(m_logger) << "... all Services stopped :)"; @@ -147,9 +148,9 @@ void ServiceManagement::ServiceHandler::onNewServiceInfoFromDds(const Core::Curr if (proc == nullptr) { bool found = false; - for (Service *currentService : qAsConst(m_services)) + for (Service *currentService : std::as_const(m_services)) { - for (ServiceProcess *currentProc : qAsConst(currentService->allProcs())) + for (ServiceProcess *currentProc : std::as_const(currentService->allProcs())) { if (currentProc->remotePid() == data.pid) { @@ -182,7 +183,7 @@ void ServiceManagement::ServiceHandler::onNewServiceInfoFromDds(const Core::Curr ServiceManagement::Service *ServiceManagement::ServiceHandler::serviceFromId(int id) { - for (Service *service : qAsConst(m_services)) + for (Service *service : std::as_const(m_services)) { if (service->id() == id) return service; @@ -192,7 +193,7 @@ ServiceManagement::Service *ServiceManagement::ServiceHandler::serviceFromId(int ServiceManagement::ServiceProcess *ServiceManagement::ServiceHandler::serviceProcessFromPid(qint64 pid) { - for (Service *service : qAsConst(m_services)) + for (Service *service : std::as_const(m_services)) { ServiceProcess *result = service->procFromPid(pid); if (result) @@ -203,7 +204,7 @@ ServiceManagement::ServiceProcess *ServiceManagement::ServiceHandler::servicePro ServiceManagement::ServiceProcess *ServiceManagement::ServiceHandler::serviceProcessFromServiceProcId(int32_t id) { - for (Service *service : qAsConst(m_services)) + for (Service *service : std::as_const(m_services)) { ServiceProcess *result = service->procFromServiceProcId(id); if (result) @@ -218,9 +219,9 @@ void ServiceManagement::ServiceHandler::onHeartBeatObserverTimerTimeout() const qint64 minHeartbeatAge = tNow - HEARTBEAT_OBSERVER_INTERVAL; const qint64 minHeartbeatAgeStartup = tNow - HEARTBEAT_OBSERVER_INTERVAL * 6; - for (Service *currentService : qAsConst(m_services)) + for (Service *currentService : std::as_const(m_services)) { - for (ServiceProcess *currentProc : qAsConst(currentService->allProcs())) + for (ServiceProcess *currentProc : std::as_const(currentService->allProcs())) { // dev mode for this proc -> we're not repsonsible for if (currentProc->devMode()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.cpp index bfafc943e..e821ac303 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.cpp @@ -288,7 +288,8 @@ void ServiceManagement::ServiceProcess::killallRemote() sh.startDetached(); #else sh.start(); -#endif DEBUG_LOG(m_logger) << "kill remote " << sh.program() << " " << args.join(QLatin1Char(' ')); +#endif + DEBUG_LOG(m_logger) << "kill remote " << sh.program() << " " << args.join(QLatin1Char(' ')); } void ServiceManagement::ServiceProcess::restart() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.cpp index 1a55673f7..ec1bcfe80 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.cpp @@ -7,6 +7,7 @@ */ #include "main_handler_sqlite.h" +#include #include "db_reader.h" #include "static_publisher.h" @@ -277,16 +278,16 @@ void MainHandlerSqlite::replayTimeMaybeJumpedOverlays(qint64 curTime) // not really optimal QSet oldOverlayIds; oldOverlayIds.reserve(m_currentVisibleOverlays.size()); - for (const FilterInformation &overlay : qAsConst(m_currentVisibleOverlays)) + for (const FilterInformation &overlay : std::as_const(m_currentVisibleOverlays)) oldOverlayIds += overlay.overlayId; m_curOverlayArrayIdx = -1; m_currentVisibleOverlays.clear(); maybeAddNewOverlay(curTime); - for (const FilterInformation &overlay : qAsConst(m_currentVisibleOverlays)) + for (const FilterInformation &overlay : std::as_const(m_currentVisibleOverlays)) oldOverlayIds -= overlay.overlayId; - for (const int overlayId : qAsConst(oldOverlayIds)) + for (const int overlayId : std::as_const(oldOverlayIds)) emit removeOverlay(overlayId); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp index 73199d7f9..3e616ad06 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp @@ -7,6 +7,7 @@ */ #include "static_publisher.h" +#include #include #include #include @@ -157,7 +158,7 @@ void StaticPublisher::publishMainStructureElement(const std::shared_ptr seId2mseId; - for (const auto &mse : qAsConst(mainStructureElements)) + for (const auto &mse : std::as_const(mainStructureElements)) { auto mseDds = InfrastructureManagement::Database::convert(mse); auto itContSe = structureElements.constFind(mse.id); @@ -188,7 +189,7 @@ void StaticPublisher::publishMainStructureElement(const std::shared_ptr &cont : qAsConst(footprintSorted)) + for (const QMap &cont : std::as_const(footprintSorted)) { if (cont.empty()) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.cpp index a42ff1971..79b3a8c4f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.cpp @@ -7,6 +7,7 @@ */ #include "handler_sounds.h" +#include #include "settings.h" #include "dds_handler.h" #include @@ -63,7 +64,7 @@ bool HandlerSounds::init() return false; } - for (const Database::SomSound &data : qAsConst(soundVec)) + for (const Database::SomSound &data : std::as_const(soundVec)) { static int index = 0; DEBUG_LOG(m_logger) << "SomSound from DB data: id=" << data.id @@ -632,7 +633,7 @@ int HandlerSounds::getAssetId(const QString &hostName) int HandlerSounds::getSoundIndex(const SoundCategory &category, const QString &name) { - for (const SoundStr &soundName: qAsConst(m_soundNames)) + for (const SoundStr &soundName: std::as_const(m_soundNames)) if ((category == soundName.category) && (name == soundName.name)) return soundName.index; return -1; @@ -640,7 +641,7 @@ int HandlerSounds::getSoundIndex(const SoundCategory &category, const QString &n int HandlerSounds::getDuration(const SoundManagement::SoundCategory& category,const int soundId) { - for (const SoundStr &soundName: qAsConst(m_soundNames)) + for (const SoundStr &soundName: std::as_const(m_soundNames)) { if ( soundId == soundName.soundId && category == soundName.category) @@ -682,7 +683,7 @@ void HandlerSounds::handleSoundReport(const QString &json, const QString &host) // TODO Pruefen, ob in der lokalen Verwaltung noch Sounds sind, die geloescht und vom DDS-Bus genommen // werden muessen. - for (const QJsonValue &valSound : qAsConst(sounds)) + for (const QJsonValue &valSound : std::as_const(sounds)) { const QJsonObject &sound = valSound.toObject(); bool found = false; @@ -705,7 +706,7 @@ void HandlerSounds::handleSoundReport(const QString &json, const QString &host) << " soundId=" << soundId << " time=" << soundState.sampleTime; - for (const SoundManagement::SoundState& item : qAsConst(m_soundStates)) + for (const SoundManagement::SoundState& item : std::as_const(m_soundStates)) { if ( (item.egcuId == soundState.egcuId) && (item.category == soundState.category) && diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp index ac4c18a0a..1edf5f0f3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp @@ -7,6 +7,7 @@ */ #include "unit_test.h" +#include #include @@ -321,7 +322,7 @@ void tgtTestShootbackTarget::removeTestObjects() { QMap allObj = m_dtcTgt->targetAreaAssignments(); NOTICE_LOG(m_logger) << LOGFUNCTION << " remove... (" << allObj.size() << " TargetAreaAssignments)"; - for (auto item: qAsConst(allObj)) + for (auto item: std::as_const(allObj)) if (item.name().substr(0, 8).compare("UnitTest") == 0) removeAssignment(item.id()); QTest::qWait(250); // time to process reply @@ -333,7 +334,7 @@ void tgtTestShootbackTarget::removeTestObjects() { QMap allObj = m_dtcTgt->shootbackAreas(); NOTICE_LOG(m_logger) << LOGFUNCTION << " remove... (" << allObj.size() << " Areas)"; - for (auto item: qAsConst(allObj)) + for (auto item: std::as_const(allObj)) if (item.name().substr(0, 8).compare("UnitTest") == 0) removeArea(item.id()); QTest::qWait(250); // time to process reply @@ -345,7 +346,7 @@ void tgtTestShootbackTarget::removeTestObjects() { QMap allObj = m_dtcTgt->shootbackTargets(); NOTICE_LOG(m_logger) << LOGFUNCTION << " remove... (" << allObj.size() << " Targets)"; - for (auto item: qAsConst(allObj)) + for (auto item: std::as_const(allObj)) if (item.name().substr(0, 8).compare("UnitTest") == 0) removeTarget(item.id()); QTest::qWait(250); // time to process reply diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.cpp index e417f4c98..417ccd7e8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.cpp @@ -7,6 +7,7 @@ */ #include "main_handler.h" +#include #include "handler_target_area_assignment.h" #include "handler_shootback_target.h" #include "object_shootback_target.h" @@ -68,7 +69,7 @@ bool HandlerShootbackTarget::init() ObjectShootbackTarget *HandlerShootbackTarget::dataForTargetParticipantId(int targetParticipantId) const { - for (ObjectShootbackTarget *item : qAsConst(m_objectMap)) + for (ObjectShootbackTarget *item : std::as_const(m_objectMap)) { if (!item) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.cpp index e1cd1e756..259e42d76 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.cpp @@ -7,6 +7,7 @@ */ #include "main_handler.h" +#include #include "handler_target_area_assignment.h" #include "object_target_area_assignment.h" @@ -67,7 +68,7 @@ bool HandlerTargetAreaAssignment::init() bool HandlerTargetAreaAssignment::isAreaIdUsedInAny(int areaId) { - for (const ObjectTargetAreaAssignment *sample : qAsConst(m_objectMap)) + for (const ObjectTargetAreaAssignment *sample : std::as_const(m_objectMap)) if (sample && (sample->getData().areaId() == areaId)) return true; return false; @@ -75,7 +76,7 @@ bool HandlerTargetAreaAssignment::isAreaIdUsedInAny(int areaId) bool HandlerTargetAreaAssignment::isTargetDataIdUsedInAny(int targetDataId) { - for (const ObjectTargetAreaAssignment *sample : qAsConst(m_objectMap)) + for (const ObjectTargetAreaAssignment *sample : std::as_const(m_objectMap)) if (sample && (sample->getData().targetParticipantId() == targetDataId)) return true; return false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp index 5b2064812..37a4d704e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp @@ -7,6 +7,7 @@ */ #include "shootback_controller.h" +#include #include "object_shootback_area.h" #include "object_shootback_target.h" #include "object_target_area_assignment.h" @@ -275,7 +276,7 @@ void ShootbackController::onParticipantPositionChanged(const ParticipantManageme DEBUG_LOG(m_logger) << " areaId = " << it.key() << "-> partIdRef VORHERXX" << toString(it.value()); } - for (const auto &area : qAsConst(objMap)) + for (const auto &area : std::as_const(objMap)) { if (area) updateInternal_participantPerArea(*area, posData); @@ -537,7 +538,7 @@ void ShootbackController::updateInternalLos(const QSet &changingAssignmentI // Note: m_participantsPerArea is up-to-date QSet areasWithPart = areasWithParticipant(changedParticipantId); DEBUG_LOG(m_logger) << LOGFUNCTION << " areasWithPart=" << areasWithPart.size(); - for (auto curAreaId : qAsConst(areasWithPart)) + for (auto curAreaId : std::as_const(areasWithPart)) DEBUG_LOG(m_logger) << LOGFUNCTION << " -> curAreaId=" << curAreaId; if (!idIsRelevantHelper(areasWithPart, areaId)) @@ -601,7 +602,7 @@ bool ShootbackController::updateInternalLosSingleAssignment(ObjectTargetAreaAssi if (m_participantsPerArea.contains(areaId)) { QSet &partIdRef = m_participantsPerArea[areaId]; - for (auto participantId : qAsConst(partIdRef)) + for (auto participantId : std::as_const(partIdRef)) { // check lineOfSight: DEBUG_LOG(m_logger) << LOGFUNCTION << " check lineOfSight for: assignmentId=" << assignmentId @@ -681,7 +682,7 @@ void ShootbackController::syncExternal() std::vector visiPartPerTargetStd; visiPartPerTargetStd.reserve(visiPartPerTarget.size()); INFO_LOG(m_logger) << LOGFUNCTION << " targetId " << target->getId() << ", visiPartPerTarget = " << toString(visiPartPerTarget); - for (auto id : qAsConst(visiPartPerTarget)) + for (auto id : std::as_const(visiPartPerTarget)) visiPartPerTargetStd.push_back(id); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp index af3c57021..f96e4e528 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp @@ -7,6 +7,7 @@ */ #include "handler_overlays.h" +#include #include "handler_participant_data.h" #include "settings.h" @@ -227,7 +228,7 @@ QString HandlerOverlays::getAllEquipmentNumbers(QSet data, bool isParticipa if (isParticipantIds) data = convertParticipantIdsToEquipmentNo(data); - for (int currentDataId : qAsConst(data)) + for (int currentDataId : std::as_const(data)) { qs.append(QString::number(currentDataId)); qs.append(QLatin1String(", ")); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp index d4698afd5..b0f7d4f56 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp @@ -405,7 +405,7 @@ void WhgTests::onReceiveEqtTypeChanged(const EquipmentTypeWh &data, DataModifica //----------------------------------------------------------------------------- void WhgTests::getEqtTypeWhCreateRequestData(EquipmentTypeWh &data) { - data.id; // -1 for add, 0 is a valid id // 0 should be valid though?!? + // data.id: -1 for add, 0 is a valid id // 0 should be valid though?!? data.name = "TestEqtTypeCreate"; data.minEquipNo = 1000; data.maxEquipNo = 3000; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp index c5017d8de..47e17cc9e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp @@ -8,6 +8,7 @@ * Created by Philipp Dassow, SLST, 2017-12-05 */ #include "WsBaseDataInterface/data_manager.h" +#include #include #include @@ -502,7 +503,7 @@ void DataManager::reconnectSignals() QVector vecExercises; m_mainHandler->db()->select(vecExercises); - for (const auto &exercise : qAsConst(vecExercises)) + for (const auto &exercise : std::as_const(vecExercises)) { createTriggerForExercise(q, exercise.id); const QString tn = triggerName(exercise.id); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/connection_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/connection_handler.cpp index 22b713b0d..5d2faabc7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/connection_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/connection_handler.cpp @@ -7,6 +7,7 @@ * Created by Hannes Fritsche, SLSE, 2017-09-07 */ #include "connection_handler.h" +#include #include "client_connection.h" #include "WsBiteInterface/Messages/message_transmitter.h" @@ -26,7 +27,7 @@ ConnectionHandler::ConnectionHandler() ConnectionHandler::~ConnectionHandler() { - for (auto s : qAsConst(m_connections)) + for (auto s : std::as_const(m_connections)) s->disconnect(this); qDeleteAll(m_connections); } @@ -107,7 +108,7 @@ void ConnectionHandler::onDisconnected(ClientConnection *conn) /* void ConnectionHandler::onPositions(const ::WsBiteInterface::Messages::ReplyMessage &positionsCnr) { - for (ClientConnection *currentConnection : qAsConst(m_connections)) + for (ClientConnection *currentConnection : std::as_const(m_connections)) currentConnection->addMessage(positionsCnr); } */ diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/Adler/WebSocketSimulator/awss_websocket_interface.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/Adler/WebSocketSimulator/awss_websocket_interface.cpp index 3f62cd434..61d6b121a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/Adler/WebSocketSimulator/awss_websocket_interface.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/Adler/WebSocketSimulator/awss_websocket_interface.cpp @@ -19,7 +19,7 @@ WebSocketInterface::WebSocketInterface(QObject *parent) connect(m_socket, &QWebSocket::textMessageReceived, this, &WebSocketInterface::onTextMessageRecived); connect(m_socket, &QWebSocket::connected, this, &WebSocketInterface::onConnected); connect(m_socket, &QWebSocket::disconnected, this, &WebSocketInterface::onDisconnected); - connect(m_socket, QOverload::of(&QWebSocket::error), this, &WebSocketInterface::onError); + connect(m_socket, QOverload::of(&QWebSocket::errorOccurred), this, &WebSocketInterface::onError); } void WebSocketInterface::reset() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/Adler/WebSocketSimulator/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/Adler/WebSocketSimulator/main.cpp index af837abce..b6e0922ed 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/Adler/WebSocketSimulator/main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/Adler/WebSocketSimulator/main.cpp @@ -33,7 +33,7 @@ int main(int argc, char **argv) NGLApplication app(argc, argv); QApplication::setQuitOnLastWindowClosed(true); // we are cool enough to handle it ourselves 8) - QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); + // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled) QNetworkProxy::setApplicationProxy(QNetworkProxy()); // do NOT use proxies anywhere! app.createLogger("awss", "log4cxx_adlerWebSocketSimulator.props"); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/AsmWorkstationCertifier/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/AsmWorkstationCertifier/main.cpp index e74aa0c6c..7dd53a2ed 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/AsmWorkstationCertifier/main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/AsmWorkstationCertifier/main.cpp @@ -11,6 +11,7 @@ // Parts stolen from https://github.com/wille-io/fast-ca/blob/master/main.cpp @ https://github.com/wille-io/fast-ca/blob/7cd703a2751d995da5b0f918198532d4955934f6/main.cpp #include +#include #include #include #include @@ -199,7 +200,7 @@ int main(int argc, char **argv) } bool first = true; - for (const QJsonValue &wsRef : qAsConst(wsArr)) + for (const QJsonValue &wsRef : std::as_const(wsArr)) { const QJsonObject ws(wsRef.toObject()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBAdministration/copy_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBAdministration/copy_exercise.cpp index e5899287d..a8e9631e2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBAdministration/copy_exercise.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBAdministration/copy_exercise.cpp @@ -8,6 +8,7 @@ */ #include "copy_exercise.h" +#include #include #include @@ -473,7 +474,7 @@ void CopyExercise::onPsqlFinishedForAAR(int exitCode, QProcess::ExitStatus exitS const QString schema = DBCommon::getExerciseSchemaName(m_exerciseId); QStringList downloadScriptIds; downloadScriptIds.reserve(m_downloadScriptIds.size()); - for (int id : qAsConst(m_downloadScriptIds)) + for (int id : std::as_const(m_downloadScriptIds)) downloadScriptIds.push_back(QString::number(id)); QString stmt = QLatin1String("DELETE FROM ") + schema + QLatin1String(".pre_presentation WHERE id not in (") + downloadScriptIds.join(QLatin1Char(',')) + QLatin1Char(')'); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBAdministration/exercise_table_generator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBAdministration/exercise_table_generator.cpp index 61935180d..ac3145527 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBAdministration/exercise_table_generator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBAdministration/exercise_table_generator.cpp @@ -7,6 +7,7 @@ */ #include "exercise_table_generator.h" +#include #include #include @@ -450,7 +451,7 @@ bool ExerciseTableGenerator::executeSqlTableRelated(const QString &svcName, cons } bool ok = true; - for (const QString &table : qAsConst(tablesNewlyCreated)) + for (const QString &table : std::as_const(tablesNewlyCreated)) { if (!insertTableData(table, dbSchema, sqlGen)) { @@ -511,7 +512,7 @@ void ExerciseTableGenerator::checkAliveTimer() // -------------------------------------------------------------------------------------------------------- void ExerciseTableGenerator::generateSqlDataForExercise(int exerciseId) { - for (CodeGen::SqlGenerator *sqlGen : qAsConst(m_sqlGeneratorMap)) + for (CodeGen::SqlGenerator *sqlGen : std::as_const(m_sqlGeneratorMap)) { // recreate sql statement with correct schema name (e.g. for serials) if (!sqlGen->generateData(exerciseId)) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/exercises_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/exercises_model.cpp index 8c33b293f..aa5dfc319 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/exercises_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/exercises_model.cpp @@ -9,6 +9,7 @@ */ #include "exercises_model.h" +#include #include #include @@ -243,7 +244,7 @@ QStringList ExercisesModel::getSchemasToUpdate() { QStringList schemas; - for(const ExerciseUpdate &eu : qAsConst(m_vecData)) + for(const ExerciseUpdate &eu : std::as_const(m_vecData)) { if (eu.isChecked) schemas << eu.schema; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/global_updates_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/global_updates_model.cpp index 8b058eacf..d27fc3a7e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/global_updates_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/global_updates_model.cpp @@ -9,6 +9,7 @@ */ #include "global_updates_model.h" +#include #include #include #include @@ -47,7 +48,7 @@ bool GlobalUpdatesModel::initModel(const QSqlDatabase &db, const QString &versio DEBUG_LOG(m_logger) << "versionInt: " << versionInt; DEBUG_LOG(m_logger) << "upperVersion: " << upperVersion; - for (const QString &schema: qAsConst(schemas)) + for (const QString &schema: std::as_const(schemas)) { GlobalUpdate gu; gu.schema = schema; @@ -207,7 +208,7 @@ QStringList GlobalUpdatesModel::getSchemasToUpdate() { QStringList schemas; - for(const GlobalUpdate &gu : qAsConst(m_vecData)) + for(const GlobalUpdate &gu : std::as_const(m_vecData)) { if (gu.isChecked) schemas << gu.schema; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/main.cpp index f0fbd202f..89a6b71ec 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/main.cpp @@ -71,8 +71,7 @@ int main(int argc, char *argv[]) QCoreApplication::setApplicationName(QLatin1String("DBUpdate")); QCoreApplication::setOrganizationName(QLatin1String("RME")); - if (!bHeadless) - app->setAttribute(Qt::AA_UseHighDpiPixmaps); + // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled) NGL::LoggerHandler *lh = dynamic_cast(app.data()); lh->createLogger("dbu", "log4cxx_dbu.props"); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DateTimeSyncer/system_caller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DateTimeSyncer/system_caller.cpp index 8c6094315..dc59c3ff8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DateTimeSyncer/system_caller.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DateTimeSyncer/system_caller.cpp @@ -6,6 +6,7 @@ * Created by Patric Karwat, NLE, 07-03-2019 */ #include "system_caller.h" +#include #include #include @@ -21,7 +22,7 @@ SystemCaller::SystemCaller(QObject *parent) SystemCaller::~SystemCaller() { - for (auto socket : qAsConst(m_sockets)) + for (auto socket : std::as_const(m_sockets)) { socket->close(); socket->deleteLater(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/samplemodel.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/samplemodel.cpp index 02ed3ee8e..50677e21b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/samplemodel.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/samplemodel.cpp @@ -9,6 +9,7 @@ */ #include "samplemodel.h" +#include #include #include #include @@ -57,7 +58,7 @@ SampleModel::SampleModel(QObject *parent) SampleModel::~SampleModel() { - for (const SampleData &sd : qAsConst(m_data)) + for (const SampleData &sd : std::as_const(m_data)) delete sd.dialog; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/topic_tree_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/topic_tree_model.cpp index d2109b90b..649b37896 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/topic_tree_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/topic_tree_model.cpp @@ -9,6 +9,7 @@ */ #include "topic_tree_model.h" +#include #include #include #include @@ -100,7 +101,7 @@ void TopicDataModel::reset() void TopicDataModel::cleanupModelIndexes() { - for (const QModelIndex &idx : qAsConst(m_pathInformations)) + for (const QModelIndex &idx : std::as_const(m_pathInformations)) { IndexData *id = static_cast(idx.internalPointer()); delete id; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/topicselector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/topicselector.cpp index ccab64321..6e135483e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/topicselector.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/topicselector.cpp @@ -9,6 +9,7 @@ */ #include "topicselector.h" +#include #include "typecodeselectordlg.h" #include "nglsettings.h" #include "topic_tree_model.h" @@ -133,14 +134,14 @@ void TopicSelector::onOk() { NGLSettings::instance()->setInfoValues(m_typeCodeInfos); emit typeCodeInfosChanged(); - for (TypeCodeSelectorDlg *tcsd : qAsConst(m_dialogs)) + for (TypeCodeSelectorDlg *tcsd : std::as_const(m_dialogs)) tcsd->reject(); accept(); } void TopicSelector::onCancel() { - for (TypeCodeSelectorDlg *tcsd : qAsConst(m_dialogs)) + for (TypeCodeSelectorDlg *tcsd : std::as_const(m_dialogs)) tcsd->reject(); reject(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DotMatrixDisplay/displayPanelSimulatorMain.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DotMatrixDisplay/displayPanelSimulatorMain.cpp index 6e012b72f..ba1b759df 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DotMatrixDisplay/displayPanelSimulatorMain.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DotMatrixDisplay/displayPanelSimulatorMain.cpp @@ -8,6 +8,7 @@ */ #include +#include #include #include @@ -75,7 +76,7 @@ int main(int argc, char *argv[]) if (portList.count() > 1) { portNumbers.reserve(portList.size()); - for (const QString &s : qAsConst(portList)) + for (const QString &s : std::as_const(portList)) portNumbers << s.toInt(); } else if (portList.count() == 1 && !portList.first().isEmpty()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/Server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/Server.cpp index 7caa1f157..0e22e75d1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/Server.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/Server.cpp @@ -1,4 +1,5 @@ #include "Server.h" +#include #include #include @@ -160,7 +161,7 @@ bool Server::init(quint16 port) QVector types; - for (const QString &s : qAsConst(typesStringList)) + for (const QString &s : std::as_const(typesStringList)) { bool k = true; int type = s.toInt(&k); @@ -175,7 +176,7 @@ bool Server::init(quint16 port) QVector eventsToSend; qint64 eventCount = 0; - for (const Event &e : qAsConst(m_events)) + for (const Event &e : std::as_const(m_events)) { if (e.time >= from && e.time <= to && (types.isEmpty() || types.contains(e.type))) { @@ -190,7 +191,7 @@ bool Server::init(quint16 port) QJsonArray eventArray; - for (const Event &e : qAsConst(eventsToSend)) + for (const Event &e : std::as_const(eventsToSend)) { QJsonObject eObj; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/EgcuSimulator/egcu_simulator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/EgcuSimulator/egcu_simulator.cpp index 2774186a3..faf0f6252 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/EgcuSimulator/egcu_simulator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/EgcuSimulator/egcu_simulator.cpp @@ -1,4 +1,5 @@ #include "egcu_simulator.h" +#include QVector relayStates = {0,0,0,0,0,0,0,0}; @@ -27,7 +28,7 @@ QString sendState() { int i = 0; QString stateString; - for (int value : qAsConst(relayStates)) + for (int value : std::as_const(relayStates)) { QString state = QStringLiteral("\""); state += QString::number(i); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/LicenceEditor/licenceedit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/LicenceEditor/licenceedit.cpp index b5b34108b..e224fac71 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/LicenceEditor/licenceedit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/LicenceEditor/licenceedit.cpp @@ -24,9 +24,9 @@ LicenceEdit::LicenceEdit(QWidget *parent) this, &LicenceEdit::onOk); connect(m_ui->nglDialogButtonBox, &NGLDialogButtonBox::onCancel, this, &LicenceEdit::onCancel); - connect(m_ui->chbIgnoreCount, &QCheckBox::stateChanged, + connect(m_ui->chbIgnoreCount, &QCheckBox::checkStateChanged, this, &LicenceEdit::enableIgnoreCount); - connect(m_ui->chbIgnoreExpiration, &QCheckBox::stateChanged, + connect(m_ui->chbIgnoreExpiration, &QCheckBox::checkStateChanged, this, &LicenceEdit::enableIgnoreExpiration); connect(m_ui->leName, &QLineEdit::textChanged, this, &LicenceEdit::onNameChanged); @@ -47,7 +47,7 @@ LicenceEdit::~LicenceEdit() * * @return void */ -void LicenceEdit::enableIgnoreCount(int checkState) +void LicenceEdit::enableIgnoreCount(Qt::CheckState checkState) { m_ui->lbxCount->setEnabled(checkState == Qt::Unchecked); m_ui->sbMaxCount->setEnabled(checkState == Qt::Unchecked); @@ -63,7 +63,7 @@ void LicenceEdit::enableIgnoreCount(int checkState) * * @return void */ -void LicenceEdit::enableIgnoreExpiration(int checkState) +void LicenceEdit::enableIgnoreExpiration(Qt::CheckState checkState) { m_ui->lbxExpiry->setEnabled(checkState == Qt::Unchecked); m_ui->dateEdit->setEnabled(checkState == Qt::Unchecked); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/LicenceEditor/licenceedit.h b/qt6-after/qt6-migrated-legatus/Lts/Tools/LicenceEditor/licenceedit.h index 54e0e8392..0425b6422 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/LicenceEditor/licenceedit.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/LicenceEditor/licenceedit.h @@ -38,8 +38,8 @@ private slots: void onOk(); void onCancel(); - void enableIgnoreCount(int checkState); - void enableIgnoreExpiration(int checkState); + void enableIgnoreCount(Qt::CheckState checkState); + void enableIgnoreExpiration(Qt::CheckState checkState); void onNameChanged(const QString &name); private: Ui::LicenceEdit *m_ui; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/LicenceEditor/mainwindow.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/LicenceEditor/mainwindow.cpp index 11f332e75..da0a6daef 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/LicenceEditor/mainwindow.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/LicenceEditor/mainwindow.cpp @@ -8,6 +8,7 @@ */ #include "mainwindow.h" +#include #include "ui_mainwindow.h" #include "sortfilter.h" #include @@ -250,7 +251,7 @@ void MainWindow::onActionOpen() m_cryptState = CryptState::Encrypted; } - for (const LtsLicence::Licence &lic : qAsConst(licVec)) + for (const LtsLicence::Licence &lic : std::as_const(licVec)) { m_licences.insert(lic.name, lic); insertRow(lic, m_licencesModel->rowCount()); @@ -330,7 +331,7 @@ void MainWindow::onActionSave() QVector licVec; licVec.reserve(m_licences.size()); - for (const LtsLicence::Licence &lic : qAsConst(m_licences)) + for (const LtsLicence::Licence &lic : std::as_const(m_licences)) licVec += lic; QByteArray licenceBa = LtsLicence::writeUnencryptedLicences(licVec); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/datefilterwidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/datefilterwidget.cpp index 44f63f2e5..b50cfdc85 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/datefilterwidget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/datefilterwidget.cpp @@ -35,7 +35,7 @@ QDateTime DateFilterWidget::dtimeTo() const return m_ui->dteTo->dateTime(); } -void DateFilterWidget::enableMilliSecs(int state) +void DateFilterWidget::enableMilliSecs(Qt::CheckState state) { if (state == 0) { @@ -49,7 +49,7 @@ void DateFilterWidget::enableMilliSecs(int state) } } -void DateFilterWidget::enableTime(int state) +void DateFilterWidget::enableTime(Qt::CheckState state) { if (state == 0) { @@ -101,8 +101,8 @@ bool DateFilterWidget::init() { connect(m_ui->dteUp, &QDateTimeEdit::dateTimeChanged, this, &DateFilterWidget::dateStartFilterChanged); connect(m_ui->dteTo, &QDateTimeEdit::dateTimeChanged, this, &DateFilterWidget::dateEndFilterChanged); - connect(m_ui->chbMilliSecs, &QCheckBox::stateChanged, this, &DateFilterWidget::enableMilliSecs); - connect(m_ui->chbTime, &QCheckBox::stateChanged, this, &DateFilterWidget::enableTime); + connect(m_ui->chbMilliSecs, &QCheckBox::checkStateChanged, this, &DateFilterWidget::enableMilliSecs); + connect(m_ui->chbTime, &QCheckBox::checkStateChanged, this, &DateFilterWidget::enableTime); connect(m_ui->pbReset, &QPushButton::clicked, this, &DateFilterWidget::resetDTEs); emit setStartDateTime(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/datefilterwidget.h b/qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/datefilterwidget.h index b92fbb2aa..d0f75fe5b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/datefilterwidget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/datefilterwidget.h @@ -43,8 +43,8 @@ public slots: void setEndDateTimeValue(const QDateTime &dtime); private slots: - void enableMilliSecs(int state); - void enableTime(int state); + void enableMilliSecs(Qt::CheckState state); + void enableTime(Qt::CheckState state); void resetDTEs(); private: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedLine/Test/content.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedLine/Test/content.cpp index c15a2f8b7..11799f58e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedLine/Test/content.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedLine/Test/content.cpp @@ -1,4 +1,5 @@ #include +#include #include "content.h" #include "fullline.h" @@ -45,7 +46,7 @@ void Content::setCharCount(int charCount) { m_charCount = charCount; - for (FullLine * l : qAsConst(m_lines)) + for (FullLine * l : std::as_const(m_lines)) l->setCharCount(m_charCount); } @@ -58,7 +59,7 @@ void Content::setHeight(int height) { m_height = height; - for (FullLine * l : qAsConst(m_lines)) + for (FullLine * l : std::as_const(m_lines)) l->setHeight(height); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SerialToTcpConverter/controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SerialToTcpConverter/controller.cpp index eae369264..c8a7db0c0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SerialToTcpConverter/controller.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SerialToTcpConverter/controller.cpp @@ -6,6 +6,7 @@ * Created by Philipp Dassow, NLT, 30-11-2018 */ #include "controller.h" +#include #include "settings.h" #include @@ -26,14 +27,14 @@ Controller::Controller(QObject *parent) Controller::~Controller() { - for (const ConverterData &data : qAsConst(m_converterData)) + for (const ConverterData &data : std::as_const(m_converterData)) { if (!data.thread) continue; data.thread->disconnect(this); data.thread->quit(); } - for (const ConverterData &data : qAsConst(m_converterData)) + for (const ConverterData &data : std::as_const(m_converterData)) { if (!data.thread) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SerialToTcpConverter/converter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SerialToTcpConverter/converter.cpp index d81298f16..e4754ecba 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SerialToTcpConverter/converter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SerialToTcpConverter/converter.cpp @@ -6,6 +6,7 @@ * Created by Philipp Dassow, NLT, 30-11-2018 */ #include "converter.h" +#include #include namespace SerialToTcpConverter @@ -47,7 +48,7 @@ Converter::Converter(QObject *parent) Converter::~Converter() { - for (auto socket : qAsConst(m_sockets)) + for (auto socket : std::as_const(m_sockets)) { socket->close(); socket->deleteLater(); @@ -116,7 +117,7 @@ void Converter::readSerial() { const QByteArray ba = m_serialPort->readAll(); INFO_LOG(m_logger) << "Read Serial: " << ba; - for (QTcpSocket *socket : qAsConst(m_sockets)) + for (QTcpSocket *socket : std::as_const(m_sockets)) { socket->write(ba); socket->flush(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddModel.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddModel.cpp index f7882bb8b..f97c718d6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddModel.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddModel.cpp @@ -97,10 +97,10 @@ bool AddModel::setData(const QModelIndex &index, const QVariant &value, int role } -QVariant::Type AddModel::getColumnType(const int column) const +QMetaType::Type AddModel::getColumnType(const int column) const { if (column < 0 || column >= m_headerList.size()) - return QVariant::Invalid; + return QMetaType::UnknownType; return m_headerList.at(column).second; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddModel.h b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddModel.h index bac8d2aa2..cb09346f9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddModel.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddModel.h @@ -13,7 +13,7 @@ public: void setHeaderList(const HeaderList& headerList); void setTablename(const QString& tableName); const QString& getTableName() const; - QVariant::Type getColumnType(const int column) const; + QMetaType::Type getColumnType(const int column) const; const HeaderList& getHeaderList() const; int rowCount(const QModelIndex &parent = QModelIndex()) const override; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/DataModel.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/DataModel.cpp index e8b27bcfc..ebfe73739 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/DataModel.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/DataModel.cpp @@ -41,12 +41,12 @@ void DataModel::addLine(const Data& data) } -void DataModel::addColumn(const QString& columnName, QVariant::Type type) +void DataModel::addColumn(const QString& columnName, QMetaType::Type type) { // QPair pair; // pair.first = columnName; // pair.second = type; - m_newHeaderList.append(QPair(columnName, type)); + m_newHeaderList.append(QPair(columnName, type)); } @@ -117,7 +117,7 @@ QVariant DataModel::data(const QModelIndex &index, int role) const return QVariant(); case Qt::ToolTipRole: - if ((element.type() == QVariant::ULongLong || element.type() == QVariant::LongLong) + if ((element.typeId() == QMetaType::ULongLong || element.typeId() == QMetaType::LongLong) && element.toLongLong() > 1000000000) return QDateTime::fromMSecsSinceEpoch(element.toLongLong()).toString(QStringLiteral("dd.MM.yyyy hh:mm:ss.zzz")); @@ -137,8 +137,8 @@ QVariant DataModel::headerData(int section, Qt::Orientation orientation, int rol case Qt::DisplayRole: return m_headerList.at(section).first; case Qt::ToolTipRole: - int type = m_headerList.at(section).second; - return QString::fromUtf8(QMetaType::typeName(type)); + QMetaType::Type type = m_headerList.at(section).second; + return QString::fromUtf8(QMetaType(type).name()); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/DataModel.h b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/DataModel.h index d6e8219b1..7b1579939 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/DataModel.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/DataModel.h @@ -4,7 +4,7 @@ using Data = QVector; using DataList = QVector; -using HeaderList = QVector>; +using HeaderList = QVector>; class DataModel: public QAbstractTableModel { @@ -17,7 +17,7 @@ public: //void fillModel(const HeaderList &headerList, const DataList &dataList); void dataListReserve(const int size); void addLine(const Data& data); - void addColumn(const QString& columnName, QVariant::Type type); + void addColumn(const QString& columnName, QMetaType::Type type); const HeaderList& getHeaderList() const; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/LoginWnd.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/LoginWnd.cpp index cfb9beadf..d4723b2bc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/LoginWnd.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/LoginWnd.cpp @@ -1,4 +1,5 @@ #include "LoginWnd.h" +#include #include "ui_LoginUi.h" #include @@ -78,7 +79,7 @@ void LoginWnd::fillPresetComboBox() const PresetManager::PresetList &presetList = presetManager.getPresetList(); - for (const Preset &preset : qAsConst(presetList)) + for (const Preset &preset : std::as_const(presetList)) m_ui->cbPresets->addItem(preset.name); if (!presetList.isEmpty()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/PresetManager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/PresetManager.cpp index 5fd9a0cab..522b88abc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/PresetManager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/PresetManager.cpp @@ -1,4 +1,5 @@ #include "PresetManager.h" +#include #include #include @@ -132,7 +133,7 @@ void PresetManager::savePresets() createFile(); // recreate file // save all presets to file - for (const Preset &preset : qAsConst(presetList)) + for (const Preset &preset : std::as_const(presetList)) { QString presetString = QStringLiteral("%1:%2%3"); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/Query.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/Query.cpp index 0b3ec48fe..6d0286917 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/Query.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/Query.cpp @@ -1,4 +1,5 @@ #include "ui_QueryUi.h" +#include #include "Query.h" #include "QueryThread.h" @@ -163,7 +164,7 @@ void Query::slotExportCSV() file.write(columnNames.join(QLatin1Char(',')).toUtf8()); // write header file.write(NEWLINE); - for (const QString &row : qAsConst(rows)) + for (const QString &row : std::as_const(rows)) { file.write(row.toUtf8()); file.write(NEWLINE); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/QueryThread.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/QueryThread.cpp index 2d80e1f76..dcbf277cf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/QueryThread.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/QueryThread.cpp @@ -194,7 +194,7 @@ QString QueryWorker::selectQuery(const QString &queryString, DataModel* dataMode for (int i = 0; i < recordCount; i++) { - dataModel->addColumn(record.fieldName(i), record.field(i).type()); + dataModel->addColumn(record.fieldName(i), static_cast(record.field(i).metaType().id())); if (m_dy) break; } @@ -427,7 +427,7 @@ void QueryWorker::slotAddLines(Query* caller, AddModel* addModel) //{ // // value comes from sql database and must be made 'visual' -// QVariant::Type type = headerList.at(col).second; // get column type from model +// QMetaType::Type type = headerList.at(col).second; // get column type from model // //qWarning() << "QueryWorker::variantToSqlString: type =" << type; @@ -451,7 +451,7 @@ QString QueryWorker::valueToSqlString(const QVariant& val, const HeaderList &hea { // value must be converted to sql value - QVariant::Type type = headerList.at(col).second; // get column type from model + QMetaType::Type type = headerList.at(col).second; // get column type from model //qWarning() << "QueryWorker::valueToSqlString: val" << val << "type" << type << "("< #include #include #include @@ -105,7 +106,7 @@ void HTTPRequestHandler::removeParams(const QString &groupName, QNetworkAccessMa tempList.append(removeUrl); } tempList.removeDuplicates(); - for (const QString &string : qAsConst(tempList)) + for (const QString &string : std::as_const(tempList)) { QUrl url; url.setUrl(string); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/main_handler.cpp index 6f51f0812..5e9badb4f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/main_handler.cpp @@ -90,8 +90,6 @@ void VulnerabilityStateGenerator::MainHandler::quit() ProjectDataManagement::VulnerabilityState VulnerabilityStateGenerator::MainHandler::randomVulnerabilityState() { - ProjectDataManagement::VulnerabilityState result; - qsrand(QDateTime::currentMSecsSinceEpoch()); unsigned int index = 0; if (m_vsMap.size() > 0) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_builder_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_builder_base.cpp index 2bb20c737..a2cb918d1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_builder_base.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_builder_base.cpp @@ -159,7 +159,7 @@ QString SidcBuilderBase::concreteSidcToBaseSymbolCode(const QString &sidcCodec) case SymbologyType::APP6D : // it's same as MIL2525D case SymbologyType::MIL2525D : { - if (rawSidc.count() != 20) + if (rawSidc.size() != 20) return QString(); QString baseSymbolCode( diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_result.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_result.cpp index 1b558c592..934f5f279 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_result.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_result.cpp @@ -196,7 +196,7 @@ void SymbolResultWatcherComboxBox::onResultReady() return; // should NEVER happen! (Which object should have triggered the signal???) int idx = m_comboBox->findData(QVariant::fromValue(this), m_role); - const QImage &img = symResult->symbolImage().image(); + const QImage img = symResult->symbolImage().image(); m_comboBox->setItemIcon(idx, QPixmap::fromImage(img)); diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvHexDumpHelper.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvHexDumpHelper.cpp index 9981d431a..dc57421df 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvHexDumpHelper.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvHexDumpHelper.cpp @@ -124,6 +124,7 @@ QByteArray telegramId2String(gef_telegramm_id_et telId) case GEF_SANITAETSDIENST_INSTANDSETZUNG_PVSAN: str = "GEF_SANITAETSDIENST_INSTANDSETZUNG_PVSAN"; break; case GEF_BESTANDSMELDUNG_SANITAETSMATERIAL: str = "GEF_BESTANDSMELDUNG_SANITAETSMATERIAL"; break; case GEF_GEFECHTSFELDTELEGRAMM: str = "GEF_GEFECHTSFELDTELEGRAMM"; break; + default: break; } Q_ASSERT(str); @@ -160,6 +161,7 @@ QString wirkfeldTyp2Str(TrainingAreaBase::TetraIcd::AreaEffectSimulationType wir return QLatin1String("DUS_SINGLE_MINE_SIMULATOR"); case TrainingAreaBase::TetraIcd::AreaEffectSimulationType::BeStillWarning: return QLatin1String("BE_STILL_WARNING"); + default: break; } return QStringLiteral("Unknown Wirkfeldtyp <%1>").arg(static_cast(wirkfeldTyp)); } diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.cpp index 31e2e48ee..80f6259ed 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.cpp @@ -139,7 +139,7 @@ void MainWindow::readFiles() QByteArray ar = file.read(150); file.close(); - if (ar.count() > 36) + if (ar.size() > 36) { QString issi = getISSI(ar); QByteArray bytes = ar; @@ -278,7 +278,7 @@ QString MainWindow::getISSI(QByteArray ar) ar.remove(4, 200); QByteArray issi = ar.toHex(); - if (ar.count() == 4) + if (ar.size() == 4) { if (ar[2] == '\0' && ar[3] == '\0') { @@ -421,7 +421,7 @@ void MainWindow::writeLogZeiten(const QDateTime &beginn, const QDateTime &end, c msg += end.toString(QLatin1String("hh:mm:ss")); msg += QLatin1Char('\n'); QFile file(m_logZeiten); - file.open(QIODevice::Append | QIODevice::Text); + (void)file.open(QIODevice::Append | QIODevice::Text); file.write(msg.toUtf8()); file.close(); diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp index ef1a93d5b..170e34e2d 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp @@ -13,6 +13,7 @@ #include "PrtCnvBroadcastMgr.hpp" #include +#include #include "PrtCnvDbThread.hpp" #include #include @@ -483,7 +484,7 @@ std::shared_ptr PrtCnvBroadcastMgr::createAcc const int idsToSendNow = (curIdStart + maxIdsPerTelegram <= completeTelegrams ? maxIdsPerTelegram : completeTelegrams % maxIdsPerTelegram); INFO_LOG(m_loggerBcRequest) << telId << ": creating accuTelegram from index " << curIdStart << ", count: " << idsToSendNow; - itStart += curIdStart; + std::advance(itStart, curIdStart); auto tele(std::make_shared(telId, 3 + 2 + sizeOfSumField + sizeof(uint16_t) * idsToSendNow, 0)); diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvInjectionSocket.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvInjectionSocket.cpp index 1a8542739..6b36a6ad0 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvInjectionSocket.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvInjectionSocket.cpp @@ -56,7 +56,7 @@ void PrtCnvInjectionSocket::processInputData() { qint64 available = m_Socket->bytesAvailable(); - if (available < (injectionHeader.m_Size+sizeof(injectionHeader))) + if (available < qint64(injectionHeader.m_Size + sizeof(injectionHeader))) { INFO_LOG(m_logger) << "not enough bytes available - waiting for more data: " << "headersize=" << sizeof(injectionHeader) << " id1=" diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvRadioThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvRadioThread.cpp index 2adacbb60..5e96ca403 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvRadioThread.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvRadioThread.cpp @@ -1529,7 +1529,7 @@ void PrtCnvRadioThread::writeLoginLog(const N_CoPrtCnv::CoPrtCnvRadioTelegram *a QFile file(fileName); - file.open(QIODevice::Append); + (void)file.open(QIODevice::Append); file.write(logData); file.close(); } diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvTelegramLogThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvTelegramLogThread.cpp index d70c034df..dfdf36da9 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvTelegramLogThread.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvTelegramLogThread.cpp @@ -162,7 +162,7 @@ void PrtCnvTelegramLogThread::writeTelegramLog(const QByteArray &a_data, int a_p QFile telegramFile(fileName); - telegramFile.open(QIODevice::WriteOnly | QIODevice::Append); + (void)telegramFile.open(QIODevice::WriteOnly | QIODevice::Append); N_CoPrtCnv::CoPrtCnvLogHeader lh; diff --git a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsingleapplication.cpp b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsingleapplication.cpp index 6d01e20b5..295a95247 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsingleapplication.cpp +++ b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsingleapplication.cpp @@ -25,6 +25,9 @@ QtSingleApplication::QtSingleApplication(int &argc, char **argv, bool GUIenabled : QCoreApplication(argc, argv) #endif { +#ifndef QT6_GUI_AVAILABLE + Q_UNUSED(GUIenabled); +#endif sysInit(); } diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.cpp index c6c84a1ea..1abdf77f3 100644 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.cpp +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.cpp @@ -22,8 +22,10 @@ namespace NGL { Compress::Compress(QObject* parent) - : QObject(parent), m_u2_memFiles(), m_aborted(0), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("nglcompress")) + : QObject(parent) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("nglcompress")) + , m_u2_memFiles() + , m_aborted(0) { DEBUG_LOG(m_logger) << "c_tor"; diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_tarfilter.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_tarfilter.cpp index 42436fdee..216229781 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_tarfilter.cpp +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_tarfilter.cpp @@ -119,7 +119,9 @@ bool TarFilter::Private::fi2tph(const FileInformations &infos) constexpr int octalMax = 01000000; while (checksum > octalMax) checksum -= octalMax; - sprintf(hdr.chksum, "%06o", checksum); + // checksum is bounded to < octalMax (<= 6 octal digits) and fits the 8-byte chksum field; + // keep the modulo so GCC's -Wformat-truncation analysis sees the bound (avoids a false positive). + snprintf(hdr.chksum, sizeof(hdr.chksum), "%.6o", checksum % octalMax); if (!device->write((const char *)&hdr, sizeof(hdr))) { diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.cpp index d8f031897..98d6e5263 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.cpp +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.cpp @@ -12,18 +12,18 @@ #include NGLMainWindow::NGLMainWindow(QWidget *parent) - : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) - , QMainWindow(parent) + : QMainWindow(parent) , m_helpProcess(nullptr) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) , m_versionView(nullptr) , m_menuBar(new QMenuBar(this)) { m_menu[QLatin1String("File")] = m_menuBar->addMenu(tr("File")); m_fileActionBefore = m_menu[QLatin1String("File")]->addSeparator(); - m_menu[QLatin1String("File")]->addAction(QIcon(QLatin1String(":/icons/16x16/application-exit.png")), tr("Quit"), this, &NGLMainWindow::onExit, QKeySequence(tr("Ctrl+q"))); + m_menu[QLatin1String("File")]->addAction(QIcon(QLatin1String(":/icons/16x16/application-exit.png")), tr("Quit"), QKeySequence(tr("Ctrl+q")), this, &NGLMainWindow::onExit); m_menu[QLatin1String("Help")] = m_menuBar->addMenu(tr("Help")); - m_menu[QLatin1String("Help")]->addAction(QIcon(QLatin1String(":/icons/16x16/help-contents.png")), tr("Help"), this, &NGLMainWindow::onHelpIndex, QKeySequence(tr("F1"))); + m_menu[QLatin1String("Help")]->addAction(QIcon(QLatin1String(":/icons/16x16/help-contents.png")), tr("Help"), QKeySequence(tr("F1")), this, &NGLMainWindow::onHelpIndex); m_menu[QLatin1String("Help")]->addSeparator(); m_menu[QLatin1String("Help")]->addAction(QIcon(QLatin1String(":/icons/16x16/help-about.png")), tr("About"), this, &NGLMainWindow::onHelpAbout); diff --git a/qt6-after/qt6-migrated-legatus/include/LtsUtilsGuiDds/ltsutilsguidds_export.h b/qt6-after/qt6-migrated-legatus/include/LtsUtilsGuiDds/ltsutilsguidds_export.h index 36814d74a..0e90bd5b4 100644 --- a/qt6-after/qt6-migrated-legatus/include/LtsUtilsGuiDds/ltsutilsguidds_export.h +++ b/qt6-after/qt6-migrated-legatus/include/LtsUtilsGuiDds/ltsutilsguidds_export.h @@ -12,6 +12,8 @@ // dds_vector_to_pixmap.h uses LTSUTILSCORE_EXPORT (from LtsUtilsCore) // Define it here for compatibility when LtsUtilsGuiDds is used standalone +#ifndef LTSUTILSCORE_EXPORT #define LTSUTILSCORE_EXPORT +#endif #endif // LTSUTILSGUIDDS_EXPORT_H \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/tests/test_nmea_handler.cpp b/qt6-after/qt6-migrated-legatus/tests/test_nmea_handler.cpp index c6c45cc9a..737388a73 100644 --- a/qt6-after/qt6-migrated-legatus/tests/test_nmea_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/tests/test_nmea_handler.cpp @@ -51,7 +51,7 @@ NmeaManagement::NmeaHandler makeHandler() /** * @test GPRMC mit gültiger Checksumme durchläuft den kompletten Parse-Pfad - * (Split auf ,/* via QRegularExpression und pkt_data[1..11]); GPRMC + * (Split auf ,/ * via QRegularExpression und pkt_data[1..11]); GPRMC * publiziert nicht, daher läuft der Test ohne DDS. Wäre der Split auf * das Literal "(,|*)" kaputt, würde pkt_data[2..11] out-of-range und * der Test crashen.