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,113 @@
|
||||
/**
|
||||
* ProjectDataManagement Function Topic Client interface
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
|
||||
// filename: pdm_ftc.h
|
||||
#pragma once
|
||||
|
||||
#include <ProjectDataManagement/pdm_export.h>
|
||||
#include <ProjectDataManagement/pdm.hpp>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
|
||||
|
||||
namespace DDSConnector
|
||||
{
|
||||
class DdsConnector;
|
||||
}
|
||||
|
||||
namespace ProjectDataManagement
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
class Ftc
|
||||
{
|
||||
protected:
|
||||
Ftc() = default;
|
||||
public:
|
||||
virtual ~Ftc() = default;
|
||||
|
||||
/**
|
||||
* Create a new instance for ProjectDataManagement::Interface::Ftc.
|
||||
* The caller takes ownership of the returned instance!
|
||||
*/
|
||||
PDM_CLIENT_EXPORT static std::shared_ptr<Ftc> create(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, bool forceCreate = false);
|
||||
|
||||
/**
|
||||
* A unique identifier for this FTC
|
||||
*/
|
||||
PDM_CLIENT_EXPORT static inline const char *identifier() { return "ProjectDataManagement.Interface.Ftc"; }
|
||||
|
||||
/**
|
||||
* initialize this Ftc instance with all function topic clients
|
||||
*/
|
||||
virtual bool enableAll(bool enable = true) = 0;
|
||||
/**
|
||||
* only initialize the specific function topic client (can be called instead enableAll())
|
||||
*/
|
||||
|
||||
virtual bool enableInsertUpdateTranslation(bool enable = true) = 0;
|
||||
virtual bool isInsertUpdateTranslationEnabled() const = 0;
|
||||
virtual bool enableUpdateChargeNames(bool enable = true) = 0;
|
||||
virtual bool isUpdateChargeNamesEnabled() const = 0;
|
||||
virtual bool enableUpdateChargeType(bool enable = true) = 0;
|
||||
virtual bool isUpdateChargeTypeEnabled() const = 0;
|
||||
|
||||
|
||||
//
|
||||
// Function Topic 'InsertUpdateTranslation'
|
||||
//
|
||||
class InsertUpdateTranslationReplyHandler
|
||||
{
|
||||
public:
|
||||
InsertUpdateTranslationReplyHandler() = default;
|
||||
virtual ~InsertUpdateTranslationReplyHandler() = default;
|
||||
virtual void onInsertUpdateTranslationReply(const Core::FunctionReplyObject &reply) = 0;
|
||||
};
|
||||
virtual int64_t insertUpdateTranslationRequest(const InsertUpdateTranslationRequest &request, InsertUpdateTranslationReplyHandler *handler) = 0;
|
||||
virtual int64_t insertUpdateTranslationRequest(const InsertUpdateTranslationRequest &request, const std::function<void(const Core::FunctionReplyObject&)> &cb) = 0;
|
||||
virtual int32_t insertUpdateTranslationRequest(const InsertUpdateTranslationRequest &request) noexcept(false) = 0; // await
|
||||
virtual int64_t lastInsertUpdateTranslationRequestUniqueId() const = 0;
|
||||
|
||||
|
||||
//
|
||||
// Function Topic 'UpdateChargeNames'
|
||||
//
|
||||
class UpdateChargeNamesReplyHandler
|
||||
{
|
||||
public:
|
||||
UpdateChargeNamesReplyHandler() = default;
|
||||
virtual ~UpdateChargeNamesReplyHandler() = default;
|
||||
virtual void onUpdateChargeNamesReply(const Core::FunctionReplyObject &reply) = 0;
|
||||
};
|
||||
virtual int64_t updateChargeNamesRequest(const UpdateChargeNamesRequest &request, UpdateChargeNamesReplyHandler *handler) = 0;
|
||||
virtual int64_t updateChargeNamesRequest(const UpdateChargeNamesRequest &request, const std::function<void(const Core::FunctionReplyObject&)> &cb) = 0;
|
||||
virtual int32_t updateChargeNamesRequest(const UpdateChargeNamesRequest &request) noexcept(false) = 0; // await
|
||||
virtual int64_t lastUpdateChargeNamesRequestUniqueId() const = 0;
|
||||
|
||||
|
||||
//
|
||||
// Function Topic 'UpdateChargeType'
|
||||
//
|
||||
class UpdateChargeTypeReplyHandler
|
||||
{
|
||||
public:
|
||||
UpdateChargeTypeReplyHandler() = default;
|
||||
virtual ~UpdateChargeTypeReplyHandler() = default;
|
||||
virtual void onUpdateChargeTypeReply(const Core::FunctionReplyObject &reply) = 0;
|
||||
};
|
||||
virtual int64_t updateChargeTypeRequest(const ChargeType &request, UpdateChargeTypeReplyHandler *handler) = 0;
|
||||
virtual int64_t updateChargeTypeRequest(const ChargeType &request, const std::function<void(const Core::FunctionReplyObject&)> &cb) = 0;
|
||||
virtual int32_t updateChargeTypeRequest(const ChargeType &request) noexcept(false) = 0; // await
|
||||
virtual int64_t lastUpdateChargeTypeRequestUniqueId() const = 0;
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
} // namespace Interface
|
||||
} // namespace ProjectDataManagement
|
||||
|
||||
Reference in new issue
Block a user