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

2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
@@ -6,6 +6,8 @@
 # CMakeLists.txt fuer DdsView
 #

+set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
+
 SET(ddsview_SRCS
  detailview.cpp
  detailviewdlg.cpp
@@ -68,7 +70,7 @@ NGL_ADD_TOOL_ICON(ddsview_SRCS "dds")

 NGL_ADD_EXECUTABLE(ddsview TOOLSWS TOOLSSV NO_TRANSLATION WIN32 ${ddsview_SRCS} ${ddsview_UICS})
 NGL_TARGET_LINK_LIBRARIES(ddsview
-  ddsconnector
+  $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
  LtsCommandLineParser
  LtsCoordTrans
  ltsCoordWidget
@@ -9,7 +9,7 @@

 #pragma once

-#include <QDialog>
+#include <QtWidgets/QDialog>

 namespace Ui
 {
@@ -15,18 +15,18 @@
 #include "sequences/listsequencewidget.h"

 #include <QGridLayout>
-#include <QGroupBox>
+#include <QtWidgets/QGroupBox>
 #include <QtCore/QMap>
 #include <QHBoxLayout>
-#include <QTabWidget>
+#include <QtWidgets/QTabWidget>
 #include <QPushButton>
 #include <QMouseEvent>
-#include <QRegularExpression>
+#include <QtCore/QRegularExpression>

 #include <limits>
 #include <functional>

-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include <LtsCoordTrans/lts_coord_trans.h>

 #include "coorddetaildlg.h"
@@ -17,7 +17,7 @@
 #include <DDS/QosProfile/DDS_DefaultQos.h>

 #include <QInputDialog>
-#include <QUrl>
+#include <QtCore/QUrl>


 class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
@@ -24,7 +24,7 @@
 #include <TopicDiscover/topic_discoverer.h>
 #include <LtsPluginManager/lts_plugin_loader.h>

-#include <QMenuBar>
+#include <QtWidgets/QMenuBar>

 MainWindow::MainWindow(int domainId, int exerciseId, DDS::QosProfile::ConnectionType ct, const QUrl &tcpDiscoveryUrl, QWidget *parent)
  : NGLMainWindow(parent)
@@ -15,7 +15,7 @@
 #include <nglwidgets/nglmainwindow.h>
 #include <DDS/DDSConnector/subscriber.h>
 #include <QtCore/QVariant>
-#include <QItemSelection>
+#include <QtCore/QItemSelection>

 namespace Ui
 {
@@ -9,13 +9,13 @@
  */

 #include "rwwidgets.h"
-#include <QStackedWidget>
-#include <QSpinBox>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QSpinBox>
 #include <QVBoxLayout>
 #include <QCheckBox>
-#include <QDoubleSpinBox>
-#include <QLineEdit>
-#include <QComboBox>
+#include <QtWidgets/QDoubleSpinBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QComboBox>
 #include <LtsWidgets/lts_bitfield_widget.h>

 void MyLabel::mousePressEvent(QMouseEvent *ev)
@@ -66,7 +66,7 @@ RWWidget::RWWidget(QWidget *parent)
  , m_editableWidget(nullptr)
 {
  QVBoxLayout *l = new QVBoxLayout(this);
-  l->setMargin(0);
+  l->setContentsMargins(0, 0, 0, 0);
  l->setSpacing(0);
  l->addWidget(m_stackedWidget);
  m_stackedWidget->insertWidget(0, m_label);
@@ -9,9 +9,9 @@
  */

 #pragma once
-#include <QWidget>
-#include <QLabel>
-#include <QStackedWidget>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QStackedWidget>
 #include <QtCore/QMap>

 class QSpinBox;
@@ -10,7 +10,7 @@

 #include "samplemodel.h"
 #include <QMimeData>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QDomDocument>
 #include "detailviewdlg.h"
 #include "nglsettings.h"
@@ -10,10 +10,10 @@

 #pragma once

-#include <QAbstractItemModel>
-#include <QSortFilterProxyModel>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QSortFilterProxyModel>
 #include <QtCore/QVector>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 #include <QDomDocument>

 #include <dds/dds.hpp>
@@ -14,11 +14,11 @@
 #include "topicselector.h"
 #include "detailviewdlg.h"

-#include <QHeaderView>
-#include <QMenu>
-#include <QFile>
-#include <QFileDialog>
-#include <QMessageBox>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QMenu>
+#include <QtCore/QFile>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>

 SampleView::SampleView(QWidget *parent)
  : QTableView(parent)
@@ -10,7 +10,7 @@

 #pragma once

-#include <QTableView>
+#include <QtWidgets/QTableView>
 #include <QtCore/QTimer>
 #include <dds/dds.hpp>
 #include "logger.h"
@@ -8,7 +8,7 @@
  */
 #include "abstractsequencewidget.h"

-#include <QRegularExpression>
+#include <QtCore/QRegularExpression>
 #include <QToolButton>

 AbstractSequenceWidget::AbstractSequenceWidget(const RwMode &readOnly,
@@ -13,7 +13,7 @@
 #include <dds/dds.hpp>
 #endif

-#include <QGroupBox>
+#include <QtWidgets/QGroupBox>
 #include <QtCore/QList>

 #include <detailview.h>
@@ -9,7 +9,7 @@
 #include "tabsequencewidget.h"

 #include <QTabBar>
-#include <QTabWidget>
+#include <QtWidgets/QTabWidget>
 #include <QToolButton>

 TabSequenceWidget::TabSequenceWidget(const RwMode &readOnly,
@@ -13,10 +13,10 @@
 #include "samplemodel.h"
 #include "xmlhelper.h"

-#include <QDataStream>
+#include <QtCore/QDataStream>
 #include <QMimeData>
-#include <QIODevice>
-#include <QIcon>
+#include <QtCore/QIODevice>
+#include <QtGui/QIcon>

 TelegramModel::TelegramModel(QObject *parent)
  : QAbstractTableModel(parent)
@@ -10,12 +10,12 @@

 #pragma once

-#include <QAbstractItemModel>
-#include <QSortFilterProxyModel>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QSortFilterProxyModel>
 #include <QtCore/QVector>
 #include <QtCore/QDateTime>
-#include <QSharedPointer>
-#include <QStringList>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QStringList>

 #include <dds/core/xtypes/DynamicData.hpp>

@@ -14,10 +14,10 @@
 #include "detailviewdlg.h"
 #include "nglsettings.h"

-#include <QHeaderView>
-#include <QMenu>
-#include <QFileDialog>
-#include <QFile>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QFile>
 #include <QDomDocument>

 TelegramView::TelegramView(QWidget *parent)
@@ -10,7 +10,7 @@

 #pragma once

-#include <QTableView>
+#include <QtWidgets/QTableView>
 #include "telegrammodel.h"
 #include "logger.h"

@@ -9,15 +9,15 @@
  */

 #include "topic_tree_model.h"
-#include <QBuffer>
-#include <QDataStream>
+#include <QtCore/QBuffer>
+#include <QtCore/QDataStream>
 #include <QtCore/QDateTime>
-#include <QImage>
+#include <QtGui/QImage>
 #include <QMimeData>
-#include <QPainter>
-#include <QPolygonF>
-#include <QSet>
-#include <QTransform>
+#include <QtGui/QPainter>
+#include <QtGui/QPolygonF>
+#include <QtCore/QSet>
+#include <QtGui/QTransform>
 #include <rti/core/xtypes/DynamicDataMemberInfo.hpp>
 #include <dds/core/xtypes/EnumType.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
@@ -9,8 +9,8 @@
  */
 #pragma once

-#include <QSortFilterProxyModel>
-#include <QModelIndex>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QModelIndex>
 #include "logger.h"
 #include "nglsettings.h"

@@ -2,8 +2,8 @@

 #include <QGridLayout>
 #include <QCheckBox>
-#include <QGroupBox>
-#include <QScrollArea>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QScrollArea>


 TypeCodeSelector::TypeCodeSelector(QWidget *parent)
@@ -1,6 +1,6 @@
 #pragma once

-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <dds/dds.hpp>
 #include "logger.h"