Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -65,16 +65,16 @@ NGL_TARGET_LINK_LIBRARIES(planEditor
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
NGLLogger
|
||||
Qt5::Xml
|
||||
Qt6::Xml
|
||||
ngltranslator
|
||||
|
||||
PUBLIC
|
||||
advancedSymbologyGui
|
||||
situationMapCommon
|
||||
LtsWidgets
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
Qt5::WebEngineWidgets
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
Qt6::WebEngineWidgets
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(planEditor)
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@ NGL_TARGET_LINK_LIBRARIES( PlanEditorGuiPlugin
|
||||
LtsUtilsGuiDds
|
||||
LtsWidgets
|
||||
NGLLogger
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(PlanEditorGuiPlugin)
|
||||
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(
|
||||
planEditor
|
||||
ArcGIS::ArcGIS
|
||||
LtsPluginLoader
|
||||
Qt5::Gui
|
||||
Qt6::Gui
|
||||
)
|
||||
|
||||
IF(TARGET planEditorTest)
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "plan_editor.h"
|
||||
#include <utility>
|
||||
#include "plan_editor_const.h"
|
||||
#include "plan_editor_session.h"
|
||||
|
||||
@@ -114,7 +115,7 @@ public:
|
||||
m_favouriteStoreMenu = nullptr;
|
||||
m_favouriteSaveMenu = nullptr;
|
||||
|
||||
for (auto item : qAsConst(m_ltsItems))
|
||||
for (auto item : std::as_const(m_ltsItems))
|
||||
m_session.removeMenuAction(item);
|
||||
m_ltsItems.clear();
|
||||
|
||||
@@ -240,7 +241,7 @@ void FavouritesActionManager::initFromDefaultSettings()
|
||||
|
||||
void FavouritesActionManager::removeActionItems()
|
||||
{
|
||||
for (auto item : qAsConst(m_internal->m_ltsItems))
|
||||
for (auto item : std::as_const(m_internal->m_ltsItems))
|
||||
m_internal->m_session.removeMenuAction(item);
|
||||
m_internal->m_ltsItems.clear();
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "plan_editor.h"
|
||||
#include <utility>
|
||||
#include "logging.h"
|
||||
|
||||
|
||||
@@ -351,7 +352,7 @@ template<class RubberbandClass> void GeometryPlacer<RubberbandClass>::applyTrans
|
||||
geoModel->startUndoBlock();
|
||||
{
|
||||
const SituationMap::MathUtils::Matrix2D &mat = m_rubberband->transformMatrix();
|
||||
for (SituationMap::UniqueMapId uid : qAsConst(m_uidList))
|
||||
for (SituationMap::UniqueMapId uid : std::as_const(m_uidList))
|
||||
{
|
||||
const SituationMap::GeometryModel::Node &modelPrimitive = geoModel->findPrimitive(uid);
|
||||
if (modelPrimitive.isValid())
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include "model_tree_widget_item.h"
|
||||
#include <utility>
|
||||
#include "model_tree_widget.h"
|
||||
#include "plan_editor.h"
|
||||
#include "plan_editor_internal.h"
|
||||
@@ -161,10 +162,10 @@ void ModelTreeWidgetItem::updateTree( ModelTreeWidget *modelTr
|
||||
|
||||
|
||||
|
||||
for (auto childItem : qAsConst(treeItemSet))
|
||||
for (auto childItem : std::as_const(treeItemSet))
|
||||
removeConnectionRecursive(childItem);
|
||||
|
||||
for (auto childItem : qAsConst(treeItemSet))
|
||||
for (auto childItem : std::as_const(treeItemSet))
|
||||
delete childItem;
|
||||
|
||||
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
|
||||
#include "plan_editor.h"
|
||||
#include <utility>
|
||||
|
||||
#include "plan_editor_const.h"
|
||||
#include "plan_editor_session.h"
|
||||
@@ -375,7 +376,7 @@ public:
|
||||
delete m_geoModelRenderer; m_geoModelRenderer = nullptr;
|
||||
|
||||
|
||||
for (const auto &item : qAsConst(m_ltsItems))
|
||||
for (const auto &item : std::as_const(m_ltsItems))
|
||||
m_session.removeMenuAction(item);
|
||||
m_ltsItems.clear();
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "plan_editor_utils.h"
|
||||
#include <utility>
|
||||
|
||||
#include <nglapplication/nglapplication.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
@@ -39,7 +40,7 @@ QIcon Utils::getIcon(const QString &iconName)
|
||||
<< QStringLiteral(".gif");
|
||||
}
|
||||
|
||||
for (const QString &postfix : qAsConst(iconPostfixes))
|
||||
for (const QString &postfix : std::as_const(iconPostfixes))
|
||||
{
|
||||
QString fn = QStringLiteral("PlanEditorIcon:") + iconName + postfix;
|
||||
if (!QFile::exists(fn))
|
||||
|
||||
Reference in new issue
Block a user