lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
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:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent eb1d949edc
commit 815e16368e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/CustomView/aes_borderline.cpp
+4 -4
View File
@@ -45,15 +45,15 @@ bool CustomViewBorderline::init(const QModelIndex &idx)
bool CustomViewBorderline::calculateIcon(const AreaEffectSimulation::Borderline &line, const QColor &color)
{
if (line.segments().size() == 0)
if (line.segments.size() == 0)
return false;
QVector<QPointF> segments;
segments.reserve(line.segments().size());
segments.reserve(line.segments.size());
int setZone = -1;
for (const Core::GeoPosition2D &s : line.segments())
for (const Core::GeoPosition2D &s : line.segments)
{
const LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(s.lon(), s.lat(), setZone));
const LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(s.lon, s.lat, setZone));
if (setZone < 0)
setZone = coord.zone;
segments.append(QPointF(coord.x, coord.y));
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp
+34 -34
View File
@@ -83,15 +83,15 @@ void BorderlineEdit::enableUiElements(bool enable)
m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
if (m_aesItem.effectStateId == AesEffectState::EsExpired)
{
m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
__unchange__();
}
if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
if (m_aesItem.effectStateId == AesEffectState::EsActivated)
{
QString name = m_ui->leIdentifier->text();
auto baseData = m_dtc->borderline(m_aesItem.id());
auto baseData = m_dtc->borderline(m_aesItem.id);
setData(baseData, false);
__unchange__();
if (name != m_ui->leIdentifier->text())
@@ -148,26 +148,26 @@ bool BorderlineEdit::init(int aesItemId, bool copy, LtsSession::LtsSession *sess
void BorderlineEdit::setData(const Borderline &borderline, bool copy)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << "borderlineId: " << borderline.id()
<< " operatorId: " << borderline.operatorId();
DEBUG_LOG(m_logger) << LOGFUNCTION << "borderlineId: " << borderline.id
<< " operatorId: " << borderline.operatorId;
m_aesItem = borderline;
if (copy)
{
m_aesItem.id(0);
m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
m_aesItem.id = 0;
m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
}
m_ui->leIdentifier->setText(QString::fromStdString(borderline.name()));
if ( borderline.partyId().is_set())
m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(borderline.partyId().get()));
m_ui->lbBorderlineId->setText(QString::number(borderline.id()));
m_ui->leIdentifier->setText(QString::fromStdString(borderline.name));
if ( borderline.partyId.has_value())
m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(borderline.partyId.get()));
m_ui->lbBorderlineId->setText(QString::number(borderline.id));
if (borderline.operatorId() > 0)
if (borderline.operatorId > 0)
m_ui->cbLocalBorderline->setChecked(true);
else
m_ui->cbLocalBorderline->setChecked(false);
setCoordinates(borderline.segments());
setCoordinates(borderline.segments);
}
@@ -226,7 +226,7 @@ bool BorderlineEdit::apply()
LtsSessionData::LtsSessionData::getInstance()->getOperatorId() :
0);
const BorderlineModifyRequest req(m_aesItem.id(),
const BorderlineModifyRequest req(m_aesItem.id,
operatorId,
m_ui->cbParty->currentData().toInt(),
m_ui->leIdentifier->text().toStdString(),
@@ -252,7 +252,7 @@ QByteArray BorderlineEdit::borderlineToJson()
QJsonObject obj;
obj[QStringLiteral("XmlType")] = FileManagement::toString(FileManagement::XmlType::AESBorderlineEdit);
obj[QStringLiteral("id")] = m_aesItem.id();
obj[QStringLiteral("id")] = m_aesItem.id;
obj[QStringLiteral("operatorId")] = operatorId;
obj[QStringLiteral("cbParty")] = m_ui->cbParty->currentData().toInt();
obj[QStringLiteral("leIdentifier")] = m_ui->leIdentifier->text();
@@ -262,8 +262,8 @@ QByteArray BorderlineEdit::borderlineToJson()
for (const Core::GeoPosition2D &segment : segments)
{
QJsonObject innerSeg;
innerSeg[QStringLiteral("lat")] = segment.lat();
innerSeg[QStringLiteral("lon")] = segment.lon();
innerSeg[QStringLiteral("lat")] = segment.lat;
innerSeg[QStringLiteral("lon")] = segment.lon;
arrSeg += innerSeg;
}
@@ -280,31 +280,31 @@ Borderline BorderlineEdit::jsonToBorderline(const QByteArray &content)
const QJsonDocument doc(QJsonDocument::fromJson(content));
const QJsonObject obj(doc.object());
borderline.chargeStruct().chargeTypeId(obj[QStringLiteral("chargeTypeId")].toInt());
borderline.effectDuration(obj[QStringLiteral("effectDuration")].toDouble());
borderline.effectMarkingInTa(obj[QStringLiteral("effectMarkingInTa")].toInt());
borderline.effectStart(obj[QStringLiteral("effectStart")].toDouble());
borderline.chargeStruct.chargeTypeId = obj[QStringLiteral("chargeTypeId")].toInt();
borderline.effectDuration = obj[QStringLiteral("effectDuration")].toDouble();
borderline.effectMarkingInTa = obj[QStringLiteral("effectMarkingInTa")].toInt();
borderline.effectStart = obj[QStringLiteral("effectStart")].toDouble();
int effectStateId = obj[QStringLiteral("effectStateId")].toInt();
borderline.effectStateId(static_cast<AreaEffectSimulation::AesEffectState>(effectStateId));
borderline.operatorId(obj[QStringLiteral("operatorId")].toInt());
borderline.id(0);
borderline.name(obj[QStringLiteral("leIdentifier")].toString().toStdString());
borderline.effectStateId = static_cast<AreaEffectSimulation::AesEffectState>(effectStateId);
borderline.operatorId = obj[QStringLiteral("operatorId")].toInt();
borderline.id = 0;
borderline.name = obj[QStringLiteral("leIdentifier")].toString().toStdString();
if (obj.contains(QStringLiteral("participantId")) )
borderline.participantId(obj[QStringLiteral("participantId")].toDouble());
borderline.participantId = obj[QStringLiteral("participantId")].toDouble();
if (obj.contains(QStringLiteral("partyId")) )
borderline.partyId(obj[QStringLiteral("partyId")].toDouble());
borderline.sampleTime(obj[QStringLiteral("sampleTime")].toDouble());
borderline.partyId = obj[QStringLiteral("partyId")].toDouble();
borderline.sampleTime = obj[QStringLiteral("sampleTime")].toDouble();
const QJsonArray arrSeg = (obj.value(QStringLiteral("segments")).toArray());
borderline.segments().reserve(arrSeg.size());
borderline.segments.reserve(arrSeg.size());
for (const auto &ele : arrSeg)
{
const QJsonObject objSeg(ele.toObject());
Core::GeoPosition2D segment;
segment.lat(objSeg[QStringLiteral("lat")].toDouble());
segment.lon(objSeg[QStringLiteral("lon")].toDouble());
borderline.segments().push_back(std::move(segment));
segment.lat = objSeg[QStringLiteral("lat")].toDouble();
segment.lon = objSeg[QStringLiteral("lon")].toDouble();
borderline.segments.push_back(std::move(segment));
}
@@ -343,7 +343,7 @@ void BorderlineEdit::onImportButtonClicked()
{
Borderline borderline = jsonToBorderline(content);
setData( borderline, true);
setCoordinates(borderline.segments());
setCoordinates(borderline.segments);
QPolygonF coordinates = getCoordinatesQPointF();
onPolylineData(coordinates);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.h
+2 -2
View File
@@ -3,7 +3,7 @@
#pragma once
#include <AreaEffectSimulation/Base/aes_base_edit.h>
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
#include <AreaEffectSimulation/aes_ftc.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
@@ -37,7 +37,7 @@ public:
QString dialogIdentifier() const override
{
return m_aesItem.id() <= 0 ? QStringLiteral("AddBorderline") : QStringLiteral("EditBorderline%1").arg(m_aesItem.id());
return m_aesItem.id <= 0 ? QStringLiteral("AddBorderline") : QStringLiteral("EditBorderline%1").arg(m_aesItem.id);
}
bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_gui_plugin.h
+1 -1
View File
@@ -3,7 +3,7 @@
#pragma once
#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
#include "aes_borderline_gui_plugin_interface.h"
namespace AreaEffectSimulation
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_list.cpp
+7 -7
View File
@@ -156,13 +156,13 @@ void BorderlineList::onImportButtonClicked()
for(const auto &borderline : requests)
{
BorderlineModifyRequest request;
request.id(0);
request.name(borderline.name());
request.operatorId(borderline.operatorId());
if (borderline.partyId().is_set())
request.partyId(borderline.partyId().get());
request.name(borderline.name());
request.segments(borderline.segments());
request.id = 0;
request.name = borderline.name;
request.operatorId = borderline.operatorId;
if (borderline.partyId.has_value())
request.partyId = borderline.partyId.get();
request.name = borderline.name;
request.segments = borderline.segments;
m_requestHelper->startSingleRequest([this, request]()
{
return m_ftc->borderlineModifyRequest(request, this);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_list.h
+2 -2
View File
@@ -3,8 +3,8 @@
#pragma once
#include <AreaEffectSimulation/Base/aes_itemlist.h>
#include <AreaEffectSimulation/Base/aes_base_model.h>
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
#include "aes_borderlines_model.h"
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp
+35 -35
View File
@@ -59,7 +59,7 @@ QVariant BorderlinesModel::data(const QModelIndex &index, int role) const
switch (index.column())
{
case ColOperatorId:
if (item.operatorId() == 0)
if (item.operatorId == 0)
return tr("Global");
return tr("Local");
default:
@@ -72,8 +72,8 @@ QVariant BorderlinesModel::data(const QModelIndex &index, int role) const
bool BorderlinesModel::isFiltered(const Borderline &data, DataModification modType) const
{
if ((data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId()) &&
(data.operatorId() != 0))
if ((data.operatorId != LtsSessionData::LtsSessionData::getInstance()->getOperatorId()) &&
(data.operatorId != 0))
return true;
return AesGuiBaseModel::isFiltered(data, modType);
@@ -92,29 +92,29 @@ QByteArray BorderlinesModel::borderlinesToJson()
QJsonObject inner;
const Borderline &borderline = m_vecData.at(row);
inner[QStringLiteral("chargeTypeId")] = borderline.chargeStruct().chargeTypeId();
inner[QStringLiteral("effectDuration")] = borderline.effectDuration();
inner[QStringLiteral("effectMarkingInTa")] = borderline.effectMarkingInTa();
inner[QStringLiteral("chargeTypeId")] = borderline.chargeStruct.chargeTypeId;
inner[QStringLiteral("effectDuration")] = borderline.effectDuration;
inner[QStringLiteral("effectMarkingInTa")] = borderline.effectMarkingInTa;
inner[QStringLiteral("effectStateId")] = borderline.effectStateId().underlying();
inner[QStringLiteral("id")] = borderline.id();
inner[QStringLiteral("isDeleted")] = borderline.isDeleted();
inner[QStringLiteral("isUsed")] = borderline.isUsed();
inner[QStringLiteral("name")] = QString::fromStdString(borderline.name());
inner[QStringLiteral("operatorId")] = borderline.operatorId();
if ( borderline.participantId().is_set())
inner[QStringLiteral("participantId")] = borderline.participantId().get();
if ( borderline.partyId().is_set())
inner[QStringLiteral("partyId")] = borderline.partyId().get();
inner[QStringLiteral("sampleTime")] = borderline.sampleTime();
inner[QStringLiteral("effectStateId")] = static_cast<int>(borderline.effectStateId);
inner[QStringLiteral("id")] = borderline.id;
inner[QStringLiteral("isDeleted")] = borderline.isDeleted;
inner[QStringLiteral("isUsed")] = borderline.isUsed;
inner[QStringLiteral("name")] = QString::fromStdString(borderline.name);
inner[QStringLiteral("operatorId")] = borderline.operatorId;
if ( borderline.participantId.has_value())
inner[QStringLiteral("participantId")] = borderline.participantId.get();
if ( borderline.partyId.has_value())
inner[QStringLiteral("partyId")] = borderline.partyId.get();
inner[QStringLiteral("sampleTime")] = static_cast<double>(borderline.sampleTime);
arrSeg = {};
for (const Core::GeoPosition2D &segment : borderline.segments())
for (const Core::GeoPosition2D &segment : borderline.segments)
{
QJsonObject innerSeg;
innerSeg[QStringLiteral("lat")] = segment.lat();
innerSeg[QStringLiteral("lon")] = segment.lon();
innerSeg[QStringLiteral("lat")] = segment.lat;
innerSeg[QStringLiteral("lon")] = segment.lon;
arrSeg += innerSeg;
}
@@ -139,31 +139,31 @@ QVector<Borderline> BorderlinesModel::jsonToBorderlineVector(const QByteArray &c
{
const QJsonObject objArr(ele.toObject());
Borderline borderline;
borderline.chargeStruct().chargeTypeId(objArr[QStringLiteral("chargeTypeId")].toInt());
borderline.effectDuration(objArr[QStringLiteral("effectDuration")].toDouble());
borderline.effectMarkingInTa(objArr[QStringLiteral("effectMarkingInTa")].toInt());
borderline.effectStart(objArr[QStringLiteral("effectStart")].toDouble());
borderline.chargeStruct.chargeTypeId = objArr[QStringLiteral("chargeTypeId")].toInt();
borderline.effectDuration = objArr[QStringLiteral("effectDuration")].toDouble();
borderline.effectMarkingInTa = objArr[QStringLiteral("effectMarkingInTa")].toInt();
borderline.effectStart = objArr[QStringLiteral("effectStart")].toDouble();
int effectStateId = objArr[QStringLiteral("effectStateId")].toInt();
borderline.effectStateId(static_cast<AreaEffectSimulation::AesEffectState>(effectStateId));
borderline.operatorId(objArr[QStringLiteral("operatorId")].toInt());
borderline.id(0);
borderline.name(objArr[QStringLiteral("name")].toString().toStdString());
borderline.effectStateId = static_cast<AreaEffectSimulation::AesEffectState>(effectStateId);
borderline.operatorId = objArr[QStringLiteral("operatorId")].toInt();
borderline.id = 0;
borderline.name = objArr[QStringLiteral("name")].toString().toStdString();
if (objArr.contains(QStringLiteral("participantId")) )
borderline.participantId(objArr[QStringLiteral("participantId")].toDouble());
borderline.participantId = objArr[QStringLiteral("participantId")].toDouble();
if (objArr.contains(QStringLiteral("partyId")) )
borderline.partyId(objArr[QStringLiteral("partyId")].toDouble());
borderline.sampleTime(objArr[QStringLiteral("sampleTime")].toDouble());
borderline.partyId = objArr[QStringLiteral("partyId")].toDouble();
borderline.sampleTime = objArr[QStringLiteral("sampleTime")].toDouble();
const QJsonArray arrSeg = (objArr.value(QStringLiteral("segments")).toArray());
borderline.segments().reserve(arrSeg.size());
borderline.segments.reserve(arrSeg.size());
for (const auto &seg : arrSeg)
{
const QJsonObject objSeg(seg.toObject());
Core::GeoPosition2D segment;
segment.lat(objSeg[QStringLiteral("lat")].toDouble());
segment.lon(objSeg[QStringLiteral("lon")].toDouble());
borderline.segments().push_back(std::move(segment));
segment.lat = objSeg[QStringLiteral("lat")].toDouble();
segment.lon = objSeg[QStringLiteral("lon")].toDouble();
borderline.segments.push_back(std::move(segment));
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.h
+1 -1
View File
@@ -3,7 +3,7 @@
#pragma once
#include <AreaEffectSimulation/Base/aes_base_model.h>
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
namespace LtsSession
{