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,63 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Settings for sitMapTestApp
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <Map/text_style.h>
|
||||
#include <Map/grid.h>
|
||||
|
||||
|
||||
namespace NGL {
|
||||
class Settings;
|
||||
}
|
||||
|
||||
namespace MAP
|
||||
{
|
||||
namespace Settings
|
||||
{
|
||||
// read map settings
|
||||
double mapBasePointX();
|
||||
double mapBasePointY();
|
||||
double mapCenterPointX();
|
||||
double mapCenterPointY();
|
||||
int mapWkid();
|
||||
double mapObjectsTextScale();
|
||||
double mapScale();
|
||||
bool mapGridVisible();
|
||||
bool mapFunctionDialogVisible();
|
||||
QString mapGridType();
|
||||
double mapRotationDegree();
|
||||
QString mapSymbologyType();
|
||||
QString mapURL();
|
||||
QString centerPointMgrs() ;
|
||||
QString basePoint();
|
||||
int XMin();
|
||||
int YMin();
|
||||
int XMax();
|
||||
int YMax();
|
||||
|
||||
// general functions for map objects
|
||||
QString objectIdentifier(const QString &prefix, int id);
|
||||
bool getObjectBoolAttribute(const QString &prefix, const QString &postfix, int objId, bool defaultValue = false);
|
||||
int getObjectIntAttribute(const QString &prefix, const QString &postfix, int objId, int defaultValue = 0);
|
||||
QString getObjectStringAttribute(const QString &prefix, const QString &postfix, int objId, const QString &defaultValue = QString());
|
||||
QPointF getPoint(const QString &prefix, int objId, int nr );
|
||||
|
||||
// conversion functions from strings
|
||||
SituationMap::LinePattern getLinePattern(const QString &pattern);
|
||||
SituationMap::FillPattern getFillPattern(const QString &pattern);
|
||||
SituationMap::GridType getGridType(const QString &pattern);
|
||||
|
||||
//!< The real NGL::Settings - object
|
||||
NGL::Settings *settings();
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user