Merge feature/qt6-migration-basis-modules-services into feature/qt6-migration-basis-modules

Resolves 17 conflicts against legacy Qt5 semantics; validates with BUILD_RTI=ON BUILD_GRANTLEE=ON.
This commit is contained in:
berrux-dev committed 2026-09-24 10:10:25 +02:00
commit 5381c65fee
1200 files changed
+20421 -18259

No files matched your search

@@ -0,0 +1,94 @@
#pragma once
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
// Für die Migration erstellen wir minimale Forward-Declarations
#include <cstdint>
#include <functional>
#include <optional>
#include <string>
#include <QtCore/QObject>
#include "LtsUtils/LtsUtilsCore/data_modification_enum.h"
#include "ProjectDataManagement/pdm_types.h"
namespace AlarmManagement
{
// Position-Struct (wird normalerweise von DDS generiert)
struct Position
{
double longitude = 0.0;
double latitude = 0.0;
double lon() const { return longitude; }
double lat() const { return latitude; }
};
// Notification-Struct (wird normalerweise von DDS generiert)
struct Notification
{
int32_t id = 0;
int64_t time() const { return timestamp; }
int64_t timestamp = 0;
int32_t type = 0;
int32_t priority = 0;
int32_t status = 0;
std::string description;
// Zusätzliche Member für AlarmHistoryModel
int32_t operatorId() const { return m_operatorId; }
int32_t equipmentNumber() const { return m_equipmentNumber; }
std::optional<int32_t> participantId() const { return m_participantId; }
std::optional<int32_t> aesId() const { return m_aesId; }
ProjectDataManagement::EventType eventType() const { return m_eventType; }
Position position() const { return m_position; }
const std::string& properties() const { return m_properties; }
int32_t m_operatorId = 0;
int32_t m_equipmentNumber = 0;
std::optional<int32_t> m_participantId;
std::optional<int32_t> m_aesId;
ProjectDataManagement::EventType m_eventType = ProjectDataManagement::EventType::Unknown;
Position m_position;
std::string m_properties;
};
namespace Interface
{
// Dtc interface class with signals for Qt6 migration STUB
class Dtc : public QObject
{
Q_OBJECT
public:
explicit Dtc(QObject* parent = nullptr) : QObject(parent) {}
~Dtc() override = default;
// Callback registration instead of enableNotification()
void notifications(std::function<void(const Notification&)> callback)
{
m_notificationCallback = callback;
}
// Trigger notification changed (for STUB testing)
void triggerNotificationChanged(const Notification& notification, DataModification modType)
{
emit notificationChanged(notification, modType);
if (m_notificationCallback)
{
m_notificationCallback(notification);
}
}
signals:
void notificationChanged(const Notification& notification, DataModification modType);
private:
std::function<void(const Notification&)> m_notificationCallback;
};
class Ftc;
} // namespace Interface
} // namespace AlarmManagement
@@ -0,0 +1,14 @@
#pragma once
// Translation Helper für AlarmManagement Module
// Wrapper für QObject::tr() in nicht-QObject Klassen
#include <QtCore/QString>
#include "svcalmcommon_export.h"
namespace AlarmManagement
{
SVCALMCOMMON_EXPORT QString tr(const char *sourceText, const char *comment = nullptr, int n = -1);
} // namespace AlarmManagement
@@ -0,0 +1,49 @@
#pragma once
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
// Für die Migration erstellen wir minimale Typ-Definitionen
#include <QtCore/QString>
#include "almcommon_export.h"
namespace AlarmManagement
{
// STUB: AlarmConfig - wird durch echten DDS-Typ ersetzt
class ALMCOMMON_EXPORT AlarmConfig
{
public:
AlarmConfig() = default;
int eventTypeId() const { return m_eventTypeId; }
void setEventTypeId(int id) { m_eventTypeId = id; }
bool messageWindow() const { return m_messageWindow; }
void setMessageWindow(bool value) { m_messageWindow = value; }
bool setMarker() const { return m_setMarker; }
void setSetMarker(bool value) { m_setMarker = value; }
int participantId() const { return m_participantId; }
void setParticipantId(int id) { m_participantId = id; }
int id() const { return m_id; }
void setId(int id) { m_id = id; }
bool global() const { return m_global; }
void setGlobal(bool value) { m_global = value; }
int vulnerabilityState() const { return m_vulnerabilityState; }
void setVulnerabilityState(int value) { m_vulnerabilityState = value; }
private:
int m_eventTypeId = 0;
bool m_messageWindow = false;
bool m_setMarker = false;
int m_participantId = 0;
int m_id = 0;
bool m_global = false;
int m_vulnerabilityState = -1;
};
} // namespace AlarmManagement