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

Migrates ./Lts/Viewer successfully to Qt6

Browse Source
This commit is contained in:
torsten committed 2026-09-23 10:14:59 +02:00
1 parent cdb8c754e9
commit ed9fc51e7a
28 files changed
+250 -129
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp
+13 -12
View File
@@ -18,8 +18,8 @@
// arcgis
#include <arcgis/TaskWatcher.h>
#include <arcgis/DictionarySymbolStyle.h>
#include <TaskWatcher.h>
#include <DictionarySymbolStyle.h>
// Qt
@@ -28,6 +28,7 @@
#include <QtCore/QUuid>
#include <QtCore/QByteArray>
#include <QtCore/QBuffer>
#include <utility>
#include <QMimeData>
#include <QtCore/QTimer>
@@ -441,7 +442,7 @@ void BaseSymbolModel::initModel(SymbolDictionary *symbolDictionary,
int itemCounter = 0;
QVector<DATA_T> vecData;
vecData.reserve(searchResultList.size());
for (const Esri::ArcGISRuntime::SymbolStyleSearchResult &searchResult : qAsConst(searchResultList))
for (const Esri::ArcGISRuntime::SymbolStyleSearchResult &searchResult : std::as_const(searchResultList))
{
GeometryType gt = GeometryType::Undefined;
auto it = baseSymbolCodeToSymbolPropertyTable.find(searchResult.key().left(8));
@@ -593,7 +594,7 @@ QVariant BaseSymbolModel::headerData(int section, Qt::Orientation orientation, i
cfc.sortItems = true;
cfc.data.reserve(d->m_usedOperator.size());
LtsWidgets::ComboboxFilterData cfd;
for (const QString &opName : qAsConst(d->m_usedOperator))
for (const QString &opName : std::as_const(d->m_usedOperator))
{
cfd.data = opName;
cfd.text = opName;
@@ -606,7 +607,7 @@ QVariant BaseSymbolModel::headerData(int section, Qt::Orientation orientation, i
LtsWidgets::ComboboxFilterContent cfc;
cfc.data.reserve(d->m_usedSymbolSet.size());
LtsWidgets::ComboboxFilterData cfd;
for (const auto &symSet : qAsConst(d->m_usedSymbolSet))
for (const auto &symSet : std::as_const(d->m_usedSymbolSet))
{
cfd.data = symSet;
cfd.text = symSet;
@@ -619,7 +620,7 @@ QVariant BaseSymbolModel::headerData(int section, Qt::Orientation orientation, i
LtsWidgets::ComboboxFilterContent cfc;
cfc.data.reserve(d->m_usedSymbolClass.size());
LtsWidgets::ComboboxFilterData cfd;
for (const auto &sc : qAsConst(d->m_usedSymbolClass))
for (const auto &sc : std::as_const(d->m_usedSymbolClass))
{
cfd.data = sc;
cfd.text = sc;
@@ -633,7 +634,7 @@ QVariant BaseSymbolModel::headerData(int section, Qt::Orientation orientation, i
cfc.sortItems = true;
cfc.data.reserve(d->m_usedXmlSymbolScale.size());
LtsWidgets::ComboboxFilterData cfd;
for (const auto &symScale : qAsConst(d->m_usedXmlSymbolScale))
for (const auto &symScale : std::as_const(d->m_usedXmlSymbolScale))
{
cfd.data = symScale;
cfd.text = QString::number(symScale);
@@ -646,7 +647,7 @@ QVariant BaseSymbolModel::headerData(int section, Qt::Orientation orientation, i
LtsWidgets::ComboboxFilterContent cfc;
cfc.data.reserve(d->m_usedGeometryTypes.size());
LtsWidgets::ComboboxFilterData cfd;
for (const AdvancedSymbology::GeometryType &gt : qAsConst(d->m_usedGeometryTypes))
for (const AdvancedSymbology::GeometryType &gt : std::as_const(d->m_usedGeometryTypes))
{
cfd.data = (int)gt;
cfd.text = geometryTypeToDisplayString(gt);
@@ -660,7 +661,7 @@ QVariant BaseSymbolModel::headerData(int section, Qt::Orientation orientation, i
cfc.sortItems = true;
cfc.data.reserve(d->m_usedCategory.size());
LtsWidgets::ComboboxFilterData cfd;
for (const auto &cat : qAsConst(d->m_usedCategory))
for (const auto &cat : std::as_const(d->m_usedCategory))
{
cfd.data = cat;
cfd.text = cat;
@@ -674,7 +675,7 @@ QVariant BaseSymbolModel::headerData(int section, Qt::Orientation orientation, i
cfc.sortItems = true;
cfc.data.reserve(d->m_usedGctStrings.size());
LtsWidgets::ComboboxFilterData cfd;
for (const auto &gctStr : qAsConst(d->m_usedGctStrings))
for (const auto &gctStr : std::as_const(d->m_usedGctStrings))
{
cfd.data = gctStr;
cfd.text = gctStr;
@@ -922,7 +923,7 @@ void BaseSymbolModel::onUpdateUsedItemsForComboBox()
d->m_usedCategory.clear();
d->m_usedGctStrings.clear();
for (const QSharedPointer<BaseSymbolItem> &item : qAsConst(m_vecData))
for (const QSharedPointer<BaseSymbolItem> &item : std::as_const(m_vecData))
{
if (!item)
continue;
@@ -944,7 +945,7 @@ SymbolProperties BaseSymbolModel::symbolProperties(const QString &baseSymbolCode
// bisher aus m_baseSymbolCodeToSymbolPropertyTable beantwortet:
SymbolProperties symbolProperties;
for (const auto &item : qAsConst(m_vecData))
for (const auto &item : std::as_const(m_vecData))
{
if (item->baseSymbolCode() != baseSymbolCode)
continue;