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 @@
|
||||
/**
|
||||
* The PartyHandler class manages all party related function topics and holds classes for
|
||||
* further party data.
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Baeuerle, SLSE, 2016-05-12
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QHash>
|
||||
|
||||
#include "PartyHandling/party_donator.h"
|
||||
#include <ParticipantManagement/ppm_fts.h>
|
||||
#include "logger.h"
|
||||
#include "ppm_db.h"
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
class MainHandler;
|
||||
namespace PartyHandling
|
||||
{
|
||||
class Party;
|
||||
class PartyHandler final
|
||||
: public PartyDonator
|
||||
, protected Interface::Fts::ModifyPartyDataRequestHandler
|
||||
, protected Interface::Fts::RemovePartyRequestHandler
|
||||
, protected Interface::Fts::SyncPartiesRequestHandler
|
||||
, protected Interface::Fts::ChangePartyUsedStateRequestHandler
|
||||
{
|
||||
public:
|
||||
explicit PartyHandler(MainHandler *mainHandler);
|
||||
~PartyHandler();
|
||||
Party *partyById(int32_t partyId) const override;
|
||||
|
||||
bool init();
|
||||
void resetAdlerProperties(QString &properties, const int partyId);
|
||||
|
||||
Core::FunctionReplyObject changePartyUsedStateRequest(const ChangePartyUsedStateRequest &request);
|
||||
protected:
|
||||
void onChangePartyUsedStateRequest(const rti::core::SampleIdentity &cookie,
|
||||
const ChangePartyUsedStateRequest &request) override;
|
||||
void onModifyPartyDataRequest(const rti::core::SampleIdentity &cookie,
|
||||
const ParticipantManagement::Party &request) override;
|
||||
Core::FunctionReplyObject modifyPartyDataRequest(const ParticipantManagement::Party &request);
|
||||
void onRemovePartyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const RemovePartyRequest &request) override;
|
||||
Core::FunctionReplyObject removePartyRequest(const RemovePartyRequest &request);
|
||||
Core::FunctionReplyObject removeParty(Party *partyToDelete);
|
||||
void onSyncPartiesRequest(const rti::core::SampleIdentity &cookie,
|
||||
const SyncPartiesRequest &request) override;
|
||||
|
||||
private:
|
||||
QVector<Database::PpmParty> loadDefaultParties(bool withInsert) const;
|
||||
private:
|
||||
MainHandler *m_mainHandler;
|
||||
QHash<int32_t, Party *> m_parties; // <partyId, Party>
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
} // namespace PartyHandling
|
||||
} // namespace ParticipantManagement
|
||||
Reference in new issue
Block a user