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:
1200 files changed
+20421
-18259
No files matched your search
+10
@@ -0,0 +1,10 @@
|
||||
#pragma once
|
||||
|
||||
// Convenience header for ExerciseEventManagement
|
||||
// Includes all common types and enums
|
||||
|
||||
#include <ExerciseEventManagement/eem_enums.hpp>
|
||||
#include <ExerciseEventManagement/eem_dtc.h>
|
||||
#include <ExerciseEventManagement/eem_types.h>
|
||||
|
||||
// Additional forward declarations and common types can be added here
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
#pragma once
|
||||
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Forward-Declarations
|
||||
|
||||
namespace ExerciseEventManagement
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc;
|
||||
class Ftc;
|
||||
} // namespace Interface
|
||||
} // namespace ExerciseEventManagement
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
/**
|
||||
* Stub export header for ExerciseEventManagement non-RTI builds
|
||||
* When BUILD_RTI=OFF, svcEemCommon library is not built
|
||||
* This stub allows dependent code to compile
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
// Stub export macros for non-RTI builds
|
||||
#define EEM_EXPORT
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
/**
|
||||
* Stub type definitions for ExerciseEventManagement
|
||||
* When BUILD_RTI=OFF, DDS-generated types are not available
|
||||
* This stub allows dependent code to compile
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <ExerciseEventManagement/eem_export.h>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <memory>
|
||||
|
||||
namespace ExerciseEventManagement
|
||||
{
|
||||
|
||||
/**
|
||||
* @brief Stub Event type for non-RTI builds
|
||||
*/
|
||||
struct EEM_EXPORT Event
|
||||
{
|
||||
Event() = default;
|
||||
~Event() = default;
|
||||
|
||||
// Basic fields - adjust based on actual usage
|
||||
QString id;
|
||||
QString type;
|
||||
QDateTime timestamp;
|
||||
QString description;
|
||||
|
||||
// Copy/move operations
|
||||
Event(const Event&) = default;
|
||||
Event(Event&&) = default;
|
||||
Event& operator=(const Event&) = default;
|
||||
Event& operator=(Event&&) = default;
|
||||
};
|
||||
|
||||
} // namespace ExerciseEventManagement
|
||||
Reference in new issue
Block a user