BUILD_RTI=OFF: Fix remaining include and build issues

TrainingAreaBase:
- Add BUILD_RTI guards to dds_handler.cpp (entire file)
- Add BUILD_RTI guards to recv_from_dds_aes.h for tab_db.h include
- Add BUILD_RTI guards to main_handler.h for tab_db.h include
- Remove duplicate m_logger declaration in main_handler.h
- Add stub headers for RTI types (tab_db_stub.hpp, tab_enums_stub.hpp, etc.)

VideoOverlayManagement:
- Fix member initialization order in handler_overlays.h
- Fix member initialization order in avs_interface.h
- Fix member initialization order in main_handler.h
- Change logger.cpp include from NGLLogger.h to INGLLogger.h
- Add BUILD_RTI guard to handler_overlays.cpp for RTI signal connection

Plugins:
- Migrate QDesktopWidget → QScreen in Light/Dark style plugins
- Fix CMakeLists.txt for SituationReplayManagement (BUILD_RTI guards)
- Fix CMakeLists.txt for CombatNetRadio (Qt6::Core linking)
- Remove QDesktopWidget includes in multiple plugin files

Infrastructure:
- Remove duplicate INGLLogger.h include directory
- Add stub headers for ProjectDataManagement (pdm.hpp, etc.)
- Add stub headers for RoutingServiceNG

BUILD_RTI=OFF build now compiles successfully (1112 targets).
This commit is contained in:
torsten committed 2026-08-24 14:37:16 +02:00
1 parent 4969e4ff9b
commit 793c9f8b81
43 files changed
+334 -56

No files matched your search

@@ -1,6 +1,8 @@
#if BUILD_RTI
#include "dds_handler.h"
#include <DDS/DDSConnector/publisher.h>
@@ -91,4 +93,6 @@ bool DdsHandler::init(const QStringList &qosFileList)
return bRet;
}
}
}
#endif // BUILD_RTI
@@ -2,6 +2,8 @@
#pragma once
#if BUILD_RTI
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/core_dtc_types.h>
@@ -65,3 +67,5 @@ private:
};
}
#endif // BUILD_RTI
@@ -199,7 +199,7 @@ void IsmHandler::rotateBuildingFootprint(int mseId)
TetraIcd::RelativePosition relBldgPosition = m_mainHandler->posHandler()->geographicToRelative(mse.geoPosition());
DEBUG_LOG(m_logger) << " mainStructureElements.Rotate id=" << mseId;
QMatrix matrix;
QTransform matrix;
QPolygonF relBuildingFootprintMgrs;
qreal angle = mse.angle();
matrix.rotate(angle);
@@ -8,7 +8,7 @@
#include <QtCore/QRectF>
#include <QtCore/QPointF>
#include <QPolygonF>
#include <QMatrix>
#include <QTransform>
#include <InfrastructureManagement/ism.hpp>
#include <InfrastructureManagement/ism_enums.hpp>
#include <InfrastructureManagement/ism_dtc.h>
@@ -8,7 +8,11 @@
#include "ism_handler.h"
#include "pdm_handler.h"
#include "ppm_handler.h"
#if BUILD_RTI
#include "tab_db.h"
#else
#include "tab_db_stub.hpp"
#endif
#include "dds_handler.h"
#include "position_handler.h"
#include "send_to_dds.h"
@@ -88,13 +92,13 @@ private:
QString getErrorString(const ParticipantManagement::BiteError &error) const;
QString getCanDeviceName(int id) const;
QString getSubDeviceName(int id) const;
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DbHandler> m_dbHandler;
std::shared_ptr<RecvFromTab> m_rxHandler;
std::shared_ptr<RecvFromDdsFts> m_ftsHandler;
std::shared_ptr<TxMixin> m_txHandler;
std::shared_ptr<SendToTab> m_txHandler;
std::shared_ptr<RecvFromDdsAes> m_aesHandler;
std::shared_ptr<IsmHandler> m_ismHandler;
std::shared_ptr<ExmHandler> m_exmHandler;
@@ -1,6 +1,9 @@
#pragma once
#if BUILD_RTI
#include <ProjectDataManagement/pdm_dtc.h>
#include <QtCore/QMap>
#include <QtCore/QHash>
@@ -60,3 +63,5 @@ private:
MainHandler *m_mainHandler;
};
}
#endif // BUILD_RTI
@@ -13,7 +13,9 @@
#include <ProjectDataManagement/pdm_dtc.h>
#include "pdm_handler.h"
#if BUILD_RTI
#include "tab_db.h"
#endif
#include "logger.h"
#include "send_to_tab.h"
#include "training_area_telegrams.h"
@@ -0,0 +1,21 @@
// Stub file for tab_db - BUILD_RTI=OFF
// Auto-generated stub to replace RTI IDL-generated database code
#ifndef TAB_DB_STUB_HPP
#define TAB_DB_STUB_HPP
#include "tab_enums_stub.hpp"
namespace tab {
namespace db {
// Stub class to replace RTI IDL-generated database types
class TrainingDatabase {
public:
virtual ~TrainingDatabase() = default;
};
} // namespace db
} // namespace tab
#endif // TAB_DB_STUB_HPP
@@ -0,0 +1,24 @@
// Stub file for tab_enums - BUILD_RTI=OFF
// Auto-generated stub to replace RTI IDL-generated enums
#ifndef TAB_ENUMS_STUB_HPP
#define TAB_ENUMS_STUB_HPP
namespace tab {
// Stub enums to replace RTI IDL-generated enums
enum class TrainingAreaType {
Unknown = 0,
Standard = 1,
Advanced = 2
};
enum class TrainingStatus {
Inactive = 0,
Active = 1,
Completed = 2
};
} // namespace tab
#endif // TAB_ENUMS_STUB_HPP
@@ -0,0 +1,44 @@
// Stub file for tab types - BUILD_RTI=OFF
// Auto-generated stub to replace RTI IDL-generated types
#ifndef TAB_STUB_HPP
#define TAB_STUB_HPP
#include "tab_enums_stub.hpp"
#include <string>
namespace tab {
// Stub class to replace RTI IDL-generated TrainingArea type
class TrainingArea {
public:
TrainingArea() = default;
virtual ~TrainingArea() = default;
std::string getName() const { return m_name; }
void setName(const std::string& name) { m_name = name; }
TrainingAreaType getType() const { return m_type; }
void setType(TrainingAreaType type) { m_type = type; }
private:
std::string m_name;
TrainingAreaType m_type = TrainingAreaType::Unknown;
};
// Stub class to replace RTI IDL-generated TrainingSession type
class TrainingSession {
public:
TrainingSession() = default;
virtual ~TrainingSession() = default;
TrainingStatus getStatus() const { return m_status; }
void setStatus(TrainingStatus status) { m_status = status; }
private:
TrainingStatus m_status = TrainingStatus::Inactive;
};
} // namespace tab
#endif // TAB_STUB_HPP
@@ -0,0 +1,27 @@
// Stub file for tab_topic_type_plugin - BUILD_RTI=OFF
// Auto-generated stub to replace RTI IDL-generated plugin code
#include "tab_enums_stub.hpp"
namespace tab {
namespace plugin {
// Stub class to replace RTI IDL-generated topic type plugin
class TopicTypePlugin {
public:
virtual ~TopicTypePlugin() = default;
virtual bool initialize() { return true; }
virtual void shutdown() {}
};
} // namespace plugin
} // namespace tab
// Export stub function
extern "C" {
tab::plugin::TopicTypePlugin* createTopicTypePlugin() {
static tab::plugin::TopicTypePlugin instance;
return &instance;
}
}