Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1718 files changed
+126739
-18495
No files matched your search
@@ -55,18 +55,18 @@ 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()
|
||||
<< ", simulationActive=" << aircraft.simulationActive() << "}";
|
||||
os << "NasatAircraft{id=" << aircraft.id << ", name=" << aircraft.name.toStdString()
|
||||
<< ", exerciseId=" << aircraft.exerciseId() << ", nasatId=" << aircraft.nasatId
|
||||
<< ", simulationActive=" << aircraft.simulationActive << "}";
|
||||
return os;
|
||||
}
|
||||
|
||||
inline std::ostream& operator<<(std::ostream& os, const NasatAircraftParticipant& participant)
|
||||
{
|
||||
os << "NasatAircraftParticipant{id=" << participant.id()
|
||||
<< ", nasatAircraftId=" << participant.nasatAircraftId()
|
||||
<< ", exerciseId=" << participant.exerciseId()
|
||||
<< ", participantId=" << participant.participantId() << "}";
|
||||
os << "NasatAircraftParticipant{id=" << participant.id
|
||||
<< ", nasatAircraftId=" << participant.nasatAircraftId
|
||||
<< ", exerciseId=" << participant.exerciseId
|
||||
<< ", participantId=" << participant.participantId << "}";
|
||||
return os;
|
||||
}
|
||||
} // namespace GuezNasat
|
||||
+1
-1
@@ -126,7 +126,7 @@ public:
|
||||
|
||||
private:
|
||||
static QMap<MountingPointType, MpNameImageData> &getImageTableInternal();
|
||||
static void insertHelper(MountingPointType::type type,
|
||||
static void insertHelper(MountingPointType type, // Qt6: legacy MountingPointType_def::type -> enum class MountingPointType (no nested ::type)
|
||||
const QString &name,
|
||||
const QString &colorCodeGray,
|
||||
const QString &colorCodeGreen,
|
||||
|
||||
+5
-34
@@ -1,36 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
// STUB-Header: Diese Datei wird normalerweise von DDS/Codegenerator generiert
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen
|
||||
|
||||
#include "pdm_types.h"
|
||||
|
||||
namespace ProjectDataManagement
|
||||
{
|
||||
|
||||
// EventType wird bereits in pdm_types.h definiert
|
||||
|
||||
// STUB: EventType_def - Platzhalter für DDS-generierten Typ
|
||||
// Wird in AlarmManagement für Event-Typisierung verwendet
|
||||
struct EventType_def
|
||||
{
|
||||
int value{0};
|
||||
|
||||
EventType_def() = default;
|
||||
explicit EventType_def(int v) : value(v) {}
|
||||
explicit EventType_def(EventType t) : value(static_cast<int>(t)) {}
|
||||
|
||||
bool operator==(const EventType_def& other) const { return value == other.value; }
|
||||
bool operator!=(const EventType_def& other) const { return value != other.value; }
|
||||
bool operator<(const EventType_def& other) const { return value < other.value; }
|
||||
};
|
||||
|
||||
// STUB: EventData - Basisstruktur für Event-Daten
|
||||
struct EventData
|
||||
{
|
||||
EventType_def eventType;
|
||||
QString description;
|
||||
qint64 timestamp{0};
|
||||
};
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
// Thin wrapper around the DDS-generated ProjectDataManagement types.
|
||||
// The real types (PdmEventType, VulnerabilityClass, VulnerabilityState, ...) are
|
||||
// generated into build4/Lts/Services/ProjectDataManagement/pdm_enums.hpp by the
|
||||
// RTI code generator. Include that header so consumers get the actual enum types.
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
Reference in new issue
Block a user