Migrates ./Lts/Viewer successfully to Qt6

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_initializer.cpp

@@ -26,6 +26,7 @@
 #include <QtCore/QJsonArray>
 #include <QNetworkProxy>
 #include <QtWidgets/QMessageBox>
+#include <utility>
 
 
 //----------------------------------------------------------------------------
@@ -592,7 +593,7 @@ bool MapInitializer::initializeBasemapsQSettings(Mode mapMode)
   bool success = true;
   int localLayerCount = 0;
   // item => val, name
-  for (const QPair<QString, QString> &item : qAsConst(basemapUrls))
+  for (const QPair<QString, QString> &item : std::as_const(basemapUrls))
   {
     QString layername = QStringLiteral("%1%2").arg(m_map.layerFactory().basemapLayernamePrefix()).arg(localLayerCount);
 
@@ -658,7 +659,7 @@ bool MapInitializer::initializeBasemapsJson(const QVector<BaseUrl> &baseUrls)
   bool success = true;
 
   int localLayerCount = 0;
-  for (const BaseUrl &baseUrl : qAsConst(baseUrls))
+  for (const BaseUrl &baseUrl : std::as_const(baseUrls))
   {
     const QString &layername = QStringLiteral("%1%2").arg(m_map.layerFactory().basemapLayernamePrefix()).arg(localLayerCount);
 
@@ -688,7 +689,7 @@ bool MapInitializer::initializeSceneObjectLayers()
     return true; // handle as successful
 
   bool success = true;
-  for (const QString &item : qAsConst(sceneObjectUrls))
+  for (const QString &item : std::as_const(sceneObjectUrls))
   {
     QChar seperator(QLatin1Char('#'));
     QStringList slUrlExt = item.split(seperator);
@@ -730,7 +731,7 @@ bool MapInitializer::initializeSceneObjectLayersJson()
     return true; // handle as successful
 
   bool success = true;
-  for (const BaseUrl &item : qAsConst(urls))
+  for (const BaseUrl &item : std::as_const(urls))
   {
     const QString &urlVal = item.url();
 

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/operator_map_settings.cpp

@@ -15,6 +15,7 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
+#include <utility>
 
 
 //----------------------------------------------------------------------------
@@ -71,7 +72,7 @@ QJsonObject OperatorMapSettings::toJsonObject() const
   // orderedLayers
   {
     QJsonArray jArray;
-    for (const QPair<QString, LayerParameter> &pair : qAsConst(orderedLayers))
+    for (const QPair<QString, LayerParameter> &pair : std::as_const(orderedLayers))
     {
       const QString &layername = pair.first;
       const LayerParameter &lp = pair.second;

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_types.h

@@ -19,6 +19,7 @@
 #include <QtGui/QColor>
 #include <QtCore/QList>
 #include <QtCore/QPointF>
+#include <utility>
 
 
 //----------------------------------------------------------------------------
@@ -306,7 +307,7 @@ inline PositionCont convert2D3D(const QList<QPointF> &lst)
 {
   PositionCont posCont;
   posCont.reserve(lst.size());
-  for (auto i : qAsConst(lst) )
+  for (auto i : std::as_const(lst) )
     posCont.append(Point3D::fromQPointF(i));
   return posCont;
 }
@@ -315,7 +316,7 @@ inline PositionCont convert2D3D(const QVector<QPointF> &vec)
 {
   PositionCont posCont;
   posCont.reserve(vec.size());
-  for (auto i : qAsConst(vec) )
+  for (auto i : std::as_const(vec) )
     posCont.append(Point3D::fromQPointF(i));
   return posCont;
 }