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,71 @@
|
||||
/**
|
||||
* MainHandler for AereaEffectSimulation
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include <EffectShowManagement/esm_db.h>
|
||||
#include "dds_handler.h"
|
||||
#include "esm_export.h"
|
||||
#include "logger.h"
|
||||
|
||||
namespace NGLDB
|
||||
{
|
||||
template <typename DB> class DbServiceHandler;
|
||||
}
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
using DbHandler = NGLDB::DbServiceHandler<DatabaseInterface>;
|
||||
class HandlerAesData;
|
||||
class HandlerPpmData;
|
||||
class HandlerPdmData;
|
||||
class HandlerMdmData;
|
||||
class HandlerTabData;
|
||||
class HandlerEffectShow;
|
||||
class HandlerEffectShowActorRelocation;
|
||||
class HandlerEffectShowVehicleStatus;
|
||||
class HandlerPosition;
|
||||
|
||||
class ESM_SERVER_EXPORT Initialization
|
||||
{
|
||||
public:
|
||||
Initialization();
|
||||
~Initialization();
|
||||
|
||||
bool initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, const QSqlDatabase &sqlDb);
|
||||
bool loadFromDatabase();
|
||||
|
||||
std::shared_ptr<DdsHandler> dds() const { return m_ddsHandler; }
|
||||
std::shared_ptr<DatabaseInterface> db() const;
|
||||
|
||||
std::shared_ptr<HandlerPpmData> handlerPpmData() const { return m_handlerPpmData; }
|
||||
std::shared_ptr<HandlerPdmData> handlerPdmData() const { return m_handlerPdmData; }
|
||||
std::shared_ptr<HandlerMdmData> handlerMdmData() const { return m_handlerMdmData; }
|
||||
std::shared_ptr<HandlerTabData> handlerTabData() const { return m_handlerTabData; }
|
||||
std::shared_ptr<HandlerEffectShow> handlerEffectShow() const { return m_handlerEffectShow; }
|
||||
std::shared_ptr<HandlerEffectShowVehicleStatus> handlerEffectShowVehicleStatus() const { return m_handlerEffectShowVehicleStatus; }
|
||||
std::shared_ptr<HandlerEffectShowActorRelocation> handlerEffectShowActorRelocation() const { return m_handlerEffectShowActorRelocation; }
|
||||
|
||||
int exerciseId() const;
|
||||
|
||||
private:
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DbHandler> m_dbHandler;
|
||||
|
||||
std::shared_ptr<HandlerAesData> m_handlerAesData;
|
||||
std::shared_ptr<HandlerPpmData> m_handlerPpmData;
|
||||
std::shared_ptr<HandlerPdmData> m_handlerPdmData;
|
||||
std::shared_ptr<HandlerMdmData> m_handlerMdmData;
|
||||
std::shared_ptr<HandlerTabData> m_handlerTabData;
|
||||
std::shared_ptr<HandlerEffectShow> m_handlerEffectShow;
|
||||
std::shared_ptr<HandlerEffectShowActorRelocation> m_handlerEffectShowActorRelocation;
|
||||
std::shared_ptr<HandlerEffectShowVehicleStatus> m_handlerEffectShowVehicleStatus;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
} // namespace EffectShowManagement
|
||||
Reference in new issue
Block a user