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/PlanEditor/attribute_dialog_manager.cpp
+5 -3
View File
@@ -2,6 +2,7 @@
#include "attribute_dialog_manager.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <Symbology/sidc_codec.h>
#include <SymbologyGui/symbol_modification_dialog.h>
#include <SymbologyXML/Gui/symbol_dialog.h>
@@ -29,7 +30,7 @@
#include <QtCore/QPointer>
#include <QtWidgets/QAbstractButton>
#include <QtWidgets/QAction>
#include <QtGui/QAction>
#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QColorDialog>
@@ -145,7 +146,8 @@ public:
Logger &m_logger;
InternalData(PlanEditor *planEditor, SituationMap::Map *map, SituationMap::GeometryModel *geoModel, const PlanEditorSession &session, AttributeDialogManager *self)
: m_planEditor(planEditor)
: m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("AttributeDialogManager::InternalData"))
, m_planEditor(planEditor)
, m_map(map)
, m_geoModel(geoModel)
, m_session(session)
@@ -182,7 +184,7 @@ public:
, m_lineWidth(1)
, m_color(m_session.topLevelWidget()->palette().color(QPalette::ColorRole::Highlight))
, m_fillColor(m_session.topLevelWidget()->palette().color(QPalette::ColorRole::Background))
, m_fillColor(m_session.topLevelWidget()->palette().color(QPalette::ColorRole::Window))
, m_linePattern(SituationMap::GeometryModel::LineStyle::LineSolid)
, m_fillPattern(SituationMap::GeometryModel::FillPattern::None)
, m_fillStyle(SituationMap::GeometryModel::FillStyle::Pieslice)
qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/geometry_placer.h
+2
View File
@@ -4,6 +4,7 @@
#pragma once
#include "plan_editor.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <utility>
#include "logging.h"
@@ -117,6 +118,7 @@ template<class RubberbandClass> GeometryPlacer<RubberbandClass>::GeometryPlacer(
, m_previewGeoModelRenderer(nullptr)
, m_uidList()
, m_rubberband(nullptr)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("GeometryPlacer"))
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/mil2525d_to_mil2525c.cpp
+3 -3
View File
@@ -57,7 +57,7 @@ class Converter::Internal
{
if (line.isEmpty()) return true;
QVector<QStringRef> tokenList = line.splitRef(QLatin1Char(';'));
QList<QString> tokenList = line.split(QLatin1Char(';'));
QRegularExpression sidcTemplate(QStringLiteral("^[A-Z]{1,1}\\*[A-Z]+[\\-\\*X]+$"));
QString sidc;
@@ -77,7 +77,7 @@ class Converter::Internal
if (sidc.isEmpty()) return true;
bool isNumber = false;
const QStringRef &code2525d = tokenList.last();
const QString &code2525d = tokenList.last();
unsigned int code = code2525d.toUInt(&isNumber);
if (!isNumber)
@@ -87,7 +87,7 @@ class Converter::Internal
if (m_2525dToSidc.contains(code)) return true;
QStringRef kindOfRubberband;
QString kindOfRubberband;
foreach (auto token, tokenList)
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/model_tree_widget.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include <QtGui/QKeyEvent>
#include <QtWidgets/QAbstractItemView>
#include <QtWidgets/QAction>
#include <QtGui/QAction>
#include <QtWidgets/QApplication>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor.cpp
+14 -10
View File
@@ -55,7 +55,7 @@ const char* const REVISION = "$Revision$";
#include <QtCore/QFileInfo>
#include <QtCore/QMimeData>
#include <QtCore/QString>
#include <QtCore/QStringRef>
#include <QString>
#include <QtCore/QSettings>
#include <QtCore/QTemporaryFile>
#include <QtCore/QTime>
@@ -70,7 +70,7 @@ const char* const REVISION = "$Revision$";
#include <QtGui/QTextTable>
#include <QtGui/QTextTableCell>
#include <QtWidgets/QAction>
#include <QtGui/QAction>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QGraphicsView>
@@ -89,6 +89,8 @@ const char* const REVISION = "$Revision$";
#include <QtWidgets/QVBoxLayout>
#include <QtPrintSupport/QPrintDialog>
#include <QtGui/QPageLayout>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <SituationMap/LayerAggregation/layer_aggregation_widget.h>
#include <SituationMap/LayerAggregation/participant_aggregation_dialog.h>
@@ -311,6 +313,7 @@ static void importGuezXMLSymbolsFromFile(const AdvancedSymbology::SymbolDictiona
PlanEditor::PlanEditor(SituationMap::Map *map, LtsSession::LtsSession *ltsSession)
: QObject()
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("PlanEditor"))
, m_internal(new PlanEditor::InternalData(map, PlanEditorSession(ltsSession, this), this))
{
init();
@@ -319,6 +322,7 @@ PlanEditor::PlanEditor(SituationMap::Map *map, LtsSession::LtsSession *ltsSessio
PlanEditor::PlanEditor(SituationMap::Map *map, LtsWidgets::LtsBaseLayoutWidget *ltsbaseWidget)
: QObject()
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("PlanEditor"))
, m_internal(new PlanEditor::InternalData(map, PlanEditorSession(ltsbaseWidget, this), this))
{
init();
@@ -2512,7 +2516,7 @@ void PlanEditor::onPlanPrint()
QSharedPointer<QPrinter> printer(new QPrinter(QPrinter::PrinterMode::HighResolution));
QPrintDialog printDialog(printer.data(), topLevelWidget());
printer->setOrientation(QPrinter::Orientation::Landscape);
printer->setPageOrientation(QPageLayout::Orientation::Landscape);
if (printDialog.exec() == QDialog::Accepted)
{
@@ -2549,7 +2553,7 @@ void PlanEditor::onPlanPrint()
const QFont &defaultFont = defaultFontFormat.font();
int marginInt = defaultFont.pixelSize();
const QSizeF pageSize = printer->paperRect().size();
const QSizeF pageSize = printer->paperRect(QPrinter::Point).size();
const QSizeF drawingSize = pageSize - QSizeF(2 * marginInt, 5 * marginInt) * 1.5;
QMarginsF margins;
@@ -2671,18 +2675,18 @@ static QString addPlanFileSuffix(const QString &filePath, const QString &selecte
QStringRef suffix;
QString suffix;
int suffixDefStart = selectedNameFilter.lastIndexOf(QLatin1Char('(')) + 1;
int suffixDefEnd = selectedNameFilter.lastIndexOf(QLatin1Char(')')) - 1;
if (suffixDefStart < suffixDefEnd)
{
const QStringRef &suffixFilter = selectedNameFilter.midRef(suffixDefStart, suffixDefEnd - suffixDefStart + 1);
const QVector<QStringRef> &suffixVector = suffixFilter.split(QLatin1Char(' '), QString::SkipEmptyParts);
const QString &suffixFilter = selectedNameFilter.mid(suffixDefStart, suffixDefEnd - suffixDefStart + 1);
const QList<QString> &suffixVector = suffixFilter.split(QLatin1Char(' '), Qt::SkipEmptyParts);
if (!suffixVector.isEmpty())
{
const QStringRef &filter = suffixVector.first();
const QString &filter = suffixVector.first();
int indexOfDot = filter.lastIndexOf(QLatin1Char('.'));
if (indexOfDot >= 0)
suffix = filter.right(filter.length() - indexOfDot);
@@ -2691,7 +2695,7 @@ static QString addPlanFileSuffix(const QString &filePath, const QString &selecte
if (suffix.isEmpty()) suffix = QStringRef(&defaultSuffix);
if (suffix.isEmpty()) suffix = QString(defaultSuffix);
if ((suffix == QStringLiteral(".*")) || (filePath.endsWith(suffix))) return filePath;
return filePath + suffix;
@@ -4882,7 +4886,7 @@ static void importGuezXMLSymbolsFromFile(const AdvancedSymbology::SymbolDictiona
QString blockBegin = QStringLiteral("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
QString blockEnd = QStringLiteral("</symbol>");
const QVector<QStringRef> & xmlSymbolVector = xmlContent.splitRef(blockEnd,QString::SplitBehavior::SkipEmptyParts);
const QList<QString> & xmlSymbolVector = xmlContent.split(blockEnd,Qt::SkipEmptyParts);
for (auto xmlSymbolRef : std::as_const(xmlSymbolVector))
{
int xmlBegin = xmlSymbolRef.indexOf(blockBegin);
qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_internal.h
+3 -1
View File
@@ -5,6 +5,7 @@
#include "plan_editor.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <utility>
#include "plan_editor_const.h"
@@ -194,7 +195,8 @@ public:
Logger &m_logger;
InternalData(SituationMap::Map *map, const PlanEditorSession &session, PlanEditor *me)
: QObject()
: m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("PlanEditor::InternalData"))
, QObject()
, m_title(QStringLiteral("PlanEditor"))
, m_session(session)
, m_map(map)
qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/symbol_favourites.cpp
+2
View File
@@ -3,6 +3,7 @@
#include "symbol_favourites.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "plan_editor.h"
#include <QtCore/QIODevice>
@@ -211,6 +212,7 @@ public:
SymbolFavouritesDom() : QDomDocument(QLatin1String(m_rootNodeName) + QLatin1String("Document"))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("symbol_favourites"))
{
if (!m_initStaticDone) initStatic();
QDomElement root = createElement(QLatin1String(m_rootNodeName));