Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

This commit is contained in:
torsten committed 2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
18635 files changed
+2466913 -906310

No files matched your search

@@ -5,14 +5,27 @@
#include "exm_exercise.h"
#include "ParticipantManagement/ppm_enums.hpp"
#include "FileManagement/flm_db.h"
#include <QtCore/QObject>
#include <QtCore/QList>
#include <functional>
#include <vector>
#include <string>
namespace ExerciseManagement
{
// ExercisePhase struct
struct ExercisePhase
{
[[nodiscard]] int id() const { return m_id; }
[[nodiscard]] std::string name() const { return m_name; }
int m_id = 0;
std::string m_name;
};
namespace Interface
{
@@ -24,6 +37,12 @@ public:
Dtc() = default;
~Dtc() override = default;
// Initialization methods
void enableExercise() {}
void waitForHistoricalDataExercise() {}
void enableExercisePhase() {}
void waitForHistoricalDataExercisePhase() {}
// Exercise-Liste abrufen (Callback-basiert)
void exercises(const std::function<void(const Exercise&)>& callback) const {
for (const auto& ex : m_exercises) {
@@ -31,6 +50,31 @@ public:
}
}
// Einzelnes Exercise nach ID abrufen
Exercise exercise(int id) const {
for (const auto& ex : m_exercises) {
if (ex.id == id) {
return ex;
}
}
return Exercise{}; // Return empty exercise if not found
}
// Exercise-Phase nach ID abrufen
ExercisePhase exercisePhase(int phaseId) const {
for (const auto& phase : m_phases) {
if (phase.m_id == phaseId) {
return phase;
}
}
return ExercisePhase{}; // Return empty phase if not found
}
// Folders abrufen (Callback-basiert) - benötigt von LtsFileDialog
void folders(const std::function<void(const std::vector<FileManagement::Folder>&)>& callback) const {
callback(m_folders);
}
// Exercise-Liste als QList
QList<Exercise> exercisesList() const { return m_exercises; }
@@ -67,6 +111,8 @@ signals:
private:
QList<Exercise> m_exercises;
std::vector<ExercisePhase> m_phases;
std::vector<FileManagement::Folder> m_folders;
};
} // namespace Interface
@@ -15,15 +15,18 @@ namespace ExerciseManagement
struct EXMCOMMON_EXPORT Exercise
{
int id = 0;
QString name;
QString m_name;
int phase = 0; // Exercise phase ID
SymbolAppearance symbolAppearance = SymbolAppearance::Solid;
SymbolVisibility symbolVisibility = SymbolVisibility::Visible;
[[nodiscard]] std::string name() const { return m_name.toStdString(); }
// Weitere Felder werden bei Bedarf ergänzt
};
// Stream operator for logging
inline std::ostream& operator<<(std::ostream& os, const Exercise& ex) {
os << "Exercise(id=" << ex.id << ", name=" << ex.name.toStdString() << ")";
os << "Exercise(id=" << ex.id << ", name=" << ex.m_name.toStdString() << ")";
return os;
}