Qt6 Migration: Merge latest Qt5 devel content and apply migration fixes

- Merged 292 changed files from dlbo snapshot
- Fixed IDL enum collisions (PortType, PdmEventType)
- Fixed Grantlee template for C++11 scoped enums
- Fixed CMake VERSION_GREATER syntax
- Added missing directories (THP, LtsRestClient, etc.)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Lts/Services/AlarmManagement/dds_handler.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/core_dtc.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/core_dtc.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <AlarmManagement/alm_dts.h>
 #include <AlarmManagement/alm_dtc.h>
 #include <AlarmManagement/alm_fts.h>

Lts/Services/AlarmManagement/object_emergency_call.h

@@ -4,7 +4,7 @@
 #include <dds_handler.h>
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 //Generated
 #include <AlarmManagement/alm_db.h>
 

Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp

@@ -40,19 +40,19 @@ AbstractFiringStrategy::~AbstractFiringStrategy()
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
 }
 
-void AbstractFiringStrategy::calculateDispersionTrajectory()
+bool AbstractFiringStrategy::calculateDispersionTrajectory()
 {
   DEBUG_LOG(m_logger) << "calculateDispersionTrajectory";
   // 1. Neuen Zielpunkt berechnen
 
-  const auto &intendendTrajectory = m_effector->intendendTrajectory();
+  const auto intendendTrajectory = m_effector->intendendTrajectory();
 
   // sanity check:
   if (intendendTrajectory.size() < 2)
   {
     ERROR_LOG(m_logger) << LOGFUNCTION
                         << " size of intendendTrajectory not sufficiant, size=" << intendendTrajectory.size();
-    return;
+    return false;
   }
 
   LtsUtils::QPoint3D newTarget = intendendTrajectory.last().position;
@@ -66,6 +66,16 @@ void AbstractFiringStrategy::calculateDispersionTrajectory()
 
   // 2. Neue Trajektorie berechnen
   m_transformedTrajectory = TrajectoryTransform::transformToNewTarget(intendendTrajectory, newTarget);
+
+  // sanity check:
+  if (m_transformedTrajectory.size() < 2)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " size of m_transformedTrajectory not sufficiant, size=" << m_transformedTrajectory.size();
+    return false;
+  }
+
+  return true;
 }
 
 std::vector<Core::GeoPositionRelativeTime> AbstractFiringStrategy::buildTrajectoryGeometry(const QVector<TrajectoryPoint> &relativeTrajectory)
@@ -135,7 +145,7 @@ int AbstractFiringStrategy::sendChargeEffect(const TrajectoryTimeAware &trajecto
 {
   DEBUG_LOG(m_logger) << "sendChargeEffect";
 
-  const auto &trajGeometry = trajectoryTimeAware.geometry();
+  const auto trajGeometry = trajectoryTimeAware.geometry();
 
   // sanity check:
   if (trajGeometry.size() < 2)
@@ -165,7 +175,7 @@ int AbstractFiringStrategy::sendChargeEffect(const TrajectoryTimeAware &trajecto
   chargeEffect.trajectoryTimeAware(trajectoryTimeAware);
 
   const auto &reply = m_effector->mainHandler()->chargeEffectHandler()->createChargeEffect(chargeEffect);
-  DEBUG_LOG(m_logger) << "reply.id=" << reply.id() << ", str:" << reply.str() << ", uniqueId:" << reply.uniqueId();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " reply.id=" << reply.id() << ", str:" << reply.str() << ", uniqueId:" << reply.uniqueId();
   return reply.id();
 }
 

Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.h

@@ -44,7 +44,7 @@ public:
   explicit AbstractFiringStrategy(ObjectEffector *parent);
   virtual ~AbstractFiringStrategy();
 
-  virtual void doFiring() = 0;
+  virtual bool doFiring() = 0;
 
 Q_SIGNALS:
   // Has to be emitted in doFiring() implementation!
@@ -52,7 +52,7 @@ Q_SIGNALS:
 
 protected:
   // methods:
-  void calculateDispersionTrajectory();
+  bool calculateDispersionTrajectory();
   std::vector<Core::GeoPositionRelativeTime> buildTrajectoryGeometry(const QVector<TrajectoryPoint> &trajectory);
   TrajectoryTimeAware                        buildTrajectoryTimeAware(const std::vector<Core::GeoPositionRelativeTime> &trajectoryGeometry, qint64 curTime, int index = 0);
 

Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/default_firing_strategy.cpp

@@ -29,19 +29,50 @@ DefaultFiringStrategy::~DefaultFiringStrategy()
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
 }
 
-void DefaultFiringStrategy::doFiring()
+bool DefaultFiringStrategy::doFiring()
 {
-  calculateDispersionTrajectory();
+  // 1: calculateDispersionTrajectory
+  if (!calculateDispersionTrajectory())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " Error on calculateDispersionTrajectory";
+    return false;
+  }
 
+  if (m_transformedTrajectory.size() < 2)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " transformedTrajectory is not sufficiant"
+                        << ", m_transformedTrajectory.size()" << m_transformedTrajectory.size();
+    return false;
+  }
+
+  // 2: getStartTime
   const qint64 trajectoryStartTime = getStartTime();
 
-  const auto &geometry      = buildTrajectoryGeometry(m_transformedTrajectory);
-  const auto &trajTimeAware = buildTrajectoryTimeAware(geometry, trajectoryStartTime);
+  // 3a buildTrajectoryGeometry
+  const auto geometry = buildTrajectoryGeometry(m_transformedTrajectory);
 
+  // 3b: buildTrajectoryTimeAware
+  const auto trajTimeAware = buildTrajectoryTimeAware(geometry, trajectoryStartTime);
+  // to be bullet-proof:
+  if (trajTimeAware.geometry().size() < 2)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " trajTimeAware is empty";
+    return false;
+  }
+
+  // 4: sendChargeEffect
   const int chargeEffectId = sendChargeEffect(trajTimeAware);
+  if (chargeEffectId < 0)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " sendChargeEffect failed";
+    return false;
+  }
 
+  // 5: signalFired
   emit signalFired(m_effector->participantId(), m_effector->aesItemId(), {chargeEffectId});
+
   DEBUG_LOG(m_logger) << "created ChargeEffectId: " << chargeEffectId;
+  return true;
 }
 
 } //namespace AreaEffectSimulation

Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/default_firing_strategy.h

@@ -22,7 +22,7 @@ public:
   explicit DefaultFiringStrategy(ObjectEffector *effector);
   virtual ~DefaultFiringStrategy();
 
-  void doFiring() override;
+  bool doFiring() override;
 
 }; // class DefaultFiringStrategy
 } // namespace AreaEffectSimulation

Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/dm72_firing_strategy.cpp

@@ -32,35 +32,57 @@ Dm72FiringStrategy::Dm72FiringStrategy(ObjectEffector *effector)
   DEBUG_LOG(m_logger) << "using Dm72FiringStrategy";
 }
 
-void Dm72FiringStrategy::doFiring()
+bool Dm72FiringStrategy::doFiring()
 {
   m_transformedTrajectory = TrajectoryTransform::transformToNewTarget(m_effector->intendendTrajectory(), m_impactPoints.at(m_impactPointIndex++));
 
+  if (m_transformedTrajectory.size() < 2)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " transformedTrajectory is not sufficiant"
+                        << ", m_transformedTrajectory.size()" << m_transformedTrajectory.size();
+    return false;
+  }
+
   if (m_impactPointIndex >= m_impactPoints.size())
     m_impactPointIndex = 0;
 
   const qint64 trajectoryStartTime = getStartTime();
 
-  const auto &geometry      = buildTrajectoryGeometry(m_transformedTrajectory);
-  const auto &trajTimeAware = buildTrajectoryTimeAware(geometry, trajectoryStartTime);
+  const auto geometry      = buildTrajectoryGeometry(m_transformedTrajectory);
+  const auto trajTimeAware = buildTrajectoryTimeAware(geometry, trajectoryStartTime);
 
   QJsonObject props{{QStringLiteral("effectDurationMsec"), m_effectDurationMsec}};
   const int chargeEffectId = sendChargeEffect(trajTimeAware, props);
+  if (chargeEffectId < 0)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " sendChargeEffect failed";
+    return false;
+  }
 
   emit signalFired(m_effector->participantId(), m_effector->aesItemId(), {chargeEffectId});
+
+  return true;
 }
 
 void Dm72FiringStrategy::init()
 {
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", m_effector->participantId=" << m_effector->participantId()
+                      << ", m_effector->aesItemId=" << m_effector->aesItemId();
+
   using namespace AdlerJson;
   using namespace LtsCoordTrans;
 
   m_impactPointIndex = 0;
   m_impactPoints.clear();
 
-  bool bOk;
+  bool bOk = false;
   WirkmittelFeuerkommandoRakete wirkmittel;
-  const QJsonObject properties = QJsonDocument::fromJson(QByteArray::fromStdString(m_effector->effectorData().properties())).object();
+
+  const std::string propertiesStdStr = m_effector->effectorData().properties();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << ", propertiesStdStr= '" << propertiesStdStr << "'";
+
+  const QJsonObject properties = QJsonDocument::fromJson(QByteArray::fromStdString(propertiesStdStr)).object();
   const Core::GeoPosition geoStartPos = participantPosition(m_effector->participantId());
   const UtmCoordinate utmStartPos = UtmCoordinate::fromGeographic(geoStartPos.lon(), geoStartPos.lat());
 
@@ -99,6 +121,8 @@ void Dm72FiringStrategy::init()
   }
 
   DEBUG_LOG(m_logger) << "Got " << m_impactPoints.size() << " impact points";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
 }
 
 QVector<QPointF> Dm72FiringStrategy::mineLayingCentroids() const

Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/dm72_firing_strategy.h

@@ -24,7 +24,7 @@ class Dm72FiringStrategy : public AbstractFiringStrategy
 public:
   explicit Dm72FiringStrategy(ObjectEffector *effector);
 
-  void doFiring() override final;
+  bool doFiring() final;
 
 private: // methods
   void init();

Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.cpp

@@ -36,7 +36,7 @@ GmlrsFiringStrategy::~GmlrsFiringStrategy()
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
 }
 
-void GmlrsFiringStrategy::doFiring()
+bool GmlrsFiringStrategy::doFiring()
 {
   m_transformedTrajectory = TrajectoryTransform::transformToNewTarget(m_effector->intendendTrajectory(), m_impactPoints.at(m_impactPointIndex++));
 
@@ -45,12 +45,18 @@ void GmlrsFiringStrategy::doFiring()
 
   const qint64 trajectoryStartTime = getStartTime();
 
-  const auto &geometry      = buildTrajectoryGeometry(m_transformedTrajectory);
-  const auto &trajTimeAware = buildTrajectoryTimeAware(geometry, trajectoryStartTime);
+  const auto geometry      = buildTrajectoryGeometry(m_transformedTrajectory);
+  const auto trajTimeAware = buildTrajectoryTimeAware(geometry, trajectoryStartTime);
 
   const int chargeEffectId = sendChargeEffect(trajTimeAware);
+  if (chargeEffectId < 0)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " sendChargeEffect failed";
+    return false;
+  }
 
   emit signalFired(m_effector->participantId(), m_effector->aesItemId(), {chargeEffectId});
+  return true;
 }
 
 void GmlrsFiringStrategy::init()

Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.h

@@ -28,7 +28,7 @@ public:
   explicit GmlrsFiringStrategy(ObjectEffector *effector);
   virtual ~GmlrsFiringStrategy();
 
-  void doFiring() override;
+  bool doFiring() override;
 
 private: // methods
   void init();

Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/smart_firing_strategy.cpp

@@ -35,7 +35,7 @@ SmartFiringStrategy::~SmartFiringStrategy()
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
 }
 
-void SmartFiringStrategy::doFiring()
+bool SmartFiringStrategy::doFiring()
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
 
@@ -59,13 +59,19 @@ void SmartFiringStrategy::doFiring()
   // convert from intendendTrajectory (relativ) to TRAJECTORY_TYPE (absolute)
   // The TrajectorySplitter needs TRAJECTORY_TYPE
   // using TRAJECTORY_TYPE = std::vector<Core::GeoPositionRelativeTime>;
-  const auto &intendendTrajectory = m_effector->intendendTrajectory();
-  const auto &trajGeometry = buildTrajectoryGeometry(intendendTrajectory);
+  const auto intendendTrajectory = m_effector->intendendTrajectory();
+  const auto trajGeometry = buildTrajectoryGeometry(intendendTrajectory);
+  if (trajGeometry.size() < 2)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " transformedTrajectory is not sufficiant"
+                        << ", size=" << trajGeometry.size();
+    return false;
+  }
 
   // split and avoid copying:
   const TrajectorySplitter<std::vector<Core::GeoPositionRelativeTime>> splitter(trajGeometry);
-  const auto &trajGeo1 = splitter.getTrajectory1();
-  const auto &trajGeo2 = splitter.getTrajectory2();
+  const auto trajGeo1 = splitter.getTrajectory1();
+  const auto trajGeo2 = splitter.getTrajectory2();
 
   DEBUG_LOG(m_logger) << "splitter: " << " intendendTrajectory.size = " << intendendTrajectory.size();
   DEBUG_LOG(m_logger) << "splitter: " << " trajGeometry.size = " << trajGeometry.size();
@@ -76,27 +82,32 @@ void SmartFiringStrategy::doFiring()
   //
   // and second, process both Trajectories/Impacts
   //
-
-  // ToDo: Check, how oftem signalFired should be fired?
   QVector<int> chargeEffectIds;
   if (trajGeo1.size() > 2)
   {
-    const auto &trajTimeAware = buildTrajectoryTimeAware(trajGeo1, trajectoryStartTime, 0);
+    const auto trajTimeAware = buildTrajectoryTimeAware(trajGeo1, trajectoryStartTime, 0);
     const int chargeEffectId = sendChargeEffect(trajTimeAware);
-    chargeEffectIds << chargeEffectId;
+    if (chargeEffectId < 0)
+      WARNING_LOG(m_logger) << LOGFUNCTION << " sendChargeEffect failed";
+    else
+      chargeEffectIds << chargeEffectId;
     DEBUG_LOG(m_logger) << "Trajectory1 - created ChargeEffectId: " << chargeEffectId;
   }
   if (trajGeo2.size() > 2)
   {
-    const auto &trajTimeAware = buildTrajectoryTimeAware(trajGeo2, trajectoryStartTime, 1);
+    const auto trajTimeAware = buildTrajectoryTimeAware(trajGeo2, trajectoryStartTime, 1);
     const int chargeEffectId = sendChargeEffect(trajTimeAware);
-    chargeEffectIds << chargeEffectId;
+    if (chargeEffectId < 0)
+      WARNING_LOG(m_logger) << LOGFUNCTION << " sendChargeEffect failed";
+    else
+      chargeEffectIds << chargeEffectId;
     DEBUG_LOG(m_logger) << "Trajectory2 - created ChargeEffectId: " << chargeEffectId;
   }
-  if (chargeEffectIds.size())
+  if (!chargeEffectIds.empty())
     emit signalFired(m_effector->participantId(), m_effector->aesItemId(), chargeEffectIds);
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
 }
 
 } // namespace AreaEffectSimulation

Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/smart_firing_strategy.h

@@ -27,7 +27,7 @@ public:
   explicit SmartFiringStrategy(ObjectEffector *effector);
   virtual ~SmartFiringStrategy();
 
-  void doFiring() override;
+  bool doFiring() override;
 
 private: // methods
   

Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp

@@ -13,7 +13,7 @@
 
 // AES
 #include <AreaEffectSimulation/Utils/polygons.h>
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 #include <Core/core.hpp>
 
 

Lts/Services/AreaEffectSimulation/dds_handler.cpp

@@ -9,8 +9,8 @@
 #include "aes_dts.h"
 #include "aes_fts.h"
 
-#include <Core/pacemaker.h>
-#include <Core/core_dtc.h>
+#include <DDS/Core/pacemaker.h>
+#include <DDS/Core/core_dtc.h>
 #include <TrainingAreaBase/tab_dtc.h>
 #include <QCoreApplication>
 #include <QThread>

Lts/Services/AreaEffectSimulation/dds_handler.h

@@ -9,8 +9,8 @@
 #include <DDS/DDSConnector/dds_connector.h>
 #include <AreaEffectSimulation/aes_dts.h>
 #include <AreaEffectSimulation/aes_fts.h>
-#include <Core/core_dtc.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/core_dtc.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <ParticipantManagement/ppm_dtc.h>
 #include <TrainingAreaBase/tab_ftc.h>

Lts/Services/AreaEffectSimulation/handler_charge_administration.cpp

@@ -133,9 +133,11 @@ Core::FunctionReplyObject HandlerChargeAdministration::consumeCharge(int chargeT
   ParticipantManagement::ConnectState connectState = m_mainHandler->dds()->ppmDtc()->saaConnectedState(partyId);
   DEBUG_LOG(m_logger) << "connectState: " << connectState;
 
-  if (m_mainHandler->dds()->ppmDtc()->isPartyAdlerVerbund(partyId) && connectState == ParticipantManagement::ConnectState::Connected)
+  if (m_mainHandler->dds()->ppmDtc()->isPartyAdlerVerbund(partyId) && connectState == ParticipantManagement::ConnectState::Connected
+      && m_mainHandler->dds()->pdmDtc()->isAdlerChargeType(chargeTypeId))
     effectSource = ProjectDataManagement::EffectSource::ES_ADLER;
-  else if (!m_mainHandler->dds()->ppmDtc()->isPartyAdlerVerbund(partyId) && connectState == ParticipantManagement::ConnectState::Connected)
+  else if (!m_mainHandler->dds()->ppmDtc()->isPartyAdlerVerbund(partyId) && connectState == ParticipantManagement::ConnectState::Connected
+           && m_mainHandler->dds()->pdmDtc()->isAdlerChargeType(chargeTypeId))
     effectSource = ProjectDataManagement::EffectSource::ES_ADLER_STANDALONE;
 
   DEBUG_LOG(m_logger) << "effectSource: " << effectSource;

Lts/Services/AreaEffectSimulation/main_handler.cpp

@@ -37,7 +37,7 @@
 #include <Trajectory/trajectory_generator.h>
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <ngldb/db_service_handler.h>
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)

Lts/Services/AreaEffectSimulation/mine_corridor_creator.h

@@ -11,7 +11,7 @@
 #include <QObject>
 #include <QTimer>
 
-#include <Core/core.hpp>
+#include <DDS/Core/core.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include "logger.h"
 

Lts/Services/AreaEffectSimulation/object_base.h

@@ -16,7 +16,7 @@
 #include "special_area_provider.h"
 
 #include "logger.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <Trajectory/trajectory_generator.h>
 

Lts/Services/AreaEffectSimulation/object_borderline.h

@@ -10,7 +10,7 @@
 #include <QObject>
 
 #include "object_base.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 #include <AreaEffectSimulation/aes_db.h>
 
 

Lts/Services/AreaEffectSimulation/object_charge_effect.h

@@ -11,7 +11,7 @@
 
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 #include <aes_db.h>
 #include <aes_dtc.h>
 #include <aes_ftc.h>

Lts/Services/AreaEffectSimulation/object_effector.cpp

@@ -183,11 +183,17 @@ void ObjectEffector::onEffectorFired()
   if (m_firingStrategy == nullptr)
   {
     ERROR_LOG(m_logger) << "Not possible to fire. No firing strategy specified.";
-
     return;
   }
 
-  m_firingStrategy->doFiring();
+  const bool bDoFiringSuccess = m_firingStrategy->doFiring();
+  if (!bDoFiringSuccess)
+  {
+    ERROR_LOG(m_logger) << "doFiring failed"
+                        << ", participantId=" << m_participantId
+                        << ", aesItemId=" << m_aesItemId
+                        << ", intendendTrajectory().size()=" << this->intendendTrajectory().size();
+  }
 }
 
 // Anhand der EX-L39 Streuungsdaten wird eine Trajektorie für diesen
@@ -209,7 +215,8 @@ void ObjectEffector::setIndendedTrajectory(const std::vector<Core::RelativePosit
 
 void ObjectEffector::setEffectorData(const EffectorData &effectorData)
 {
-  DEBUG_LOG(m_logger) << "setEffectorData";
+  DEBUG_LOG(m_logger) << "setEffectorData" << ", effectorData.properties() = '" << effectorData.properties() << "'";
+
   m_effectorData = effectorData;
   setIndendedTrajectory(effectorData.trajectoryRelative());
   delete m_firingStrategy;

Lts/Services/AreaEffectSimulation/object_gas_pipe.h

@@ -10,7 +10,7 @@
 #include <QObject>
 
 #include "object_base.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 #include <AreaEffectSimulation/aes_db.h>
 
 

Lts/Services/AssetManagement/dds_handler.cpp

@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace AssetManagement
 {

Lts/Services/AssetManagement/dds_handler.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <AssetManagement/asm_dts.h>
 #include <AssetManagement/asm_fts.h>
 

Lts/Services/AssetManagement/main_handler.cpp

@@ -15,7 +15,7 @@
 #include "settings.h"
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <ngldb/db_service_handler.h>
 
 namespace AssetManagement

Lts/Services/AssetManagement/object_asset.h

@@ -10,7 +10,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <AssetManagement/asm_db.h>

Lts/Services/AssetManagement/object_map_description.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include "logger.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <AssetManagement/asm_db.h>

Lts/Services/AssetManagement/object_relay_info.h

@@ -10,7 +10,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <AssetManagement/asm_db.h>

Lts/Services/AssetManagement/object_training_area.h

@@ -10,7 +10,7 @@
 #include <QObject>
 #include "dds_handler.h"
 #include "logger.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <AssetManagement/asm_db.h>

Lts/Services/AudioVideoManagement/dds_handler.cpp

@@ -18,7 +18,7 @@
 #include <InfrastructureManagement/ism_dtc.h>
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 
 namespace AudioVideoManagement

Lts/Services/AudioVideoManagement/dds_handler.h

@@ -9,11 +9,11 @@
 
 #include "logger.h"
 #include <dds/domain/DomainParticipant.hpp>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <QStringList>
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/core_dts_types.h>
+#include <DDS/Core/core_dts_types.h>
 
 #include <AudioVideoManagement/avm_dts.h>
 #include <AudioVideoManagement/avm_fts.h>

Lts/Services/AudioVideoManagement/main_handler.cpp

@@ -32,7 +32,7 @@
 #include <DDS/DDSConnector/dds_connector.h>
 #include <ngldb/db_service_handler.h>
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 using namespace AudioVideoManagement;
 

Lts/Services/AudioVideoManagement/object_menu_struct.cpp

@@ -13,7 +13,7 @@
 #include "logger.h"
 #include <AudioVideoManagement/avm_dts.h>
 #include <AudioVideoManagement/avm_db.h>
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 #include <ngldb/dbtransaction.h>
 #include <vector>
 #include <set>

Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp

@@ -115,7 +115,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
   //  if (m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(data.chargeTypeId()) == ProjectDataManagement::GearClass_def::AirSupport)
   //    return;
 
-  static const QVector<AreaEffectSimulation::AesType> validAesTypes = {AesType_def::AtExplosionAreaSingleExplosions, AesType_def::AtExplosionSingle, AesType_def::AtExplosionCluster};
+  static const QVector<AreaEffectSimulation::AesType> validAesTypes = {AesType_def::AtEffectCluster, AesType_def::AtExplosionAreaSingleExplosions, AesType_def::AtExplosionSingle, AesType_def::AtExplosionCluster};
   if (!validAesTypes.contains(data.aesTypeId()))
     return;
 
@@ -159,6 +159,12 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
     DEBUG_LOG(m_logger) << "explosionCluster";
     break;
   }
+  case AreaEffectSimulation::AesType::AtEffectCluster:
+  {
+    isCentral  = true;
+    DEBUG_LOG(m_logger) << "effectCluster";
+    break;
+  }
   default:
     DEBUG_LOG(m_logger) << "default, data.aesTypeId=" << aesTypeId;
   } // switch
@@ -268,7 +274,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
     // a) Aiv changes to EsActivated or
     // b) Effects ?
     // So be prepared and calculate hazardDistanceForm already at EsPrepared
-    if (aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionCluster)
+    if (aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionCluster || aesTypeId == AreaEffectSimulation::AesType_def::AtEffectCluster)
     {
       // useHazardDistance = (aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionCluster);
 
@@ -384,7 +390,10 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
       requestTab.equipmentNumber(equipNo);
       requestTab.participantId(pPos.participantId());
       requestTab.chargeTypeId(data.chargeTypeId());
+      //default
       requestTab.aesId(0);
+      requestTab.eventType(ProjectDataManagement::EventType_def::FireEvent);
+      //
       if (data.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::Participant)
       {
         // if we get the equipmentNumber from the participant we will send this (needed by tab)
@@ -402,10 +411,14 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
       {
         requestTab.originatorEquipmentNumber(data.originatorId());
       }
+      else if (data.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
+      {
+        requestTab.aesId(data.originatorId());
+        requestTab.eventType(ProjectDataManagement::EventType_def::ExplosionCluster);
+      }
       requestTab.remainEffectPercent(remainEffectPercent);
       requestTab.position(tabPosition);
       requestTab.effectTime(data.effectStart() / 1000);
-      requestTab.eventType(ProjectDataManagement::EventType_def::FireEvent);
       ParticipantManagement::Participant originator = m_ddsHandler->dtcPpm()->participant(data.originatorId());
       requestTab.partyId(originator.partyId());
       requestTab.mineId(0);

Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.cpp

@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 
-#include <Core/core_dtc.h>
+#include <DDS/Core/core_dtc.h>
 
 namespace TargetAreas
 {

Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h

@@ -9,8 +9,8 @@
 
 #include <QObject>
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/core_dtc.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/core_dtc.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <ParticipantManagement/ppm_dtc.h>
 #include <TrainingAreaBase/tab_ftc.h>
 #include <ParticipantManagement/ppm.hpp>

Lts/Services/CentralEffectSimulation/dds_handler.cpp

@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace CentralEffectSimulation
 {

Lts/Services/CentralEffectSimulation/dds_handler.h

@@ -9,8 +9,8 @@
 
 #include <QObject>
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/core_dtc.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/core_dtc.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <CentralEffectSimulation/ces_dts.h>
 #include <CentralEffectSimulation/ces_fts.h>
 #include <AreaEffectSimulation/aes_dtc.h>

Lts/Services/CentralEffectSimulation/handler_participant.cpp

@@ -118,11 +118,16 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
   }
   else
   {
+    ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(data.participantTypeId());
+    if (typeClass == ParticipantManagement::TypeClass_def::SupportEntity
+        || typeClass == ParticipantManagement::TypeClass_def::SupportUnit
+        || typeClass == ParticipantManagement::TypeClass_def::Unit
+        || typeClass == ParticipantManagement::TypeClass_def::Unknown)
+      return;
+
     // [GUEZE-3102] Aufgesessene Teilnehmer bekommen den Schaden vom Fahrzeug, auf dem sie aufgesessen sind.
-    if ( data.mountedOn().is_set())
-    {
+    if (data.mountedOn().is_set())
       return;
-    }
     int floorId = m_handlerBuildingData->getFloorIdFromRoomId(data.roomId());
     int lastFloorId;
     CesParticipantData partPos(data);

Lts/Services/CentralEffectSimulation/main_handler.cpp

@@ -9,7 +9,7 @@
 #include "main_handler.h"
 #include "settings.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <LtsPluginManager/lts_plugin_loader.h>
 
 #include <LtsElevation/lts_elevation_manager.h>

Lts/Services/CentralEffectSimulation/point_helpers.h

@@ -11,7 +11,7 @@
 #include <QtCore/QPointF>
 #include <QString>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <Core/core.hpp>
+#include <DDS/Core/core.hpp>
 
 namespace CentralEffectSimulation
 {

Lts/Services/CodificationManagement/dds_handler.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <CodificationManagement/cod_dts.h>
 #include <CodificationManagement/cod_fts.h>
 

Lts/Services/CodificationManagement/initialization.cpp

@@ -12,7 +12,7 @@
 #include <CodificationManagement/cod_db.h>
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 using namespace CodificationManagement;
 

Lts/Services/EffectShowClient/dds_handler.cpp

@@ -7,7 +7,7 @@
   */
 
 #include "dds_handler.h"
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace EffectShowClient
 {

Lts/Services/EffectShowClient/dds_handler.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/core_dtc.h>
+#include <DDS/Core/core_dtc.h>
 
 #include <EffectShowClient/esc_dts.h>
 #include <EffectShowClient/esc_fts.h>

Lts/Services/EffectShowClient/main_handler.cpp

@@ -14,7 +14,7 @@
 #include "handler_vehicle.h"
 #include "control_unit_handler.h"
 #include "settings.h"
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace EffectShowClient
 {

Lts/Services/EffectShowClient/object_order.h

@@ -11,7 +11,7 @@
 #include <QObject>
 #include <NotificationManagement/nom_ftc.h>
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <EffectShowClient/esc_db.h>

Lts/Services/EffectShowManagement/dds_handler.h

@@ -9,9 +9,9 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/topic_lock_master.h>
-#include <Core/core_dtc.h>
-#include <Core/core_dts_types.h>
+#include <DDS/Core/topic_lock_master.h>
+#include <DDS/Core/core_dtc.h>
+#include <DDS/Core/core_dts_types.h>
 
 #include <EffectShowManagement/esm_dts.h>
 #include <EffectShowManagement/esm_fts.h>

Lts/Services/EffectShowManagement/object_aes_data.h

@@ -10,7 +10,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <EffectShowManagement/esm_db.h>

Lts/Services/EffectShowManagement/object_effect_show.h

@@ -12,7 +12,7 @@
 #include "esm_convert_from_tab.h"
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 #include <EffectShowManagement/esm_db.h>
 #include <EffectShowManagement/esm_dts.h>
 

Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.h

@@ -10,7 +10,7 @@
 #include "esm_convert_to_tab.h"
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 #include <EffectShowManagement/esm_db.h>
 #include <EffectShowManagement/esm_dts.h>
 

Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.h

@@ -11,7 +11,7 @@
 #include "handler_ppm_data.h"
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <EffectShowManagement/esm_db.h>

Lts/Services/Evaluations/dds_handler.cpp

@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace Evaluations
 {

Lts/Services/Evaluations/initialization.cpp

@@ -13,7 +13,7 @@
 
 #include <DDS/DDSConnector/dds_connector.h>
 #include <ngldb/db_service_handler.h>
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace Evaluations
 {

Lts/Services/Evaluations/object_comment.h

@@ -9,7 +9,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <Evaluations/evl_db.h>

Lts/Services/Evaluations/object_criterium.h

@@ -9,7 +9,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <Evaluations/evl_db.h>

Lts/Services/Evaluations/object_evaluation_element.h

@@ -9,7 +9,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <Evaluations/evl_db.h>

Lts/Services/Evaluations/object_san_category_line.h

@@ -9,7 +9,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <Evaluations/evl_db.h>

Lts/Services/Evaluations/object_san_nine_liner.h

@@ -9,7 +9,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <Evaluations/evl_db.h>

Lts/Services/ExerciseEventManagement/dds_handler.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <ExerciseEventManagement/eem_dts.h>
 #include <InfrastructureManagement/ism_dtc.h>
 #include "logger.h"

Lts/Services/ExerciseEventManagement/main_handler.cpp

@@ -14,7 +14,7 @@
 #include "web_socket_avs.h"
 #include "web_socket_server.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <AlarmManagement/initialization.h>
 #include <FilterManagement/initialization.h>
 #include <MarkerManagement/initialization.h>

Lts/Services/ExerciseManagement/dds_handler.cpp

@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace ExerciseManagement
 {

Lts/Services/ExerciseManagement/dds_handler.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <ExerciseManagement/exm_dts.h>
 #include <ExerciseManagement/exm_fts.h>
 #include <ServiceManagement/scm_ftc.h>

Lts/Services/ExerciseManagement/main_handler.cpp

@@ -13,7 +13,7 @@
 #include "settings.h"
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <ngltools/ngltools_filesystem.h>
 
 namespace ExerciseManagement

Lts/Services/ExerciseManagement/object_exercise.h

@@ -8,7 +8,7 @@
 
 #include <QObject>
 #include "dds_handler.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <ExerciseManagement/exm_db.h>

Lts/Services/ExerciseManagement/object_exercise_phase.h

@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <ExerciseManagement/exm_db.h>

Lts/Services/FileManagement/dds_handler.cpp

@@ -9,7 +9,7 @@
 
 #include "dds_handler.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace FileManagement
 {

Lts/Services/FileManagement/dds_handler.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <FileManagement/flm_dts.h>
 #include <FileManagement/flm_dtc.h>
 #include <FileManagement/flm_fts.h>

Lts/Services/FileManagement/main_handler.cpp

@@ -17,7 +17,7 @@
 #include "pdf_server.h"
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace FileManagement
 {

Lts/Services/FileManagement/object_file_content.h

@@ -11,7 +11,7 @@
 
 #include "base.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <FileManagement/flm_db.h>

Lts/Services/FileManagement/object_file_type_info.h

@@ -11,7 +11,7 @@
 
 #include "base.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <FileManagement/flm_db.h>

Lts/Services/FileManagement/object_folder.h

@@ -11,7 +11,7 @@
 
 #include "base.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <FileManagement/flm_db.h>

Lts/Services/FilterManagement/dds_handler.cpp

@@ -7,7 +7,7 @@
   */
 
 #include "dds_handler.h"
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 
 namespace FilterManagement

Lts/Services/FilterManagement/dds_handler.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <FilterManagement/flt_dts.h>
 #include <FilterManagement/flt_fts.h>
 

Lts/Services/FilterManagement/main_handler.cpp

@@ -8,7 +8,7 @@
 
 #include "settings.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <FilterManagement/initialization.h>
 
 

Lts/Services/GuezIedManagement/dds_handler.cpp

@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace GuezIedManagement
 {

Lts/Services/GuezIedManagement/dds_handler.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <GuezIedManagement/gim_dts.h>
 #include <GuezIedManagement/gim_fts.h>
 #include "logger.h"

Lts/Services/GuezIedManagement/main_handler.cpp

@@ -10,7 +10,7 @@
 
 #include <DDS/DDSConnector/dds_connector.h>
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <ngldb/db_service_handler.h>
 #include <CodificationManagement/initialization.h>
 #include <EffectShowManagement/initialization.h>

Lts/Services/GuezIedManagement/object_ied.h

@@ -10,7 +10,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 #include <ParticipantManagement/ppm_dtc.h>
 
 // Generated

Lts/Services/GuezMinelayerProcessing/dds_handler.cpp

@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace GuezMinelayerProcessing
 {

Lts/Services/GuezMinelayerProcessing/dds_handler.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/topic_lock_master.h>
 #include "logger.h"
 
 namespace GuezMinelayerProcessing

Lts/Services/InfrastructureManagement/dds_handler.cpp

@@ -9,7 +9,7 @@
 
 #include "dds_handler.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace InfrastructureManagement
 {

Lts/Services/InfrastructureManagement/dds_handler.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <InfrastructureManagement/ism_dts.h>
 #include <InfrastructureManagement/ism_fts.h>
 #include "logger.h"

Lts/Services/InfrastructureManagement/main_handler.cpp

@@ -19,7 +19,7 @@
 #include "settings.h"
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ngldb/db_service_handler.h>
 

Lts/Services/InfrastructureManagement/object_effect_area.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "base.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 #include <InfrastructureManagement/ism_db.h>
 

Lts/Services/InfrastructureManagement/object_instrumentation_asset.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "base.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 #include <InfrastructureManagement/ism_db.h>
 

Lts/Services/InfrastructureManagement/object_main_schedule.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "base.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 #include <InfrastructureManagement/ism_db.h>
 

Lts/Services/InfrastructureManagement/object_main_structure_element.h

@@ -12,7 +12,7 @@
 #include <QMap>
 #include <QJsonArray>
 #include "base.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 #include <InfrastructureManagement/ism_db.h>
 

Lts/Services/InfrastructureManagement/object_mounting_point_asset.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "base.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 #include <InfrastructureManagement/ism_db.h>
 

Lts/Services/InfrastructureManagement/object_special_area.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "base.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 #include <InfrastructureManagement/ism_db.h>
 

Lts/Services/InfrastructureManagement/object_structure_element.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "base.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 #include <InfrastructureManagement/ism_db.h>
 #include <InfrastructureManagement/object_main_structure_element.h>

Lts/Services/MarkerManagement/dds_handler.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/topic_lock_master.h>
+#include <DDS/Core/topic_lock_master.h>
 #include <MarkerManagement/mrk_dts.h>
 #include <MarkerManagement/mrk_fts.h>
 #include "logger.h"

Lts/Services/MarkerManagement/object_marker.h

@@ -10,7 +10,7 @@
 
 #include "dds_handler.h"
 #include "mrk_db.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <MarkerManagement/mrk_db.h>

Lts/Services/MarkerManagement/object_snapshot.h

@@ -11,7 +11,7 @@
 #include <QVector>
 #include "dds_handler.h"
 #include "mrk_db.h"
-#include <Core/function_reply_object.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <MarkerManagement/mrk_db.h>

Lts/Services/Messaging/dds_handler.cpp

@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace Messaging
 {

Lts/Services/Messaging/dds_handler.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <Core/topic_lock_master.h>
-#include <Core/core_dtc.h>
+#include <DDS/Core/topic_lock_master.h>
+#include <DDS/Core/core_dtc.h>
 
 #include <ParticipantManagement/ppm_dtc.h>
 

Lts/Services/Messaging/main_handler.cpp

@@ -9,7 +9,7 @@
 #include "main_handler.h"
 #include "settings.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 #include <ngldb/db_service_handler.h>
 
 namespace Messaging

Lts/Services/MeteoDataManagement/dds_handler.cpp

@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 
-#include <Core/pacemaker.h>
+#include <DDS/Core/pacemaker.h>
 
 namespace MeteoDataManagement
 {

Lts/Services/MeteoDataManagement/dds_handler.h

@@ -12,7 +12,7 @@
 #include <MeteoDataManagement/mdm_dts.h>
 #include <MeteoDataManagement/mdm_fts.h>
 
-#include <Core/core_dtc.h>
+#include <DDS/Core/core_dtc.h>
 
 #include "logger.h"