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,65 @@
|
||||
/**
|
||||
* MainHandler for AereaEffectSimulation
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <memory>
|
||||
#include "dds_handler.h"
|
||||
#include <ngldb/db_service_handler.h>
|
||||
#include "esc_db.h"
|
||||
#include "logger.h"
|
||||
|
||||
namespace NGLDB
|
||||
{
|
||||
template <typename DB> class DbServiceHandler;
|
||||
}
|
||||
namespace EffectShowClient
|
||||
{
|
||||
using DbHandler = NGLDB::DbServiceHandler<DatabaseInterface>;
|
||||
class HandlerOrder;
|
||||
class HandlerOperatingCondition;
|
||||
class HandlerFiringExplosion;
|
||||
class HandlerFiringSmoke;
|
||||
class HandlerTabData;
|
||||
class HandlerVehicle;
|
||||
class ControlUnitHandler;
|
||||
class MainHandler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit MainHandler(QObject *parent = nullptr);
|
||||
~MainHandler();
|
||||
|
||||
bool init(int domainId, int exerciseId);
|
||||
|
||||
std::shared_ptr<DdsHandler> dds() const { return m_ddsHandler; }
|
||||
std::shared_ptr<DatabaseInterface> db() const { return m_dbHandler->db(); }
|
||||
|
||||
std::shared_ptr<HandlerOrder> handlerOrder() const { return m_handlerOrder; }
|
||||
std::shared_ptr<HandlerOperatingCondition> handlerOperatingCondition() const { return m_handlerOperatingCondition; }
|
||||
std::shared_ptr<HandlerFiringExplosion> handlerFiringExplosion() const { return m_handlerFiringExplosion; }
|
||||
std::shared_ptr<HandlerFiringSmoke> handlerFiringSmoke() const { return m_handlerFiringSmoke; }
|
||||
std::shared_ptr<HandlerTabData> handlerTabData() const { return m_handlerTabData; }
|
||||
std::shared_ptr<HandlerVehicle> handlerVehicle() const { return m_handlerVehicle; }
|
||||
std::shared_ptr<ControlUnitHandler> handlerControlUnit() const { return m_handlerControlUnit; }
|
||||
|
||||
private:
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DbHandler> m_dbHandler;
|
||||
|
||||
std::shared_ptr<HandlerOrder> m_handlerOrder;
|
||||
std::shared_ptr<HandlerOperatingCondition> m_handlerOperatingCondition;
|
||||
std::shared_ptr<HandlerFiringExplosion> m_handlerFiringExplosion;
|
||||
std::shared_ptr<HandlerFiringSmoke> m_handlerFiringSmoke;
|
||||
std::shared_ptr<HandlerTabData> m_handlerTabData;
|
||||
std::shared_ptr<HandlerVehicle> m_handlerVehicle;
|
||||
std::shared_ptr<ControlUnitHandler> m_handlerControlUnit;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
} // namespace EffectShowClient
|
||||
Reference in new issue
Block a user