Qt6 Migration: BUILD_RTI Guards, Export-Header und Include-Pfade korrigiert

- BUILD_RTI Guards in LtsSession implementiert (6 Dateien)
- LtsSessionDataDds Stub für BUILD_RTI=OFF erstellt
- Export-Header Stubs erstellt (GuezNasat, AlarmManagement, MarkerManagement)
- Include-Pfade korrigiert (resource_path.h, logger.h, Proxies)
- QStringRef → QString migriert (Qt6 Kompatibilität)
- Qt6::Gui Dependencies hinzugefügt (LtsElevation, AdvancedSymbology)
- FilterManagement-Plugins temporär vom Build ausgeschlossen
- MOC-Probleme gefixt (staticMetaObject, override final)
- Build erfolgreich: 1940 Targets mit BUILD_RTI=OFF im Docker-Container

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-20 12:26:22 +02:00
1 parent cac1dd809e
commit 734a5e5315
46 files changed
+2487 -110

No files matched your search

@@ -17,6 +17,7 @@ ADD_INTERFACE_LIBRARY(AsbDataPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/..
DataPluginInterface
advancedSymbology
Qt6::Gui
)
#
@@ -3,7 +3,7 @@
#include "logger.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <NGLLoggerBootstrap.h>
namespace BuildingViewer
{
@@ -4,7 +4,7 @@
#pragma once
#include <QColor>
#include <Symbology/symbol_dictionary.h>
#include <Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h>
#include <PluginInterfaces/data_plugin_interface.h>
@@ -54,11 +54,12 @@ class GetExerciseImageRequester : public AbstractRequester,
GetExerciseImageReply m_reply;
};
class ExerciseManagementDialogModel final : public LtsWidgets::LtsAbstractTableModel<ExerciseManagement::Exercise>
class ExerciseManagementDialogModel final : public LtsWidgets::LtsAbstractTableModel<Exercise>
{
Q_OBJECT
public:
using Exercise = ExerciseManagement::Exercise;
enum Columns {
Id,
Name,
@@ -3,7 +3,7 @@
#pragma once
#include <FileManagement/flm_enums.hpp>
#include <Lts/Plugins/FileManagement/flm_enums.hpp>
#include <FileManagement/flm_dtc.h>
#include <PluginInterfaces/topic_replay_interface.h>
#include <TopicEditorBase/topic_editor_interface.h>
@@ -18,7 +18,9 @@ SET(gna_common_gui_SRCS
NGL_ADD_LIBRARY2(WS GnaCommon SHARED ${gna_common_gui_SRCS} )
NGL_TARGET_INCLUDE_DIRECTORIES(GnaCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../
${CMAKE_CURRENT_SOURCE_DIR}/../../Services/
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Proxies/
)
NGL_TARGET_LINK_LIBRARIES(GnaCommon
PRIVATE
@@ -5,7 +5,7 @@
#include "gnacommon_export.h"
#include <GuezNasat/gna_dtc.h>
#include <LtsGuezNasat/logger.h>
#include <GuezNasat/logger.h>
#include <LtsWidgets/lts_abstract_table_model.h>
@@ -9,7 +9,7 @@
#include <ExerciseManagement/exm_dtc.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <Lts/Plugins/ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <GuezNasat/logger.h>
@@ -11,12 +11,18 @@
SET(mrk_common_gui_SRCS
mrk_dialog_model.cpp
mrk_dialog_model.h
mrk_apply_filter.cpp
mrk_apply_filter.h
CustomViews/mrk_marker.cpp
CustomViews/mrk_marker.h
)
# FilterManagement-Plugins temporär ausgeschlossen für BUILD_RTI=OFF
# if(BUILD_RTI)
# list(APPEND mrk_common_gui_SRCS
# mrk_apply_filter.cpp
# mrk_apply_filter.h
# )
# endif()
NGL_WRAP_UI(mrk_common_gui_SRCS
CustomViews/mrk_marker.ui
)
@@ -33,7 +39,6 @@ NGL_TARGET_LINK_LIBRARIES(MrkCommon
LtsSessionData
LtsUtilsGuiDds
OpmDataPluginInterface
FltDataPluginInterface
ngltools
PUBLIC
MrkDataPluginInterface
@@ -41,3 +46,8 @@ NGL_TARGET_LINK_LIBRARIES(MrkCommon
LtsWidgets
LtsDataView
)
# FilterManagement nur bei BUILD_RTI
if(BUILD_RTI)
target_link_libraries(MrkCommon PRIVATE FltDataPluginInterface)
endif()
@@ -2,7 +2,7 @@
#pragma once
#include <LtsDataView/abstract_display_widget.h>
#include <abstract_display_widget.h>
#include <mrkcommon_export.h>
namespace Ui
@@ -5,7 +5,6 @@
#include "mrk_dialog_model.h"
#include <utility>
#include <MarkerManagement/mrk_translation.h>
#include <OperatorManagement/opm_dtc.h>
#include <ngltools/ngltools_dtg.h>
@@ -12,11 +12,12 @@
namespace OcBaseDownload
{
class ExModel final : public LtsWidgets::LtsAbstractTableModel<ExerciseManagement::Exercise>
class ExModel final : public LtsWidgets::LtsAbstractTableModel<Exercise>
{
Q_OBJECT
public:
using Exercise = ExerciseManagement::Exercise;
enum Columns
{
Name,
@@ -5,6 +5,7 @@
# Created by Christian Ehrlicher, SLSE, 2016-03-01
#
IF(BUILD_RTI)
ADD_SUBDIRECTORY(Data)
ADD_SUBDIRECTORY(Gui)
@@ -54,3 +55,4 @@ ADD_INTERFACE_LIBRARY(OpmDataPluginInterface
DataPluginInterface
svcOpmCommon
)
ENDIF()
@@ -5,10 +5,12 @@
# Created by Christian Ehrlicher, SLSE, 2016-02-29
#
IF(BUILD_RTI)
ADD_SUBDIRECTORY(Common)
ADD_SUBDIRECTORY(OperatorOverview)
ADD_SUBDIRECTORY(OperatorSettings)
ADD_SUBDIRECTORY(OperatorEdit)
ADD_SUBDIRECTORY(Login)
ADD_SUBDIRECTORY(OpmComboBox)
ENDIF()
#ADD_SUBDIRECTORY(NewLogin)
@@ -4,6 +4,8 @@
#include "operator_dialog_model.h"
#ifdef BUILD_RTI
#include <ngltools/ngltools_dtg.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <ParticipantManagement/ppm_translation.h>
@@ -19,7 +21,7 @@ namespace OperatorManagement
OperatorManagementDialogModel::OperatorManagementDialogModel(QObject *parent, int exerciseId )
: LtsWidgets::LtsAbstractTableModel<OperatorManagement::User>({tr("Id"),
: LtsWidgets::LtsAbstractTableModel<UserType>({tr("Id"),
tr("Name"),
tr("Info"),
tr("Effective ACLs"),
@@ -34,7 +36,9 @@ OperatorManagementDialogModel::OperatorManagementDialogModel(QObject *parent, in
parent)
, m_dtc(nullptr)
, m_ppmDtc(nullptr)
#ifdef BUILD_RTI
, m_exmDtc(nullptr)
#endif
, m_exerciseId(exerciseId)
{}
@@ -45,11 +49,13 @@ bool OperatorManagementDialogModel::initModel(LtsSession::LtsSession *session, c
{
m_dtc = dtc;
session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc);
#ifdef BUILD_RTI
session->getDtc<ExerciseManagement::DataInterface>(m_exmDtc);
#endif
connect(m_dtc.get(), &OperatorManagement::Interface::Dtc::userChanged,
this, &OperatorManagementDialogModel::onDataChanged);
m_dtc->users([this](const OperatorManagement::User &op) { insertRow(op); });
m_dtc->users([this](const UserType &op) { insertRow(op); });
if (m_ppmDtc)
{
@@ -66,6 +72,7 @@ bool OperatorManagementDialogModel::initModel(LtsSession::LtsSession *session, c
}
}
#ifdef BUILD_RTI
if (m_exmDtc)
{
connect(m_exmDtc.get(), &ExerciseManagement::Interface::Dtc::exerciseChanged,
@@ -80,6 +87,7 @@ bool OperatorManagementDialogModel::initModel(LtsSession::LtsSession *session, c
return false;
}
}
#endif
{
auto cb = [this](const Group &group)
@@ -106,6 +114,7 @@ void OperatorManagementDialogModel::onPartyChanged(const ParticipantManagement::
}
}
#ifdef BUILD_RTI
void OperatorManagementDialogModel::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType)
{
if (modType == DataModification::eRemoved)
@@ -118,6 +127,7 @@ void OperatorManagementDialogModel::onExerciseChanged(const ExerciseManagement::
emit dataChanged(idx, idx);
}
}
#endif
QVariant OperatorManagementDialogModel::data(const QModelIndex &index, int role) const
{
@@ -132,7 +142,7 @@ QVariant OperatorManagementDialogModel::data(const QModelIndex &index, int role)
if (role == Qt::DisplayRole)
{
const OperatorManagement::User &op = m_vecData.at(index.row());
const UserType &op = m_vecData.at(index.row());
std::vector<OperatorManagement::PartiesByExercise> pbe = op.visiblePartiesByExercise();
switch (index.column())
{
@@ -240,7 +250,7 @@ QString OperatorManagementDialogModel::visibleParties(const std::vector<int32_t>
return result.join(QStringLiteral(", "));
}
#ifdef BUILD_RTI
QString OperatorManagementDialogModel::exercises(const std::vector<int32_t> &exercises) const
{
QStringList result;
@@ -250,6 +260,7 @@ QString OperatorManagementDialogModel::exercises(const std::vector<int32_t> &exe
return result.join(QStringLiteral(", "));
}
#endif
QString OperatorManagementDialogModel::effectiveAcls(std::vector<int32_t> acls) const
{
@@ -267,7 +278,7 @@ QString OperatorManagementDialogModel::priority(int16_t prio) const
return QString::number(prio);
}
bool OperatorManagementDialogModel::isFiltered(const OperatorManagement::User &data, DataModification modType) const
bool OperatorManagementDialogModel::isFiltered(const UserType &data, DataModification modType) const
{
Q_UNUSED(modType);
@@ -280,4 +291,6 @@ bool OperatorManagementDialogModel::isFiltered(const OperatorManagement::User &d
return true;
}
}
}
#endif // BUILD_RTI
@@ -3,6 +3,8 @@
#pragma once
#ifdef BUILD_RTI
#include <OperatorManagement/opm_dtc.h>
#include <ParticipantManagement/ppm.hpp>
#include <ExerciseManagement/exm_dtc.h>
@@ -15,9 +17,10 @@
namespace OperatorManagement
{
// Typ-Alias um Namespace-Konflikt mit QtMocConstants::User zu vermeiden
using UserType = User;
class OPMCHANGEPASSWORDGUI_EXPORT OperatorManagementDialogModel final : public LtsWidgets::LtsAbstractTableModel<OperatorManagement::User>
class OPMCHANGEPASSWORDGUI_EXPORT OperatorManagementDialogModel final : public LtsWidgets::LtsAbstractTableModel<UserType>
{
Q_OBJECT
public:
@@ -42,9 +45,9 @@ public:
bool initModel(LtsSession::LtsSession *session, const std::shared_ptr<OperatorManagement::Interface::Dtc> &dtc);
QVariant data(const QModelIndex &, int) const override final;
QVariant data(const QModelIndex &, int) const override;
bool isFiltered( const OperatorManagement::User &data, DataModification modType ) const override;
bool isFiltered( const UserType &data, DataModification modType ) const override;
private:
@@ -71,4 +74,6 @@ private:
int m_exerciseId;
};
}
}
#endif // BUILD_RTI
@@ -221,11 +221,11 @@ bool fill(QComboBox *cbx, PdmComboBoxType type)
case PdmComboBoxType::CbLanguage:
{
const QString languages = LtsUtils::ProjectSettings::getInstance()->value(QStringLiteral("pdm"), QStringLiteral("EquipmentLanguages")).toString();
const QVector<QStringRef> slLang = languages.splitRef(QLatin1Char(','));
const QStringList slLang = languages.split(QLatin1Char(','));
QSet<int> alreadySeen;
alreadySeen += LanguageConfiguration::NoChange;
cbx->addItem(toString(LanguageConfiguration::NoChange), LanguageConfiguration::NoChange);
for (const QStringRef &r : slLang)
for (const QString &r : slLang)
{
const int langId = r.toInt();
if (alreadySeen.contains(langId))
@@ -6,6 +6,7 @@
#include <QSortFilterProxyModel>
#include <ProjectDataManagement/pdm_dtc.h>
#include <Lts/Proxies/TrainingAreaBase/training_area_telegrams.h>
class QComboBox;
class QStandardItemModel;
@@ -5,6 +5,8 @@
# Created by Christian Ehrlicher, SLSE, 2016-03-01
#
IF(BUILD_RTI)
ADD_SUBDIRECTORY(Gui)
#
@@ -24,3 +26,5 @@ ADD_INTERFACE_LIBRARY(SituationMapScriptFilterGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/..
GuiPluginInterface TopicReplayInterface TopicEditorInterface Qt6::Core
)
ENDIF(BUILD_RTI)
@@ -130,6 +130,7 @@ NGL_ADD_LIBRARY2(WS SitmapDds SHARED ${sitmap_dds_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(SitmapDds
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap
)
NGL_TARGET_LINK_LIBRARIES(SitmapDds
PUBLIC