Migrates ./Lts/Viewer successfully to Qt6
This commit is contained in:
28 files changed
+250
-129
No files matched your search
@@ -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();
|
||||
|
||||
|
||||
Reference in new issue
Block a user