BUILD_RTI guards: svcTabCommon export header + GuezMinelayerProcessing stubs
- TrainingAreaBase/CMakeLists.txt: Wrap RTIDDSGEN with BUILD_RTI, add fallback target - GuezMinelayerProcessing: BUILD_RTI guards for HandlerMinelayerData + stubs - ddsfts/CMakeLists.txt: Fix INTERFACE→PUBLIC, add svcTabCommon dependency - Add stub headers for BUILD_RTI=OFF compilation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
8 files changed
+109
-39
No files matched your search
+20
-4
@@ -29,9 +29,9 @@ HandlerMinelayerData::HandlerMinelayerData(const std::shared_ptr<DdsHandler> &dd
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
#if BUILD_RTI
|
||||
, m_tabDtc(nullptr)
|
||||
, m_ppmDtc(nullptr)
|
||||
#if BUILD_RTI
|
||||
, m_aesFtc(nullptr)
|
||||
#endif
|
||||
, m_minefieldInterpreter(new ZSSI_WI_Minenfeld_Interpreter(this))
|
||||
@@ -97,7 +97,7 @@ bool HandlerMinelayerData::init()
|
||||
return ret;
|
||||
}
|
||||
|
||||
void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, DataModification modType)
|
||||
void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, ParticipantManagement::DataModification modType)
|
||||
{
|
||||
if (modType != DataModification::eAdded &&
|
||||
modType != DataModification::eModified)
|
||||
@@ -158,7 +158,7 @@ void HandlerMinelayerData::convertMinelayerDataToXdrData(const TrainingAreaBase:
|
||||
outData.verlegedaten.anzahl_verlegter_minen = inData.mineCount();
|
||||
}
|
||||
|
||||
void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, DataModification modType)
|
||||
void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, ParticipantManagement::DataModification modType)
|
||||
{
|
||||
if ((modType == DataModification::eAdded) ||
|
||||
(modType == DataModification::eModified))
|
||||
@@ -201,7 +201,7 @@ void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::Minela
|
||||
}
|
||||
}
|
||||
|
||||
void HandlerMinelayerData::onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, DataModification modType)
|
||||
void HandlerMinelayerData::onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, ParticipantManagement::DataModification modType)
|
||||
{
|
||||
if ((modType == DataModification::eAdded) ||
|
||||
(modType == DataModification::eModified))
|
||||
@@ -367,4 +367,20 @@ void HandlerMinelayerData::onMineAreaModifyFromCtaDataReply(const Core::Function
|
||||
|
||||
} // namespace GuezMinelayerProcessing
|
||||
|
||||
#else // BUILD_RTI
|
||||
|
||||
namespace GuezMinelayerProcessing
|
||||
{
|
||||
|
||||
HandlerMinelayerData::HandlerMinelayerData(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
{}
|
||||
|
||||
HandlerMinelayerData::~HandlerMinelayerData()
|
||||
{}
|
||||
|
||||
} // namespace GuezMinelayerProcessing
|
||||
|
||||
#endif // BUILD_RTI
|
||||
Reference in new issue
Block a user