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 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Some helper classes / functions for AES
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "aes_helper.h"
|
||||
|
||||
#include <QHash>
|
||||
#include <QSet>
|
||||
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
//
|
||||
// class HandledImpactsStorage::Private
|
||||
//
|
||||
class HandledImpactsStorage::Private
|
||||
{
|
||||
public:
|
||||
Private() = default;
|
||||
~Private() = default;
|
||||
|
||||
// data:
|
||||
QHash<int, QSet<int>> m_aesItemId2Index; // Key = aesItemId ; processed/calculated index
|
||||
};
|
||||
|
||||
|
||||
//
|
||||
// class HandledImpactsStorage
|
||||
//
|
||||
HandledImpactsStorage::HandledImpactsStorage()
|
||||
: d(new Private)
|
||||
{}
|
||||
|
||||
HandledImpactsStorage::~HandledImpactsStorage()
|
||||
{
|
||||
delete d;
|
||||
}
|
||||
|
||||
void HandledImpactsStorage::setIndexProcessed(int aesItemId, int index)
|
||||
{
|
||||
d->m_aesItemId2Index[aesItemId].insert(index);
|
||||
}
|
||||
|
||||
bool HandledImpactsStorage::isIndexProcessed(int aesItemId, int index)
|
||||
{
|
||||
return d->m_aesItemId2Index[aesItemId].contains(index);
|
||||
}
|
||||
|
||||
void HandledImpactsStorage::removeAesItem(int aesItemId)
|
||||
{
|
||||
d->m_aesItemId2Index.remove(aesItemId);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
|
||||
} // namespace AreaEffectSimulation
|
||||
Reference in new issue
Block a user