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,72 @@
|
||||
/**
|
||||
* Settings for TetraRadio
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2017-04-07
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <IObserver.h>
|
||||
#include <Common/hlacommon_export.h>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
class Settings;
|
||||
}
|
||||
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
|
||||
namespace Settings
|
||||
{
|
||||
|
||||
struct SocketData {
|
||||
int port;
|
||||
QString hostname;
|
||||
int hlaRequestIdentifier;
|
||||
};
|
||||
|
||||
struct Orientation
|
||||
{
|
||||
float phi = 0.;
|
||||
float psi = 0.;
|
||||
float theta = 0.;
|
||||
Orientation(float _phi, float _psi, float _theta): phi(_phi), psi(_psi), theta(_theta){}
|
||||
Orientation(){}
|
||||
};
|
||||
|
||||
|
||||
//!< The real NGL::Settings - object
|
||||
NGL::Settings *settings();
|
||||
|
||||
HLACOMMON_EXPORT void setIniFile(const QString &ini);
|
||||
|
||||
HLACOMMON_EXPORT QString federationName();
|
||||
HLACOMMON_EXPORT ngs::IObserver::ProtocolType hlaProtocol();
|
||||
|
||||
quint16 siteId();
|
||||
quint16 applicationId();
|
||||
HLACOMMON_EXPORT int guezHitGraceTimeMSecs();
|
||||
|
||||
HLACOMMON_EXPORT QString fomIdentifier();
|
||||
HLACOMMON_EXPORT QString rtiIdentifier();
|
||||
HLACOMMON_EXPORT QString swConfFileName();
|
||||
|
||||
HLACOMMON_EXPORT QByteArray hlaLicenseServer();
|
||||
|
||||
HLACOMMON_EXPORT Orientation spatialStructOrientation();
|
||||
|
||||
|
||||
HLACOMMON_EXPORT quint16 webSocketListenPort();
|
||||
|
||||
HLACOMMON_EXPORT quint16 hlaPlayerIdIDT();
|
||||
HLACOMMON_EXPORT quint16 hlaPlayerIdExcon();
|
||||
|
||||
HLACOMMON_EXPORT QVector<SocketData> socketDataList();
|
||||
|
||||
|
||||
}
|
||||
|
||||
} // namespace HighLevelArchitecture
|
||||
Reference in new issue
Block a user