lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: BUILD_RTI guards und CMake fixes

Browse Source 
- BUILD_RTI conditional compilation für RTI Connext DDS dependencies
- Namespace fixes in core_dtc.h (Core:: → DDS::Core::)
- CMakeLists.txt: BUILD_RTI option und conditional dependencies
- Handler minelayer: namespace closing mit BUILD_RTI guard
- Build erfolgreich mit BUILD_RTI=OFF validiert

Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
torsten committed 2026-08-21 18:37:18 +02:00
1 parent c599be63e3
commit 950d669538
422 files changed
+1013 -599
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h
+3 -3
View File
@@ -7,7 +7,7 @@
#include "gna_nasat_aircraft_participant.h"
#include <ParticipantManagement/ppm_enums.hpp>
#include <ParticipantManagement/ppm.hpp>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <QObject>
#include <QList>
@@ -38,7 +38,7 @@ public:
~Dtc() override = default;
// NasatAircraftParticipant-Liste abrufen (Callback-basiert)
void nasatAircraftParticipants(const std::function<void(const NasatAircraftParticipant&)>& callback) const {
void forEachNasatAircraftParticipant(const std::function<void(const NasatAircraftParticipant&)>& callback) const {
for (const auto& nap : m_nasatAircraftParticipants) {
callback(nap);
}
@@ -54,7 +54,7 @@ public:
}
// NasatAircraft-Liste abrufen (Callback-basiert)
void nasatAircrafts(const std::function<void(const NasatAircraft&)>& callback) const {
void forEachNasatAircraft(const std::function<void(const NasatAircraft&)>& callback) const {
for (const auto& na : m_nasatAircrafts) {
callback(na);
}
qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h
+15 -7
View File
@@ -10,7 +10,7 @@ namespace GuezNasat
{
// STUB: NasatAircraft - wird durch echten DDS-Typ ersetzt
struct GNACOMMON_EXPORT NasatAircraft
struct NasatAircraft
{
int idValue = 0;
QString nameValue;
@@ -24,10 +24,13 @@ struct GNACOMMON_EXPORT NasatAircraft
int exerciseId() const { return exerciseIdValue; }
int nasatId() const { return nasatIdValue; }
bool simulationActive() const { return simulationActiveValue; }
// Stream operator für Logger
friend std::ostream& operator<<(std::ostream& os, const NasatAircraft& aircraft);
};
// STUB: NasatAircraftParticipant - wird durch echten DDS-Typ ersetzt
struct GNACOMMON_EXPORT NasatAircraftParticipant
struct NasatAircraftParticipant
{
int idValue = 0;
int nasatAircraftIdValue = 0;
@@ -39,13 +42,17 @@ struct GNACOMMON_EXPORT NasatAircraftParticipant
int nasatAircraftId() const { return nasatAircraftIdValue; }
int exerciseId() const { return exerciseIdValue; }
int participantId() const { return participantIdValue; }
// Stream operator für Logger
friend std::ostream& operator<<(std::ostream& os, const NasatAircraftParticipant& participant);
};
} // namespace GuezNasat
// Stream-Operatoren für Logger-Unterstützung
#include <ostream>
inline std::ostream& operator<<(std::ostream& os, const GuezNasat::NasatAircraft& aircraft)
// Stream-Operator Implementierung
namespace GuezNasat
{
inline std::ostream& operator<<(std::ostream& os, const NasatAircraft& aircraft)
{
os << "NasatAircraft{id=" << aircraft.id() << ", name=" << aircraft.name().toStdString()
<< ", exerciseId=" << aircraft.exerciseId() << ", nasatId=" << aircraft.nasatId()
@@ -53,11 +60,12 @@ inline std::ostream& operator<<(std::ostream& os, const GuezNasat::NasatAircraft
return os;
}
inline std::ostream& operator<<(std::ostream& os, const GuezNasat::NasatAircraftParticipant& participant)
inline std::ostream& operator<<(std::ostream& os, const NasatAircraftParticipant& participant)
{
os << "NasatAircraftParticipant{id=" << participant.id()
<< ", nasatAircraftId=" << participant.nasatAircraftId()
<< ", exerciseId=" << participant.exerciseId()
<< ", participantId=" << participant.participantId() << "}";
return os;
}
}
} // namespace GuezNasat