Copies intermediate migration results to repo

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_dictionary_impl.h

@@ -14,9 +14,11 @@
 
 // Qt
 #include <QUuid>   // QUuid used in slot signatures / map keys (Qt6: no transitive include)
+#include <QFutureWatcher>  // Qt6: For async ArcGIS operations
 
 // Esri
 #include <DictionarySymbolStyle.h>
+#include <Job.h>  // Qt6: ArcGIS Job-based API
 
 
 class QStandardItemModel;
@@ -50,6 +52,23 @@ QStringList listOfPlanEditorSidcs_Internal();
  */
 
 
+// Qt6: Helper struct to store QFutureWatcher and associated task data
+// Replaces Qt5 TaskWatcher pattern with QFuture-based async API
+struct SymbolFetchTask
+{
+  QFutureWatcher<Esri::ArcGISRuntime::Symbol*> watcher;
+  QUuid fsTaskId;  // Original task ID for mapping
+  QWeakPointer<SymbolResult> symbolResult;
+};
+
+struct SwatchTask
+{
+  QFutureWatcher<QImage> watcher;
+  QUuid csTaskId;  // Original task ID for mapping
+  QUuid fsTaskId;  // Corresponding findSymbol task ID
+};
+
+
 /**
  * @brief The SymbolDictionaryImpl class
  *
@@ -224,9 +243,10 @@ protected Q_SLOTS:
   void onLoadStatusChanged(Esri::ArcGISRuntime::LoadStatus loadStatus);
   void onProcessorAllIsDone();
 
-  void onFetchSymbolCompleted(QUuid fsTaskId, Esri::ArcGISRuntime::Symbol *symbol);
+  // Qt6: Slots called when QFutureWatcher finishes (use sender() to identify task)
+  void onFetchSymbolCompleted();
 
-  void onSwatchCompleted(const QUuid &csTaskId, const QImage &image);
+  void onSwatchCompleted();
 
 private:
   Esri::ArcGISRuntime::DictionarySymbolStyle *m_esri_dictionary = nullptr;
@@ -241,15 +261,20 @@ protected:
 
   //  // OWN data:
 
-  // createSwatch-Uuid -> findSymbol-Uuid
-  QMap<QUuid, QUuid>                          m_createSwatch2findSymbolTaskId;
+  // Qt6: Store QFutureWatcher tasks instead of QUuid-based maps
+  // createSwatch-task -> findSymbol-task mapping
+  QMap<SwatchTask*, SymbolFetchTask*>         m_createSwatch2findSymbolTask;
 
 
-  // searchSymbol-Uuid -> propertyResult
-  mutable QMap<QUuid, QWeakPointer<PropertyResult>> m_findSymbol2propertyResult;
+  // searchSymbol-task -> propertyResult
+  mutable QMap<SymbolFetchTask*, QWeakPointer<PropertyResult>> m_findSymbol2propertyResult;
 
-  // findSymbol-Uuid -> symbolResult
-  mutable QMap<QUuid, QWeakPointer<SymbolResult>> m_findSymbol2symbolResult;
+  // findSymbol-task -> symbolResult
+  mutable QMap<SymbolFetchTask*, QWeakPointer<SymbolResult>> m_findSymbol2symbolResult;
+
+  // Qt6: Store active QFutureWatcher tasks for cleanup
+  mutable QList<SymbolFetchTask*>             m_activeFetchSymbolTasks;
+  mutable QList<SwatchTask*>                  m_activeSwatchTasks;
 
 
 //  QStringList                                 m_sidcList;