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:
46 files changed
+2487
-110
No files matched your search
@@ -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)
|
||||
+19
-6
@@ -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
|
||||
+10
-5
@@ -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
|
||||
Reference in new issue
Block a user