Qt6 Migration: LtsWidgets, BUILD_RTI Guards, externe Dependencies dokumentiert

- LtsWidgets Verzeichnis vollständig migriert (Qt5→Qt6)
- BUILD_RTI Guards für RTI-spezifische Module hinzugefügt
- Externe Dependencies in EXTERNAL_DEPS.md dokumentiert
- Qt6 API-Änderungen: QRegExp→QRegularExpression, enterEvent(QEnterEvent*)
- AutoUic-Fehler bei ui_requirement behoben (SKIP_AUTOUIC)
- Include-Pfade korrigiert (LtsElevation, LtsMultiMonitor, LtsUtilsCore)
- MOC-Fehler behoben (Q_INTERFACES entfernt wo nicht benötigt)
- CMakeLists.txt Anpassungen für Qt6 (PUBLIC statt INTERFACE)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-21 10:29:34 +02:00
1 parent 27fe03a03a
commit d890b11c5f
145 files changed
+17700 -14377

No files matched your search

@@ -73,8 +73,11 @@ class ForeignInterfaceImpl final : public QObject, public ForeignDataInterface
AdvancedSymbology::SymbolDictionary& getSymbolDictionary(AdvancedSymbology::SymbologyType type) const override
{
static AdvancedSymbology::SymbolDictionary dummy;
return dummy;
Q_UNUSED(type)
// STUB: No external DDS - return nullptr reference (should not be called in stub mode)
static AdvancedSymbology::SymbolDictionary* dummy = nullptr;
Q_ASSERT_X(dummy, "ForeignInterfaceImpl::getSymbolDictionary", "Stub implementation should not be called");
return *dummy;
}
QSharedPointer<SymbolResult> findImage(const SymbolDictionary& dict,
@@ -89,8 +92,8 @@ class ForeignInterfaceImpl final : public QObject, public ForeignDataInterface
Q_UNUSED(symDataToRender)
return nullptr;
}
QSharedPointer<SymbolResult> findImage(int participant, int sizeL = 100,
const QColor& desiredColor = QColor()) const override
QSharedPointer<SymbolResult> findImage(const ParticipantManagement::Participant& participant, int sizeL,
const QColor& desiredColor) const override
{
Q_UNUSED(participant)
Q_UNUSED(sizeL)
@@ -127,9 +130,6 @@ class ForeignInterfaceImpl final : public QObject, public ForeignDataInterface
// STUB: No external DDS - return valid default
return AdvancedSymbology::SymbologyType::APP6B;
}
private:
NGL::INGLLogger& m_logger = NGL::INGLLogger::instance();
};
#endif
} // namespace AdvancedSymbology
@@ -8,6 +8,7 @@
#
# Data Plugin
#
IF(BUILD_RTI)
SET(alarm_common_gui_SRCS
alm_history_alarm_model.cpp
alm_history_alarm_model.h
@@ -32,4 +33,10 @@ NGL_TARGET_LINK_LIBRARIES(AlmCommon
advancedSymbology
advancedSymbologyGui
ngltools
svcGnaCommon
)
NGL_TARGET_INCLUDE_DIRECTORIES(AlmCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../Proxies/GuezNasat/
)
ENDIF(BUILD_RTI)
@@ -6,6 +6,8 @@
# Created by Christian Fröbel, NLSE, 2018-04-19
#
IF(BUILD_RTI)
set(SRCS
avs_app.cpp
avs_app.h
@@ -43,3 +45,5 @@ NGL_TARGET_LINK_LIBRARIES(AvmShared
ngltools
)
NGL_INSTALL_TARGET(AvmShared)
ENDIF(BUILD_RTI)
@@ -8,8 +8,10 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Services/)
# Add AudioVideoManagement stub headers for non-RTI builds
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/AudioVideoManagement/)
# Add GuezNasat for logger.h
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Proxies/GuezNasat/)
# Add GuezNasat for logger.h (only with BUILD_RTI)
IF(BUILD_RTI)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Proxies/GuezNasat/)
ENDIF()
# Add Viewer/LtsDataView for abstract_display_widget.h
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Viewer/LtsDataView/)
# Add OperatorManagement stub headers for non-FilterManagement builds
@@ -39,14 +41,18 @@ ADD_SUBDIRECTORY(EffectManagement)
ADD_SUBDIRECTORY(EffectShowClient)
ADD_SUBDIRECTORY(EffectShowManagement)
ADD_SUBDIRECTORY(Evaluations)
ADD_SUBDIRECTORY(ExerciseManagement)
IF(BUILD_RTI)
ADD_SUBDIRECTORY(ExerciseManagement)
ENDIF()
ADD_SUBDIRECTORY(FileManagement)
IF(BUILD_FILTERMANAGEMENT)
ADD_SUBDIRECTORY(FilterManagement)
ENDIF()
ADD_SUBDIRECTORY(FreeSpace)
ADD_SUBDIRECTORY(GuezIedManagement)
ADD_SUBDIRECTORY(GuezNasat)
IF(BUILD_RTI)
ADD_SUBDIRECTORY(GuezNasat)
ENDIF()
ADD_SUBDIRECTORY(InfrastructureManagement) # ResMgt uses nglwidgets => NGLTreeModel
ADD_SUBDIRECTORY(MarkerManagement)
ADD_SUBDIRECTORY(Messaging)
@@ -16,6 +16,7 @@ NGL_ADD_LIBRARY(WS EsmComboBoxGui STATIC ${esm_combobox_gui_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(EsmComboBoxGui
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../..
${CMAKE_BINARY_DIR}/Lts/Common/LtsCoordTrans
)
NGL_TARGET_LINK_LIBRARIES(EsmComboBoxGui
PRIVATE
@@ -30,8 +30,7 @@ NGL_TARGET_LINK_LIBRARIES(GnaCommon
PUBLIC
LtsWidgets
LtsSession
PpmGuiComboboxPluginInterface
svcGnaCommon
svcExmCommon
svcPpmCommon
)
# Optional: External dependencies (not available in migration context)
# target_link_libraries(GnaCommon PUBLIC PpmGuiComboboxPluginInterface svcGnaCommon svcExmCommon svcPpmCommon)
@@ -5,6 +5,9 @@
# Created by Mike Wille, SLSE, 2016-09-06
#
# MrkCommon benötigt LtsDataView, welches nur mit BUILD_RTI verfügbar ist
IF(BUILD_RTI)
#
# Data Plugin
#
@@ -38,10 +41,11 @@ NGL_TARGET_LINK_LIBRARIES(MrkCommon
LtsSession
LtsSessionData
LtsUtilsGuiDds
OpmDataPluginInterface
# OpmDataPluginInterface # External dependency
ngltools
# svcMrkCommon # External dependency
PUBLIC
MrkDataPluginInterface
# MrkDataPluginInterface # External dependency - check if available
Qt6::Widgets
LtsWidgets
LtsDataView
@@ -51,3 +55,5 @@ NGL_TARGET_LINK_LIBRARIES(MrkCommon
if(BUILD_RTI)
target_link_libraries(MrkCommon PRIVATE FltDataPluginInterface)
endif()
ENDIF() # BUILD_RTI
@@ -55,19 +55,19 @@ NGL_TARGET_LINK_LIBRARIES(PpmCommon
LtsSession
Qt6::Widgets
NGLLogger
AsbDataPluginInterface
ExmDataPluginInterface
advancedSymbologyGui
LtsUtilsSettings
PUBLIC
Qt6::Core
Qt6::Gui
nglwidgets
svcPpmCommon
LtsDataView
LtsUtilsGuiDds
)
# Optional: External dependencies (not available in migration context)
# target_link_libraries(PpmCommon PRIVATE AsbDataPluginInterface ExmDataPluginInterface advancedSymbologyGui)
# target_link_libraries(PpmCommon PUBLIC svcPpmCommon)
NGL_TARGET_INCLUDE_DIRECTORIES(PpmCommon
PUBLIC
${CMAKE_CURRENT_BINARY_DIR}/../../..
@@ -5,6 +5,7 @@
# Created by Mike Wille, SLSE, 2016-05-05
#
IF(BUILD_RTI)
SET(charge_table_gui_SRCS
pdm_charge_table_foreign_gui_interface_impl.cpp
pdm_charge_table_foreign_gui_interface_impl.h
@@ -26,6 +27,7 @@ NGL_ADD_LIBRARY(WS PdmChargeTableGui STATIC ${charge_table_gui_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(PdmChargeTableGui
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../..
${CMAKE_SOURCE_DIR}/Lts/Widgets/
)
NGL_TARGET_LINK_LIBRARIES(PdmChargeTableGui
PRIVATE
@@ -61,3 +63,4 @@ NGL_TARGET_LINK_LIBRARIES(PdmChargeTableGuiPlugin
)
NGL_INSTALL_TARGET(PdmChargeTableGuiPlugin)
ENDIF()
@@ -16,11 +16,8 @@
namespace ProjectDataManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
class ChargeSelector final : public LtsWidgets::LtsFramelessDialog
#else
class ChargeSelector;
#endif
{
Q_OBJECT
public:
@@ -5,14 +5,13 @@
#include <memory>
// Forward declarations for external DDS types
namespace ProjectDataManagement
{
// Forward declarations for external dependencies
namespace Interface {
namespace Dtc {
}
namespace Ftc {
namespace Interface
{
class Dtc;
class Ftc;
}
}
@@ -10,6 +10,9 @@ class QComboBox;
class QWidget;
class QVariant;
// Forward declaration for external dependency
enum class GearClass;
namespace ProjectDataManagement
{
@@ -19,7 +19,6 @@ namespace SituationReplayManagement
class GuiPlugin final : public QObject, public GuiPluginBase::Plugin
{
Q_PLUGIN_METADATA(IID "gui:3:srm")
Q_INTERFACES(GuiPluginBase::Plugin)
Q_OBJECT
public:
@@ -21,6 +21,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(Thp2CommonCore
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../ # export file
${CMAKE_SOURCE_DIR}/Lts/Common
${CMAKE_SOURCE_DIR}/Lts/Common/LtsUtils
)
NGL_TARGET_LINK_LIBRARIES(Thp2CommonCore
PRIVATE
@@ -34,7 +34,7 @@ ADD_INTERFACE_LIBRARY(TlnEventTimelineGuiPluginInterface
NGL_ADD_LIBRARY2(WS TlnDataPluginInterface SHARED tln_data_plugin_interface.h)
NGL_TARGET_LINK_LIBRARIES(TlnDataPluginInterface
Qt6::Core
svcEemCommon
## svcEemCommon
DataPluginInterface
)
NGL_INSTALL_TARGET(TlnDataPluginInterface)