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,85 @@
|
||||
/**
|
||||
* MainHandler for AereaEffectSimulation
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include "logger.h"
|
||||
#include "avm_db.h"
|
||||
#include <memory>
|
||||
|
||||
namespace NGLDB
|
||||
{
|
||||
template <typename DB> class DbServiceHandler;
|
||||
}
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
using DbHandler = NGLDB::DbServiceHandler<DatabaseInterface>;
|
||||
class DdsHandler;
|
||||
class AVControl;
|
||||
class FMControl;
|
||||
class ExercisesHandler;
|
||||
class HandlerMenuStruct;
|
||||
class TvcHandler;
|
||||
class CnrHandler;
|
||||
class FrequencySetHandler;
|
||||
class FrequencyPlanningHandler;
|
||||
class CnrTvcProfileHandler;
|
||||
class ActiveExercises;
|
||||
class StreamNameMappingPublisher;
|
||||
class HandlerVideoReceiver;
|
||||
class HandlerVideoTeam;
|
||||
class HandlerFrequencyPlanningStatus;
|
||||
|
||||
namespace Interface
|
||||
{
|
||||
class Dts;
|
||||
class Fts;
|
||||
}
|
||||
|
||||
class MainHandler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit MainHandler(QObject *parent = nullptr);
|
||||
~MainHandler();
|
||||
|
||||
bool init(int domainId);
|
||||
int exerciseId();
|
||||
|
||||
DdsHandler *ddsHandler() { return m_ddsHandler.get(); }
|
||||
DatabaseInterface *db() { return m_dbInterface.get(); }
|
||||
AVControl *avControl() { return m_avControl.get(); }
|
||||
FMControl *fmControl() { return m_fmControl.get(); }
|
||||
ExercisesHandler *exHandler() { return m_exHandler.get(); }
|
||||
HandlerVideoTeam *videoTeamHandler() { return m_videoTeamHandler.get(); }
|
||||
HandlerFrequencyPlanningStatus *frequencyPlanningStatusHandler() { return m_frequencyPlanningStatusHandler.get(); }
|
||||
CnrHandler *cnrHandler() { return m_cnrHandler.get(); }
|
||||
|
||||
private:
|
||||
std::unique_ptr<DdsHandler> m_ddsHandler;
|
||||
std::unique_ptr<DbHandler> m_dbHandler;
|
||||
std::shared_ptr<DatabaseInterface> m_dbInterface; //!< just to make sure we own a reference to it; we can then simply forward a plain pointer to our clients
|
||||
std::unique_ptr<AVControl> m_avControl;
|
||||
std::unique_ptr<FMControl> m_fmControl;
|
||||
std::unique_ptr<ExercisesHandler> m_exHandler;
|
||||
std::unique_ptr<ActiveExercises> m_activeExercises;
|
||||
std::unique_ptr<HandlerMenuStruct> m_menuStructHandler;
|
||||
std::unique_ptr<CnrHandler> m_cnrHandler;
|
||||
std::unique_ptr<TvcHandler> m_tvcHandler;
|
||||
std::unique_ptr<FrequencySetHandler> m_frequencySetHandler;
|
||||
std::unique_ptr<FrequencyPlanningHandler> m_frequencyPlanningHandler;
|
||||
std::unique_ptr<CnrTvcProfileHandler> m_cnrTvcProfileHandler;
|
||||
std::unique_ptr<StreamNameMappingPublisher> m_streamNameMappingPublisher;
|
||||
std::unique_ptr<HandlerVideoReceiver> m_videoReceiverHandler;
|
||||
std::unique_ptr<HandlerVideoTeam> m_videoTeamHandler;
|
||||
std::unique_ptr<HandlerFrequencyPlanningStatus> m_frequencyPlanningStatusHandler;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
} // namespace AudioVideoManagement
|
||||
Reference in new issue
Block a user