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 2b957d1edb
commit 598fc2560e
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/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);