Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

This commit is contained in:
torsten committed 2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
18635 files changed
+2466913 -906310

No files matched your search

@@ -89,7 +89,6 @@ NGL_TARGET_INCLUDE_DIRECTORIES(thp_viewer
)
NGL_TARGET_COMPILE_DEFINITIONS(thp_viewer
PRIVATE
${VLC_DEFINES}
)
ENDIF()
NGL_TARGET_LINK_LIBRARIES(thp_viewer
@@ -132,14 +131,14 @@ NGL_TARGET_LINK_LIBRARIES(thp_viewer
svcBldClient
svcCesClient
svcGimClient
svcIsmClient
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
svcPpmClient
svcPdmClient
svcAlmClient
)
IF(VLC_FOUND)
NGL_TARGET_LINK_LIBRARIES(thp_viewer
${VLC_LIBRARIES}
$<$<TARGET_EXISTS:PkgConfig::VLC>:PkgConfig::VLC>
)
ENDIF()
IF(WIN32)
@@ -17,7 +17,7 @@ NGL_ADD_EXECUTABLE(WS SitMapReplayTest ${SRPTEST_SRCS})
NGL_TARGET_LINK_LIBRARIES(SitMapReplayTest
SituationReplaySqlite
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
Qt6::Core
nglapplication
SitmapDds
@@ -33,7 +33,7 @@ NGL_TARGET_LINK_LIBRARIES(SitMapReplayTest
svcBldClient
svcCesClient
svcGimClient
svcIsmClient
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
svcPpmClient
svcPdmClient
)
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QMainWindow>
#include <QtWidgets/QMainWindow>
#include <memory>
namespace Ui
@@ -6,9 +6,9 @@
* $Author$
*/
#include <nglapplication/nglsingleapplication.h>
#include <QUrl>
#include <QDir>
#include <QMessageBox>
#include <QtCore/QUrl>
#include <QtCore/QDir>
#include <QtWidgets/QMessageBox>
#include <QNetworkProxy>
#include <QSplashScreen>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
@@ -14,22 +14,22 @@
#include <QKeyEvent>
#include <QPrintDialog>
#include <QPrinter>
#include <QPainter>
#include <QMessageBox>
#include <QtGui/QPainter>
#include <QtWidgets/QMessageBox>
#include <QTextDocument>
#include <QScreen>
#include <QDesktopServices>
#include <QDomElement>
#include <QDomDocument>
#include <QUrl>
#include <QRect>
#include <QSize>
#include <QFile>
#include <QFileInfo>
#include <QDir>
#include <QtCore/QUrl>
#include <QtCore/QRect>
#include <QtCore/QSize>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QDir>
#include <QSettings>
#include <QInputDialog>
#include <QDir>
#include <QtCore/QDir>
#include <ngltranslator/ngltranslator.h>
#include <ngltools/ngltools_dtg.h>
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QMainWindow>
#include <QUrl>
#include <QtWidgets/QMainWindow>
#include <QtCore/QUrl>
namespace Ui
{
@@ -11,11 +11,11 @@
#include <QtCore/QCoreApplication>
#include <QDirIterator>
#include <QFileInfo>
#include <QMutex>
#include <QtCore/QFileInfo>
#include <QtCore/QMutex>
#include <QScreen>
#include <QtCore/QTimer>
#include <QUrl>
#include <QtCore/QUrl>
#include <QGuiApplication>
#include <NGLLogger/NGLLoggerBootstrap.h>
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QFrame>
#include <QtWidgets/QFrame>
class QUrl;
@@ -17,7 +17,7 @@ typedef SSIZE_T ssize_t;
#include <vlc/vlc.h>
#endif
#include <QtCore/QObject>
#include <QThread>
#include <QtCore/QThread>
#include <NGLLogger/INGLLogger.h>
#include "thp_audio_video_widget.h"
@@ -11,7 +11,7 @@
#include "thp_building_settings.h"
#include "thp_plugin_provider.h"
#include <QMenu>
#include <QtWidgets/QMenu>
#include <BuildingViewer/Common/bdv_controller.h>
#include <BuildingViewer/Common/bdv_plugin_provider.h>
@@ -8,7 +8,7 @@
#include "thp_html_widget.h"
#include "ui_thp_html_widget.h"
#include <QUrl>
#include <QtCore/QUrl>
#include <QWebEnginePage>
#include <NGLLogger/NGLLoggerBootstrap.h>
@@ -6,7 +6,7 @@
* $Author$
*/
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
#include <NGLLogger/INGLLogger.h>
class QUrl;
@@ -6,7 +6,7 @@
* $Author$
*/
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
class QUrl;
@@ -15,7 +15,7 @@
#include "thp_situation_filter_types.h"
#include "thp_plugin_provider.h"
#include <QFileInfo>
#include <QtCore/QFileInfo>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QFrame>
#include <QtWidgets/QFrame>
#include <NGLLogger/INGLLogger.h>
#include <SituationReplay/main_handler_sqlite.h>
@@ -9,7 +9,7 @@
#include "thp_situation_filter_aes.h"
#include <QDialogButtonBox>
#include <QFrame>
#include <QtWidgets/QFrame>
#include <QGridLayout>
#include <QPushButton>
@@ -8,7 +8,7 @@
#pragma once
#include "thp_plugin_provider.h"
#include <QDialog>
#include <QtWidgets/QDialog>
namespace FilterManagement
{
@@ -9,7 +9,7 @@
#include "thp_situation_filter_building_components.h"
#include <QDialogButtonBox>
#include <QFrame>
#include <QtWidgets/QFrame>
#include <QGridLayout>
#include <QPushButton>
@@ -8,7 +8,7 @@
#pragma once
#include "thp_plugin_provider.h"
#include <QDialog>
#include <QtWidgets/QDialog>
namespace FilterManagement
{
@@ -9,7 +9,7 @@
#include "thp_situation_filter_collapse_expand.h"
#include <QDialogButtonBox>
#include <QFrame>
#include <QtWidgets/QFrame>
#include <QGridLayout>
#include <QPushButton>
@@ -8,7 +8,7 @@
#pragma once
#include "thp_plugin_provider.h"
#include <QDialog>
#include <QtWidgets/QDialog>
namespace FilterManagement
{
@@ -9,7 +9,7 @@
#include "thp_situation_filter_symbol_appearance.h"
#include <QDialogButtonBox>
#include <QFrame>
#include <QtWidgets/QFrame>
#include <QGridLayout>
#include <QPushButton>
@@ -8,7 +8,7 @@
#pragma once
#include "thp_plugin_provider.h"
#include <QDialog>
#include <QtWidgets/QDialog>
namespace FilterManagement
{
@@ -9,7 +9,7 @@
#include "thp_situation_filter_types.h"
#include <QDialogButtonBox>
#include <QFrame>
#include <QtWidgets/QFrame>
#include <QGridLayout>
#include <QPushButton>
@@ -8,7 +8,7 @@
#pragma once
#include "thp_plugin_provider.h"
#include <QDialog>
#include <QtWidgets/QDialog>
namespace FilterManagement
{
@@ -16,18 +16,18 @@
#include "thp_situation_filter_building_components.h"
#include "thp_plugin_provider.h"
#include <QDir>
#include <QFileInfo>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QJsonParseError>
#include <QKeyEvent>
#include <QMenu>
#include <QMessageBox>
#include <QPainter>
#include <QtWidgets/QMenu>
#include <QtWidgets/QMessageBox>
#include <QtGui/QPainter>
#include <QSvgRenderer>
#include <QtCore/QTimer>
#include <QThread>
#include <QtCore/QThread>
#include <FileManagement/flm_db_structs.h>
#include <FilterManagement/flt_participant_plugin_interface.h>
#include <FilterManagement/flt_aes_plugin_interface.h>
@@ -7,8 +7,8 @@
*/
#include "thp_zoom_slider.h"
#include <QLabel>
#include <QSlider>
#include <QtWidgets/QLabel>
#include <QtWidgets/QSlider>
#include <QHBoxLayout>
#include <QVBoxLayout>
@@ -8,7 +8,7 @@
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
class QLabel;
class QSlider;