Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
+14
-10
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* Instance of the UAS plugin
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Mike Wille, ESZS, 2025-04-17
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
@@ -7,9 +12,9 @@
|
||||
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <TrainingAreaBase/dds_handler.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <DDS/Core/function_reply_object.h> // tr_lts
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QObject>
|
||||
|
||||
|
||||
namespace ProjectDataManagement { namespace Interface { class Dtc; } }
|
||||
@@ -37,8 +42,6 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void *m_handle { nullptr };
|
||||
};
|
||||
|
||||
@@ -52,7 +55,7 @@ public:
|
||||
const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler,
|
||||
NGL::Settings *settings);
|
||||
|
||||
std::shared_ptr<TrainingAreaBase::SendToTab> sendToTab() override;
|
||||
std::shared_ptr<TrainingAreaBase::SendToTab> sendToTab() override; // the implementation / our version if SendToTab, so that TAB can send us telegrams
|
||||
bool isDebugInterface() const override { return false; }
|
||||
bool canSendData() const override;
|
||||
void exerciseChanged() override {}
|
||||
@@ -65,13 +68,14 @@ private:
|
||||
int m_exerciseId;
|
||||
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_sendToDds;
|
||||
NGL::Settings *m_settings;
|
||||
TmsIfModuleHandle m_tmsIfModuleHandle;
|
||||
/*void * */ TmsIfModuleHandle m_tmsIfModuleHandle; //{ nullptr };
|
||||
TmsIfAdapter &m_tmsIfAdapter;
|
||||
std::shared_ptr<TrainingAreaBase::DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtcPdm;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Ftc> m_ftcPpm;
|
||||
UAVInterfaceAdapterManager *m_uavIAManager;
|
||||
std::shared_ptr<FromTab> m_fromTab;
|
||||
std::/*unique_ptr*/shared_ptr<FromTab> m_fromTab;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
} // namespace UAS
|
||||
Reference in new issue
Block a user