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,63 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* PRE Handler Presentations
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Iuliana Ojog, SLSE, 2016-11-26
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QSet>
|
||||
|
||||
#include <PresentationManagement/pre_fts.h>
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------
|
||||
namespace PresentationManagement
|
||||
{
|
||||
class ObjectPresentation;
|
||||
class Initialization;
|
||||
class HandlerPresentation final :
|
||||
protected Interface::Fts::PresentationModifyRequestHandler
|
||||
, protected Interface::Fts::PresentationRemoveRequestHandler
|
||||
, protected Interface::Fts::GetPresentationContentRequestHandler
|
||||
, protected Interface::Fts::PresentationChangeStatusRequestHandler
|
||||
{
|
||||
public:
|
||||
explicit HandlerPresentation(Initialization *mainHandler);
|
||||
~HandlerPresentation();
|
||||
|
||||
bool init();
|
||||
|
||||
QMap<int, ObjectPresentation *> getPresenstationsMap() const
|
||||
{
|
||||
return m_objectPresentationMap;
|
||||
}
|
||||
|
||||
ObjectPresentation *getPresentation(int presentationId)
|
||||
{
|
||||
return m_objectPresentationMap.value(presentationId);
|
||||
}
|
||||
|
||||
private:
|
||||
void onPresentationModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const PresentationModifyRequest &request) override;
|
||||
Core::FunctionReplyObject presentationCreateRequest(const PresentationModifyRequest &request);
|
||||
Core::FunctionReplyObject presentationModifyRequest(const PresentationModifyRequest &request);
|
||||
void onPresentationRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request) override;
|
||||
void onGetPresentationContentRequest(const rti::core::SampleIdentity &cookie,
|
||||
const GetPresentationContentRequest &request) override;
|
||||
void onPresentationChangeStatusRequest(const rti::core::SampleIdentity &cookie,
|
||||
const PresentationChangeStatusRequest &request) override;
|
||||
|
||||
private:
|
||||
Initialization *m_mainHandler;
|
||||
QMap<int, ObjectPresentation *> m_objectPresentationMap;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user