Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.
This commit is contained in:
127 files changed
+2134
No files matched your search
@@ -0,0 +1,58 @@
|
||||
#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 <vector>
|
||||
|
||||
#include <QtCore/QObject>
|
||||
|
||||
#include "LtsUtils/LtsUtilsCore/data_modification_enum.h"
|
||||
#include "mrk_marker.h"
|
||||
|
||||
namespace MarkerManagement
|
||||
{
|
||||
|
||||
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 markers(std::function<void(const Marker&)> callback)
|
||||
{
|
||||
m_markerCallback = callback;
|
||||
}
|
||||
|
||||
// Trigger marker changed (for STUB testing)
|
||||
void triggerMarkerChanged(const Marker& marker, DataModification modType)
|
||||
{
|
||||
emit markerChanged(marker, modType);
|
||||
if (m_markerCallback)
|
||||
{
|
||||
m_markerCallback(marker);
|
||||
}
|
||||
}
|
||||
|
||||
signals:
|
||||
void markerChanged(const Marker& marker, DataModification modType);
|
||||
|
||||
private:
|
||||
std::function<void(const Marker&)> m_markerCallback;
|
||||
};
|
||||
|
||||
class Ftc;
|
||||
|
||||
} // namespace Interface
|
||||
|
||||
} // namespace MarkerManagement
|
||||
@@ -0,0 +1,17 @@
|
||||
#ifndef MRK_FTC_H
|
||||
#define MRK_FTC_H
|
||||
|
||||
// Stub file for mrk_ftc.h - generated code placeholder
|
||||
// This file is auto-generated from mrk_service.xml when BUILD_GRANTLEE=ON
|
||||
// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed
|
||||
|
||||
namespace MarkerManagement {
|
||||
namespace Dds {
|
||||
|
||||
// Forward declarations - actual definitions in generated code
|
||||
class Ftc;
|
||||
|
||||
} // namespace Dds
|
||||
} // namespace MarkerManagement
|
||||
|
||||
#endif // MRK_FTC_H
|
||||
Reference in new issue
Block a user