Qt6 Migration: Update stub headers to include generated files
- Updated all include/*/*_dtc.h stub headers to include generated files
from build4/Lts/Proxies/*/ directories
- Changed ParticipantManagement stub headers to use generated files
- Updated ProjectDataManagement pdm_enums.hpp to include generated file
- Updated Buildings bld_dtc.h to include generated file
- Created BUILD_STATUS_REPORT.md documenting current build state
Migration Status:
- DDS core libraries: ✅ Building successfully (6 libraries)
- Proxies module code: ✅ Migration complete
- Services modules: ⚠️ Pre-existing errors blocking full build
- ParticipantManagement: Type definition mismatches
- InfrastructureManagement: Struct/member mismatches
- ProjectDataManagement: DTC implementation errors
These Services errors are unrelated to Qt6 migration work and require
separate fixes. Once resolved, Proxies module will build automatically.
(cherry picked from commit 5501d1e501)
This commit is contained in:
1 parent
b18844a202
commit
b2e787a70b
40 files changed
+215
-1134
No files matched your search
@@ -1,137 +1,4 @@
|
||||
#pragma once
|
||||
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen
|
||||
|
||||
#include "gna_nasat_aircraft.h"
|
||||
#include "gna_nasat_aircraft_participant.h"
|
||||
#include <ParticipantManagement/ppm_enums.hpp>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QMap>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
|
||||
// Forward declarations
|
||||
namespace ExerciseManagement { namespace Interface { class Dtc; } }
|
||||
namespace ParticipantManagement { namespace Interface { class Dtc; class ForeignGuiComboboxInterface; } }
|
||||
namespace LtsSession { class LtsSession; }
|
||||
|
||||
namespace GuezNasat
|
||||
{
|
||||
|
||||
// NasatAircraftParticipant und NasatAircraft sind bereits in gna_nasat_aircraft.h definiert
|
||||
// Diese Datei enthält nur die Dtc-Klasse
|
||||
|
||||
namespace Interface
|
||||
{
|
||||
|
||||
// Dtc - Data Transfer Component für GuezNasat
|
||||
class Dtc : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
Dtc() = default;
|
||||
~Dtc() override = default;
|
||||
|
||||
// NasatAircraftParticipant-Liste abrufen (Callback-basiert)
|
||||
void forEachNasatAircraftParticipant(const std::function<void(const NasatAircraftParticipant&)>& callback) const {
|
||||
for (const auto& nap : m_nasatAircraftParticipants) {
|
||||
callback(nap);
|
||||
}
|
||||
}
|
||||
|
||||
// NasatAircraftParticipant-Liste als QMap (für Model)
|
||||
QMap<qint32, NasatAircraftParticipant> nasatAircraftParticipants() const {
|
||||
QMap<qint32, NasatAircraftParticipant> result;
|
||||
for (const auto& nap : m_nasatAircraftParticipants) {
|
||||
result[nap.id()] = nap;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// NasatAircraft-Liste abrufen (Callback-basiert)
|
||||
void forEachNasatAircraft(const std::function<void(const NasatAircraft&)>& callback) const {
|
||||
for (const auto& na : m_nasatAircrafts) {
|
||||
callback(na);
|
||||
}
|
||||
}
|
||||
|
||||
// NasatAircraft-Liste als QMap
|
||||
QMap<qint32, NasatAircraft> nasatAircrafts() const {
|
||||
QMap<qint32, NasatAircraft> result;
|
||||
for (const auto& na : m_nasatAircrafts) {
|
||||
result[na.id()] = na;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// Daten hinzufügen/entfernen/ändern
|
||||
void addNasatAircraftParticipant(const NasatAircraftParticipant& nap) {
|
||||
m_nasatAircraftParticipants.append(nap);
|
||||
emit nasatAircraftParticipantChanged(nap, DataModification::eAdded);
|
||||
}
|
||||
|
||||
void updateNasatAircraftParticipant(const NasatAircraftParticipant& nap) {
|
||||
for (auto& existing : m_nasatAircraftParticipants) {
|
||||
if (existing.id() == nap.id()) {
|
||||
existing = nap;
|
||||
emit nasatAircraftParticipantChanged(nap, DataModification::eModified);
|
||||
return;
|
||||
}
|
||||
}
|
||||
addNasatAircraftParticipant(nap);
|
||||
}
|
||||
|
||||
void removeNasatAircraftParticipant(int id) {
|
||||
for (auto it = m_nasatAircraftParticipants.begin(); it != m_nasatAircraftParticipants.end(); ++it) {
|
||||
if (it->id() == id) {
|
||||
NasatAircraftParticipant removed = *it;
|
||||
m_nasatAircraftParticipants.erase(it);
|
||||
emit nasatAircraftParticipantChanged(removed, DataModification::eRemoved);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void addNasatAircraft(const NasatAircraft& na) {
|
||||
m_nasatAircrafts.append(na);
|
||||
emit nasatAircraftChanged(na, DataModification::eAdded);
|
||||
}
|
||||
|
||||
void updateNasatAircraft(const NasatAircraft& na) {
|
||||
for (auto& existing : m_nasatAircrafts) {
|
||||
if (existing.id() == na.id()) {
|
||||
existing = na;
|
||||
emit nasatAircraftChanged(na, DataModification::eModified);
|
||||
return;
|
||||
}
|
||||
}
|
||||
addNasatAircraft(na);
|
||||
}
|
||||
|
||||
void removeNasatAircraft(int id) {
|
||||
for (auto it = m_nasatAircrafts.begin(); it != m_nasatAircrafts.end(); ++it) {
|
||||
if (it->id() == id) {
|
||||
NasatAircraft removed = *it;
|
||||
m_nasatAircrafts.erase(it);
|
||||
emit nasatAircraftChanged(removed, DataModification::eRemoved);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
signals:
|
||||
void nasatAircraftParticipantChanged(const NasatAircraftParticipant& participant, DataModification modificationType);
|
||||
void nasatAircraftChanged(const NasatAircraft& aircraft, DataModification modificationType);
|
||||
|
||||
private:
|
||||
QList<NasatAircraftParticipant> m_nasatAircraftParticipants;
|
||||
QList<NasatAircraft> m_nasatAircrafts;
|
||||
};
|
||||
|
||||
} // namespace Interface
|
||||
} // namespace GuezNasat
|
||||
// STUB-HEADER: Include generated file from build directory
|
||||
#include <Lts/Proxies/GuezNasat/gna_dtc.h>
|
||||
Reference in new issue
Block a user