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:
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
|
||||
|
||||
Reference in new issue
Block a user