Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+9
-8
@@ -5,7 +5,7 @@
|
||||
#include "ui_assign_gna_dialog.h"
|
||||
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <GuezNasat/Common/gna_nasat_aircraft_part_model.h>
|
||||
#include <GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h>
|
||||
|
||||
namespace GuezNasat
|
||||
{
|
||||
@@ -17,6 +17,7 @@ AssignGuezNasatPartDialog::AssignGuezNasatPartDialog(int exerciseId, QWidget *pa
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_ui(new Ui::AssignGuezNasatPartDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("Dialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
@@ -48,7 +49,7 @@ bool AssignGuezNasatPartDialog::init(const std::shared_ptr<GuezNasat::Interface:
|
||||
|
||||
setOnlineHelpFilename(QStringLiteral("Administrator-Airplanes"));
|
||||
|
||||
if (nap.id() <= 0)
|
||||
if (nap.id <= 0)
|
||||
slotChangesMade();
|
||||
|
||||
return true;
|
||||
@@ -60,11 +61,11 @@ void AssignGuezNasatPartDialog::initCmbNasats()
|
||||
const auto names(m_nasatAircraftParticipantModel->getNasatNames());
|
||||
for (auto it = names.begin(); it != names.end(); ++it)
|
||||
{
|
||||
if (!m_nasatAircraftParticipantModel->getAssociatedNasatIds().contains(it.key()) || m_nap.nasatAircraftId() == it.key())
|
||||
if (!m_nasatAircraftParticipantModel->getAssociatedNasatIds().contains(it.key()) || m_nap.nasatAircraftId == it.key())
|
||||
m_ui->cmbNasats->addItem(it.value(), it.key());
|
||||
}
|
||||
|
||||
int newIdx = m_ui->cmbNasats->findData(m_nap.nasatAircraftId());
|
||||
int newIdx = m_ui->cmbNasats->findData(m_nap.nasatAircraftId);
|
||||
if (newIdx >= 0)
|
||||
m_ui->cmbNasats->setCurrentIndex(newIdx);
|
||||
m_ui->cmbNasats->model()->sort(0);
|
||||
@@ -77,11 +78,11 @@ void AssignGuezNasatPartDialog::initCmbParticipants()
|
||||
const auto decorations(m_nasatAircraftParticipantModel->getParticipantDecorations());
|
||||
for (auto it = hierarchies.begin(); it != hierarchies.end(); ++it)
|
||||
{
|
||||
if (!m_nasatAircraftParticipantModel->getAssociatedParticipantIds().contains(it.key()) || m_nap.participantId() == it.key())
|
||||
if (!m_nasatAircraftParticipantModel->getAssociatedParticipantIds().contains(it.key()) || m_nap.participantId == it.key())
|
||||
m_ui->cmbParticipants->addItem(QIcon(decorations.value(it.key())), it.value(), it.key());
|
||||
}
|
||||
|
||||
int newIdx = m_ui->cmbParticipants->findData(m_nap.participantId());
|
||||
int newIdx = m_ui->cmbParticipants->findData(m_nap.participantId);
|
||||
if (newIdx >= 0)
|
||||
m_ui->cmbParticipants->setCurrentIndex(newIdx);
|
||||
m_ui->cmbParticipants->model()->sort(0);
|
||||
@@ -89,7 +90,7 @@ void AssignGuezNasatPartDialog::initCmbParticipants()
|
||||
|
||||
void AssignGuezNasatPartDialog::retranslate()
|
||||
{
|
||||
translate(m_ui, m_nap.id() <= 0 ? tr("Add Assign Aircraft") : tr("Edit Assign Aircraft"));
|
||||
translate(m_ui, m_nap.id <= 0 ? tr("Add Assign Aircraft") : tr("Edit Assign Aircraft"));
|
||||
}
|
||||
|
||||
bool AssignGuezNasatPartDialog::apply()
|
||||
@@ -98,7 +99,7 @@ bool AssignGuezNasatPartDialog::apply()
|
||||
int32_t participantId = m_ui->cmbParticipants->currentData().toInt();
|
||||
int32_t nasatAircraftId = m_ui->cmbNasats->currentData().toInt();
|
||||
|
||||
const NasatAircraftParticipant req(m_nap.id(), nasatAircraftId, m_exerciseId, participantId);
|
||||
const NasatAircraftParticipant req(m_nap.id, nasatAircraftId, m_exerciseId, participantId);
|
||||
|
||||
return m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
|
||||
+2
-1
@@ -20,6 +20,7 @@ GuezNasatPartDialog::GuezNasatPartDialog(const QString &menuGroup, LtsSession::L
|
||||
, m_ui(new Ui::GuezNasatPartDialog)
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("Dialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -133,7 +134,7 @@ void GuezNasatPartDialog::onRemoveAircraftPart()
|
||||
INFO_LOG(m_logger) << "onRemoveNewAircraft";
|
||||
|
||||
NasatAircraftParticipant req;
|
||||
req.id(m_nasatAircraftParticipantModel->getRowData(curIdx.row()).id());
|
||||
req.id = m_nasatAircraftParticipantModel->getRowData(curIdx.row()).id;
|
||||
|
||||
m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
|
||||
+2
-1
@@ -7,9 +7,10 @@
|
||||
#include <GuezNasat/gna_dtc.h>
|
||||
#include <GuezNasat/gna_ftc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <GuezNasat/logger.h>
|
||||
#include <GuezNasat/Common/gna_nasat_aircraft_part_model.h>
|
||||
#include <GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h>
|
||||
|
||||
|
||||
namespace Ui
|
||||
|
||||
@@ -30,7 +30,8 @@ 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)
|
||||
+4
-4
@@ -57,13 +57,13 @@ QVariant NasatAircraftModel::data(const QModelIndex &index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case Id:
|
||||
return nasatAircraft.id();
|
||||
return nasatAircraft.id;
|
||||
case NasatId:
|
||||
return nasatAircraft.nasatId();
|
||||
return nasatAircraft.nasatId;
|
||||
case SimulationActive:
|
||||
return nasatAircraft.simulationActive() ? tr("Yes") : tr("No");
|
||||
return nasatAircraft.simulationActive ? tr("Yes") : tr("No");
|
||||
case Name:
|
||||
return nasatAircraft.name();
|
||||
return QString::fromStdString(nasatAircraft.name);
|
||||
}
|
||||
|
||||
return QVariant();
|
||||
|
||||
-1
@@ -5,7 +5,6 @@
|
||||
|
||||
#include "gnacommon_export.h"
|
||||
#include <GuezNasat/gna_dtc.h>
|
||||
#include <GuezNasat/gna_nasat_aircraft.h>
|
||||
#include <GuezNasat/logger.h>
|
||||
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
|
||||
+31
-31
@@ -68,7 +68,7 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptr<GuezNasat::I
|
||||
}
|
||||
|
||||
{
|
||||
auto cb = [this](const ParticipantManagement::Participant &d) { onParticipantChanged(d, ParticipantManagement::DataModification::eAdded); };
|
||||
auto cb = [this](const ParticipantManagement::Participant &d) { onParticipantChanged(d, DataModification::eAdded); };
|
||||
m_ppm_dtc->participants(cb);
|
||||
}
|
||||
|
||||
@@ -87,35 +87,35 @@ QVariant NasatAircraftParticipantModel::data(const QModelIndex &index, int role)
|
||||
if (role == Qt::DecorationRole)
|
||||
{
|
||||
if (index.column() == Participant)
|
||||
return m_participantDecorations.value(nasatAircraftParticipant.participantId());
|
||||
return m_participantDecorations.value(nasatAircraftParticipant.participantId);
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
if (index.column() == Id)
|
||||
{
|
||||
INFO_LOG(m_logger) << "nasatAircraftParticipant.id=" << nasatAircraftParticipant.id();
|
||||
return nasatAircraftParticipant.id();
|
||||
INFO_LOG(m_logger) << "nasatAircraftParticipant.id=" << nasatAircraftParticipant.id;
|
||||
return nasatAircraftParticipant.id;
|
||||
}
|
||||
|
||||
switch (index.column())
|
||||
{
|
||||
case NasatAircreaftId:
|
||||
return nasatAircraftParticipant.nasatAircraftId();
|
||||
return nasatAircraftParticipant.nasatAircraftId;
|
||||
case Nasat:
|
||||
if (m_nasatNames.contains(nasatAircraftParticipant.nasatAircraftId()))
|
||||
return m_nasatNames[nasatAircraftParticipant.nasatAircraftId()];
|
||||
if (m_nasatNames.contains(nasatAircraftParticipant.nasatAircraftId))
|
||||
return m_nasatNames[nasatAircraftParticipant.nasatAircraftId];
|
||||
return tr("No Participant");
|
||||
case ExerciseId:
|
||||
return nasatAircraftParticipant.exerciseId();
|
||||
return nasatAircraftParticipant.exerciseId;
|
||||
case ExerciseName:
|
||||
if (m_exerciseNames.contains(nasatAircraftParticipant.exerciseId()))
|
||||
return m_exerciseNames[nasatAircraftParticipant.exerciseId()];
|
||||
if (m_exerciseNames.contains(nasatAircraftParticipant.exerciseId))
|
||||
return m_exerciseNames[nasatAircraftParticipant.exerciseId];
|
||||
return tr("No exercise name available");
|
||||
case ParticipantId:
|
||||
return nasatAircraftParticipant.participantId();
|
||||
return nasatAircraftParticipant.participantId;
|
||||
case Participant:
|
||||
if (m_participantHierarchies.contains(nasatAircraftParticipant.participantId()))
|
||||
return m_participantHierarchies[nasatAircraftParticipant.participantId()];
|
||||
if (m_participantHierarchies.contains(nasatAircraftParticipant.participantId))
|
||||
return m_participantHierarchies[nasatAircraftParticipant.participantId];
|
||||
return tr("No participant name available");
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ QSet<int> NasatAircraftParticipantModel::getAssociatedNasatIds() const
|
||||
QSet<int> ret;
|
||||
ret.reserve(m_vecData.size());
|
||||
for (const NasatAircraftParticipant &data : m_vecData)
|
||||
ret += data.nasatAircraftId();
|
||||
ret += data.nasatAircraftId;
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -136,14 +136,14 @@ QSet<int> NasatAircraftParticipantModel::getAssociatedParticipantIds() const
|
||||
QSet<int> ret;
|
||||
ret.reserve(m_vecData.size());
|
||||
for (const NasatAircraftParticipant &data : m_vecData)
|
||||
ret += data.participantId();
|
||||
ret += data.participantId;
|
||||
return ret;
|
||||
}
|
||||
|
||||
void NasatAircraftParticipantModel::onNasatAircraftParticipantChanged(const GuezNasat::NasatAircraftParticipant &data,
|
||||
const DataModification modType)
|
||||
{
|
||||
if (data.exerciseId() != m_session->exerciseId())
|
||||
if (data.exerciseId != m_session->exerciseId())
|
||||
return;
|
||||
|
||||
LtsWidgets::LtsAbstractTableModel<GuezNasat::NasatAircraftParticipant>::onDataChanged(data, modType);
|
||||
@@ -164,40 +164,40 @@ void NasatAircraftParticipantModel::onExerciseChanged(const ExerciseManagement::
|
||||
break;
|
||||
case DataModification::eModified:
|
||||
case DataModification::eAdded:
|
||||
m_exerciseNames.insert(data.id, data.name);
|
||||
m_exerciseNames.insert(data.id, QString::fromStdString(data.name));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManagement::Participant &data,
|
||||
const ParticipantManagement::DataModification modType)
|
||||
const DataModification modType)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onParticipantChanged: id=" << data.id() << ", name=" << data.name() << ", modType=" << static_cast<int>(modType);
|
||||
INFO_LOG(m_logger) << "onParticipantChanged: id=" << data.id << ", name=" << data.name << ", modType=" << static_cast<int>(modType);
|
||||
|
||||
// isDeleted() existiert im STUB nicht - entfernen
|
||||
switch (modType)
|
||||
{
|
||||
case ParticipantManagement::DataModification::eRemoved:
|
||||
m_participantHierarchies.remove(data.id());
|
||||
case DataModification::eRemoved:
|
||||
m_participantHierarchies.remove(data.id);
|
||||
break;
|
||||
case ParticipantManagement::DataModification::eModified:
|
||||
case ParticipantManagement::DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
case DataModification::eAdded:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DataModification::eAdded Participant"
|
||||
<< " TypeId=" << data.typeId
|
||||
<< " " << data.internalName;
|
||||
<< " " << QString::fromStdString(data.name);
|
||||
|
||||
// TypeClass lookup暂时跳过 - types() nicht verfügbar im STUB
|
||||
ParticipantManagement::TypeClass typeClass = ParticipantManagement::TypeClass::Aircraft; // Default für Testing
|
||||
if (typeClass != ParticipantManagement::TypeClass::Aircraft)
|
||||
return;
|
||||
const QString hierarchy = m_ppm_dtc->hierarchyFromParticipant(data.id());
|
||||
m_participantHierarchies.insert(data.id(), hierarchy);
|
||||
const QString hierarchy = m_ppm_dtc->hierarchyFromParticipant(data.id);
|
||||
m_participantHierarchies.insert(data.id, hierarchy);
|
||||
if (m_ppmGuiCbxIfc)
|
||||
{
|
||||
const auto party = m_ppm_dtc->party(data.partyId);
|
||||
const QRgb col = QRgb(party.color());
|
||||
m_participantDecorations.insert(data.id(), m_ppmGuiCbxIfc->pixmapFromParty(col));
|
||||
const QRgb col = QRgb(party.color);
|
||||
m_participantDecorations.insert(data.id, m_ppmGuiCbxIfc->pixmapFromParty(col));
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -208,15 +208,15 @@ void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManage
|
||||
void NasatAircraftParticipantModel::onNasatAircraftChanged(const GuezNasat::NasatAircraft &data,
|
||||
const DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onNasatAircraftChanged: id=" << data.id() << ", name=" << data.name() << ", modType=" << static_cast<int>(modType);
|
||||
DEBUG_LOG(m_logger) << "onNasatAircraftChanged: id=" << data.id << ", name=" << data.name << ", modType=" << static_cast<int>(modType);
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eRemoved:
|
||||
m_nasatNames.remove(data.id());
|
||||
m_nasatNames.remove(data.id);
|
||||
break;
|
||||
case DataModification::eModified:
|
||||
case DataModification::eAdded:
|
||||
m_nasatNames.insert(data.id(), data.name());
|
||||
m_nasatNames.insert(data.id, QString::fromStdString(data.name));
|
||||
break;
|
||||
}
|
||||
emit signalNasatNamesChanged();
|
||||
|
||||
+2
-3
@@ -5,12 +5,11 @@
|
||||
|
||||
#include "gnacommon_export.h"
|
||||
#include <GuezNasat/gna_dtc.h>
|
||||
#include <GuezNasat/gna_nasat_aircraft.h>
|
||||
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <ExerciseManagement/exm_exercise.h>
|
||||
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
|
||||
|
||||
#include <GuezNasat/logger.h>
|
||||
@@ -67,7 +66,7 @@ private slots:
|
||||
void onExerciseChanged(const ExerciseManagement::Exercise &data,
|
||||
const DataModification modType);
|
||||
void onParticipantChanged(const ParticipantManagement::Participant &data,
|
||||
const ParticipantManagement::DataModification modType);
|
||||
const DataModification modType);
|
||||
void onNasatAircraftChanged(const GuezNasat::NasatAircraft &data,
|
||||
const DataModification modType);
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "gna_dialog.h"
|
||||
#include "ui_gna_dialog.h"
|
||||
#include <GuezNasat/Common/gna_nasat_aircraft_model.h>
|
||||
#include <GuezNasat/Gui/Common/gna_nasat_aircraft_model.h>
|
||||
|
||||
#include "new_gna_dialog.h"
|
||||
|
||||
@@ -18,6 +18,7 @@ GuezNasatDialog::GuezNasatDialog(const QString &menuGroup, QWidget *parent)
|
||||
, m_ui(new Ui::GuezNasatDialog)
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("Dialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -119,7 +120,7 @@ void GuezNasatDialog::onRemoveAircraft()
|
||||
|
||||
INFO_LOG(m_logger) << "onRemoveNewAircraft";
|
||||
NasatAircraft req;
|
||||
req.id(m_nasatAircraftModel->getRowData(curIdx.row()).id());
|
||||
req.id = m_nasatAircraftModel->getRowData(curIdx.row()).id;
|
||||
|
||||
m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
|
||||
+4
-3
@@ -14,6 +14,7 @@ NewGuezNasatDialog::NewGuezNasatDialog(QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
|
||||
, m_ui(new Ui::NewGuezNasatDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("Dialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
@@ -27,10 +28,10 @@ bool NewGuezNasatDialog::init(const std::shared_ptr<GuezNasat::Interface::Ftc> &
|
||||
const NasatAircraft &aircraft)
|
||||
{
|
||||
m_ftc = ftc;
|
||||
m_id = aircraft.id();
|
||||
m_id = aircraft.id;
|
||||
|
||||
m_ui->svNasatId->setValue(aircraft.nasatId());
|
||||
m_ui->leName->setText(QString::fromStdString(aircraft.name()));
|
||||
m_ui->svNasatId->setValue(aircraft.nasatId);
|
||||
m_ui->leName->setText(QString::fromStdString(aircraft.name));
|
||||
|
||||
m_buttonBox->setButtonVisible(LtsWidgets::DialogButton::Apply, false);
|
||||
|
||||
|
||||
Reference in new issue
Block a user