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
@@ -0,0 +1,62 @@
|
||||
/**
|
||||
* ModuleTests for TimeLimeManagement
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ParticipantManagement/ppm_dts.h>
|
||||
#include <TrainingAreaBase/tab_dts.h>
|
||||
#include <GuezIedManagement/gim_dts.h>
|
||||
#include <Proxies/Buildings/bld_dts.h>
|
||||
#include <ExerciseEventManagement/eem_dtc.h>
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <ExerciseEventManagement/logger.h>
|
||||
|
||||
namespace ExerciseEventManagement
|
||||
{
|
||||
class EemTests : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit EemTests(QObject *parent = nullptr);
|
||||
~EemTests() = default;
|
||||
|
||||
bool init(int domainId, int exerciseId, int testId);
|
||||
|
||||
bool testsSuccessful() const
|
||||
{
|
||||
return m_bTestsSuccessful;
|
||||
}
|
||||
|
||||
public Q_SLOTS:
|
||||
void startTest();
|
||||
protected Q_SLOTS:
|
||||
|
||||
void tryCreateDynamicParticipantData(int participantId, ProjectDataManagement::VulnerabilityState vulnState, qint64 time, int chargeTypeId,
|
||||
ProjectDataManagement::StateChangeOriginator originator = ProjectDataManagement::StateChangeOriginator::Participant);
|
||||
void trySendFireEvent();
|
||||
void trySendBiteMessage();
|
||||
void trySendBuildingState();
|
||||
void tryCreateIed(qint64 time);
|
||||
void checkEvents(const ProjectDataManagement::EventType &et, int expected);
|
||||
|
||||
void failExit();
|
||||
void ExitSuccess();
|
||||
private:
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector42;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dts> m_ppmDts;
|
||||
std::shared_ptr<TrainingAreaBase::Interface::Dts> m_tabDts;
|
||||
std::shared_ptr<Buildings::Interface::Dts> m_bldDts;
|
||||
std::shared_ptr<GuezIedManagement::Interface::Dts> m_gimDts;
|
||||
std::shared_ptr<ExerciseEventManagement::Interface::Dtc> m_dtc;
|
||||
bool m_bTestsSuccessful{true};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
int m_testId{0};
|
||||
};
|
||||
|
||||
} // namespace ExerciseEventManagement
|
||||
Reference in new issue
Block a user