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,106 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
*
|
||||
* PPM Function Topic test executable
|
||||
*
|
||||
* ModuleTests for PPM function topics
|
||||
* ---------------------------------------------------
|
||||
*
|
||||
* => (!) Preconditons:
|
||||
* - Service svcParticipantManagement -e 0 running
|
||||
*
|
||||
* -------------------------------------------------
|
||||
*
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*
|
||||
* Created by Hannes Baeuerle, SLSE, 2015-07-18
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <ParticipantManagement/ppm_ftc_types.h>
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
|
||||
#include <ParticipantManagement/logger.h>
|
||||
|
||||
//----------------------------------------------------------------------------------
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
class PpmTests : public QObject
|
||||
, protected ParticipantManagement::Interface::Ftc::ModifyTypeReplyHandler
|
||||
, protected ParticipantManagement::Interface::Ftc::RemoveTypeReplyHandler
|
||||
, protected ParticipantManagement::Interface::Ftc::ModifyEquipmentTypeDataReplyHandler
|
||||
, protected ParticipantManagement::Interface::Ftc::ModifyParticipantDataReplyHandler
|
||||
, protected ParticipantManagement::Interface::Ftc::ModifyPartyDataReplyHandler
|
||||
, protected ParticipantManagement::Interface::Ftc::ModifyTemplateDataReplyHandler
|
||||
, protected ParticipantManagement::Interface::Ftc::RemovePartyReplyHandler
|
||||
, protected ParticipantManagement::Interface::Ftc::SyncPartiesReplyHandler
|
||||
, protected ParticipantManagement::Interface::Ftc::ChangePartyUsedStateReplyHandler
|
||||
, protected ParticipantManagement::Interface::Ftc::RegisterParticipantReplyHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit PpmTests(QObject *parent = nullptr);
|
||||
~PpmTests();
|
||||
|
||||
bool init(int domainId, int exerciseId, int testId, int partyId, int typeId, int equipmentId, int participantId);
|
||||
bool testsSuccessful() const { return m_bTestsSuccessful; }
|
||||
|
||||
public Q_SLOTS:
|
||||
void startTest();
|
||||
protected Q_SLOTS:
|
||||
void tryCreateEquipmentType();
|
||||
void tryCreateType();
|
||||
void tryModifyType();
|
||||
void tryRemoveType();
|
||||
void tryCreateParticipant();
|
||||
void tryCreateParty();
|
||||
void tryModifyParty();
|
||||
void tryRemoveParty();
|
||||
void trySyncParties();
|
||||
void tryChangeUsed();
|
||||
void tryCreateTemplate();
|
||||
void tryUpdateInfoParticipant();
|
||||
void tryRegisterParticipant();
|
||||
|
||||
protected:
|
||||
void onModifyTypeReply(const Core::FunctionReplyObject &replyObject) override final { onModifyReply(replyObject); }
|
||||
void onRemoveTypeReply(const Core::FunctionReplyObject &replyObject) override final { onRemoveReply(replyObject); }
|
||||
void onModifyEquipmentTypeDataReply(const Core::FunctionReplyObject &replyObject) override final { onModifyReply(replyObject); }
|
||||
void onModifyParticipantDataReply(const Core::FunctionReplyObject &replyObject) override final { onModifyReply(replyObject); }
|
||||
void onModifyPartyDataReply(const Core::FunctionReplyObject &replyObject) override final { onModifyReply(replyObject); }
|
||||
void onModifyTemplateDataReply(const Core::FunctionReplyObject &replyObject) override final { onModifyReply(replyObject); }
|
||||
void onRemovePartyReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
void onSyncPartiesReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
void onChangePartyUsedStateReply(const Core::FunctionReplyObject &replyObject) override final { onModifyReply(replyObject); }
|
||||
void onRegisterParticipantReply(const RegisterReply &reply) override final;
|
||||
|
||||
// general
|
||||
void onError(const QString &reason);
|
||||
void onCreateReply(const Core::FunctionReplyObject &replyObject);
|
||||
void onModifyReply(const Core::FunctionReplyObject &replyObject);
|
||||
void onRemoveReply(const Core::FunctionReplyObject &replyObject);
|
||||
void failExit();
|
||||
void successExit();
|
||||
|
||||
private:
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Ftc> m_ftc;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtc;
|
||||
|
||||
int m_testId;
|
||||
int m_partyId;
|
||||
int m_typeId;
|
||||
int m_equipmentId;
|
||||
int m_participantId;
|
||||
bool m_bTestsSuccessful;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
} // namespace ParticipantManagement
|
||||
Reference in new issue
Block a user