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

Adds immediate migration results

Browse Source
This commit is contained in:
torsten committed 2026-08-18 22:12:24 +02:00
1 parent ba4121728b
commit 6a2a0667ab
2395 files changed
+357322 -2524
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
+20 -19
View File
@@ -5,6 +5,7 @@ const char* const REVISION = "$Revision$";
#include "dialog.h"
#include <utility>
#include "drop_event_manager.h"
#include "icon_names.h"
#include "lookup_symbol_dlg.h"
@@ -228,7 +229,7 @@ void PlanEditor::onNoticeGeoModelUpdate(const SituationMap::GeometryModel::Node
QVectorIterator<SituationMap::PBTB_ID> pbtbIdVecIt(pbtbIdVec);
for (const SituationMap::PixelTextBoxData &ptbd : qAsConst(ptbdCont))
for (const SituationMap::PixelTextBoxData &ptbd : std::as_const(ptbdCont))
{
pbtbIdVecIt.hasNext();
const SituationMap::PBTB_ID &pbtbId = pbtbIdVecIt.next();
@@ -449,7 +450,7 @@ void PlanEditor::onEnableSymbolWidgets()
if (m_internal->m_symbolDictLoaded) return;
m_internal->m_symbolDictLoaded = true;
m_internal->m_favouritesActionManager->initFromDefaultSettings();
for (QWidget *w : qAsConst(m_internal->m_symbolWidgets))
for (QWidget *w : std::as_const(m_internal->m_symbolWidgets))
w->setEnabled(true);
}
@@ -1568,7 +1569,7 @@ void PlanEditor::initializePlanTextBoxPixel()
m_internal->resetTextBoxData();
m_internal->m_ourTextBoxIds.clear();
m_internal->m_ourTextBoxIds.reserve(ptbdCont.size());
for (const SituationMap::PixelTextBoxData &ptbd : qAsConst(ptbdCont))
for (const SituationMap::PixelTextBoxData &ptbd : std::as_const(ptbdCont))
{
DEBUG_LOG(m_internal->m_logger) << LOGFUNCTION << " -------- ptbd.toDebugString = " << ptbd.toDebugString();
@@ -1787,10 +1788,10 @@ void PlanEditor::saveSelectedToFile(const QString &filePath)
void cleanup()
{
for (const auto &node : qAsConst(m_removeNodeList))
for (const auto &node : std::as_const(m_removeNodeList))
m_geometryModel->removePrimitive(node);
for (const auto &group : qAsConst(m_removeGroupList))
for (const auto &group : std::as_const(m_removeGroupList))
m_geometryModel->deleteGroup(group);
}
@@ -2046,7 +2047,7 @@ void PlanEditor::updateSelectedFeature(const QString &undoToken)
m_internal->m_geoModel->startUndoBlock();
{
for (SituationMap::UniqueMapId uid : qAsConst(m_internal->m_selectionList))
for (SituationMap::UniqueMapId uid : std::as_const(m_internal->m_selectionList))
{
const SituationMap::GeometryModel::Node &modelPrimitive = m_internal->m_geoModel->findPrimitive(uid);
if (modelPrimitive.isValid())
@@ -2850,7 +2851,7 @@ void PlanEditor::onCenterViewSelected()
qreal viewAreaMaxX = -std::numeric_limits<qreal>::max();
qreal viewAreaMaxY = -std::numeric_limits<qreal>::max();
for (SituationMap::UniqueMapId uid : qAsConst(m_internal->m_selectionList))
for (SituationMap::UniqueMapId uid : std::as_const(m_internal->m_selectionList))
{
SituationMap::AbstractMapObject *mapObj = m_internal->m_map->objectFactory().idToMapObject(uid);
if (!mapObj) continue;
@@ -3779,7 +3780,7 @@ void PlanEditor::onRectangleCreate(SituationMap::RB::RubberbandBase *rubberband)
{
m_internal->m_geoModel->setPrimitivePoints(node, points);
for (const auto &attrPair : qAsConst(attributes))
for (const auto &attrPair : std::as_const(attributes))
m_internal->m_geoModel->setPrimitiveAttribute(node, attrPair.first, attrPair.second);
addStyleAttributes(node, false);
}
@@ -3968,7 +3969,7 @@ void PlanEditor::writeTextBoxDataToModel()
const SituationMap::PixelBasedTextBoxHandler &pixelBasedTextBoxHandler = m_internal->m_map->pixelBasedTextBoxHandler();
const QVector<SituationMap::PBTB_ID> pbtbIdVec = pixelBasedTextBoxHandler.getAllIdsOfParent(pbtbIdAsParent);
for (const SituationMap::PBTB_ID &pbtbId : qAsConst(pbtbIdVec))
for (const SituationMap::PBTB_ID &pbtbId : std::as_const(pbtbIdVec))
{
const SituationMap::PixelTextBoxData &data = pixelBasedTextBoxHandler.getPixelTextBoxData(pbtbId);
if (data.isEmpty())
@@ -4195,7 +4196,7 @@ void PlanEditor::onTransformRotate(SituationMap::RB::RubberbandBase *rubberband)
for (auto uid : qAsConst(m_internal->m_selectionList))
for (auto uid : std::as_const(m_internal->m_selectionList))
{
const SituationMap::GeometryModel::Node &modelPrimitive = m_internal->m_geoModel->findPrimitive(uid);
if (modelPrimitive.isValid())
@@ -4398,7 +4399,7 @@ void PlanEditor::onDelete()
m_internal->m_geoModel->startUndoBlock();
{
for (auto uid : qAsConst(m_internal->m_selectionList))
for (auto uid : std::as_const(m_internal->m_selectionList))
removeFeature(uid, false);
}
m_internal->m_geoModel->endUndoBlock(tr("delete feature(s)", TR_UNDO_TOKEN));
@@ -4415,7 +4416,7 @@ void PlanEditor::onGroup()
m_internal->m_geoModel->startUndoBlock();
{
for (auto uid : qAsConst(m_internal->m_selectionList))
for (auto uid : std::as_const(m_internal->m_selectionList))
{
SituationMap::GeometryModel::Node node = m_internal->m_geoModel->findPrimitive(uid);
@@ -4464,7 +4465,7 @@ void PlanEditor::onUngroup()
m_internal->m_geoModel->startUndoBlock();
{
for (auto uid : qAsConst(m_internal->m_selectionList))
for (auto uid : std::as_const(m_internal->m_selectionList))
{
SituationMap::GeometryModel::Node node = m_internal->m_geoModel->findPrimitive(uid);
@@ -4478,7 +4479,7 @@ void PlanEditor::onUngroup()
if (!nodeList.contains(node)) nodeList += node;
}
for (const auto &node : qAsConst(nodeList))
for (const auto &node : std::as_const(nodeList))
{
getChildNodes(node, selectedNodes);
m_internal->m_geoModel->releaseGroup(node);
@@ -4490,7 +4491,7 @@ void PlanEditor::onUngroup()
onUpdateView();
onClearSelection();
for (const auto &node : qAsConst(selectedNodes))
for (const auto &node : std::as_const(selectedNodes))
setSelected(node, true);
}
@@ -4637,7 +4638,7 @@ void PlanEditor::onCopy()
QVector<SituationMap::GeometryModel::Node> nodesAddedClipboard;
for (SituationMap::UniqueMapId uid : qAsConst(m_internal->m_selectionList))
for (SituationMap::UniqueMapId uid : std::as_const(m_internal->m_selectionList))
{
SituationMap::GeometryModel::Node node = m_internal->m_geoModel->findPrimitive(uid);
@@ -4713,7 +4714,7 @@ void PlanEditor::onSymbolModified( AdvancedSymbology::SymbologyType
m_internal->m_geoModel->startUndoBlock();
{
for (SituationMap::UniqueMapId uid : qAsConst(m_internal->m_selectionList))
for (SituationMap::UniqueMapId uid : std::as_const(m_internal->m_selectionList))
{
const SituationMap::GeometryModel::Node &modelPrimitive = m_internal->m_geoModel->findPrimitive(uid);
if (modelPrimitive.isValid())
@@ -4815,7 +4816,7 @@ void PlanEditor::onSymbolXmlAttrModified(const QString & undoToken, SituationMap
{
m_internal->m_geoModel->startUndoBlock();
{
for (SituationMap::UniqueMapId uid : qAsConst(m_internal->m_selectionList))
for (SituationMap::UniqueMapId uid : std::as_const(m_internal->m_selectionList))
{
const SituationMap::GeometryModel::Node &modelPrimitive = m_internal->m_geoModel->findPrimitive(uid);
if (modelPrimitive.isValid())
@@ -4882,7 +4883,7 @@ static void importGuezXMLSymbolsFromFile(const AdvancedSymbology::SymbolDictiona
QString blockEnd = QStringLiteral("</symbol>");
const QVector<QStringRef> & xmlSymbolVector = xmlContent.splitRef(blockEnd,QString::SplitBehavior::SkipEmptyParts);
for (auto xmlSymbolRef : qAsConst(xmlSymbolVector))
for (auto xmlSymbolRef : std::as_const(xmlSymbolVector))
{
int xmlBegin = xmlSymbolRef.indexOf(blockBegin);
QString xmlSymbol = xmlSymbolRef.mid(xmlBegin).toString() + blockEnd + QStringLiteral("\n");