variantObject to dataRole

Author: bri12415

uitools/cpp/Esri/ArcGISRuntime/Toolkit/Internal/GenericListModel.cpp

@@ -55,7 +55,7 @@ namespace Esri::ArcGISRuntime::Toolkit {
     \li Value
     \li Type
   \row
-    \li variantObject
+    \li dataRole
     \li \c{Qt::UserRole}
     \li \c{Foo*}
   \row
@@ -72,7 +72,7 @@ namespace Esri::ArcGISRuntime::Toolkit {
     \li \c {bool}
  \endtable
 
- A hard-coded \e{variantObject} role is always exposed as \c Qt::UserRole,
+ A hard-coded \e{dataRole} role is always exposed as \c Qt::UserRole,
  followed by each property on \c Foo in order of declaration.
 
  Both \c data and \c setData can be called respectively on these roles.
@@ -290,7 +290,7 @@ namespace Esri::ArcGISRuntime::Toolkit {
   \brief A collection of role names and the corresponding user role enum.
 
   This will always return the hard-coded \e{(name, role)} combination
-  \c{(variantObject, Qt::UserRole)}.
+  \c{(dataRole, Qt::UserRole)}.
 
   For each subsequent property it will also expose:
   \c{(property_N, Qt::UserRole + N + 1)} where \tt{property_N} is the N\sup{th}
@@ -304,7 +304,7 @@ namespace Esri::ArcGISRuntime::Toolkit {
      \li Name
      \li Value
    \row
-     \li variantObject
+     \li dataRole
      \li \c{Qt::UserRole}
    \row
      \li propertyA
@@ -326,7 +326,7 @@ namespace Esri::ArcGISRuntime::Toolkit {
       return {};
 
     QHash<int, QByteArray> output;
-    output.insert(Qt::UserRole, "variantObject");
+    output.insert(Qt::UserRole, "dataRole");
 
     const int offset = m_elementType->propertyOffset();
     for (int i = offset; i < m_elementType->propertyCount(); ++i)

uitools/import/Esri/ArcGISRuntime/Toolkit/BasemapGallery.qml

@@ -208,8 +208,8 @@ Pane {
             id: basemapDelegate
             width: view.cellWidth
             height: view.cellHeight
-            enabled: controller.basemapMatchesCurrentSpatialReference(variantObject.basemap)
-            onClicked: controller.setCurrentBasemap(variantObject.basemap)
+            enabled: controller.basemapMatchesCurrentSpatialReference(dataRole.basemap)
+            onClicked: controller.setCurrentBasemap(dataRole.basemap)
             indicator: Item { }
             down: GridView.isCurrentItem
 
@@ -229,13 +229,13 @@ Pane {
             }
             icon {
                 cache: false
-                source: variantObject.thumbnailUrl
+                source: dataRole.thumbnailUrl
                 width: basemapGallery.internal.defaultCellSize
                 height: basemapGallery.internal.defaultCellSize
                 color: "transparent"
             }
 
-            text: variantObject.name === "" ? "Unnamed basemap" : variantObject.name
+            text: dataRole.name === "" ? "Unnamed basemap" : dataRole.name
             display: {
                 if (basemapGallery.internal.calculatedStyle === BasemapGallery.ViewStyle.List) {
                     return AbstractButton.TextBesideIcon;
@@ -250,23 +250,23 @@ Pane {
                     Qt.openUrlExternally(link)
                 }
             }
-            ToolTip.text: variantObject.tooltip
+            ToolTip.text: dataRole.tooltip
             MouseArea {
                 id: mouseArea
                 z : 2
                 anchors.fill: parent
                 hoverEnabled: true
                 onClicked: {
-                    if (controller.currentBasemap !== variantObject.basemap)
+                    if (controller.currentBasemap !== dataRole.basemap)
                         busyIndicator.running = true;
-                    controller.setCurrentBasemap(variantObject.basemap);
+                    controller.setCurrentBasemap(dataRole.basemap);
                 }
 
                 // When mouse enters thumbnail area, use timer to delay showing of tooltip.
                 onEntered: {
                     // Create a definition for the showTooltipFn property of timerOnEntered
                     timerOnEntered.showTooltipFn = () => {
-                        if (allowTooltips && mouseArea.containsMouse && variantObject.tooltip !== "")
+                        if (allowTooltips && mouseArea.containsMouse && dataRole.tooltip !== "")
                         basemapDelegate.ToolTip.visible = true;
                     }
                     timerOnEntered.start();

uitools/import/Esri/ArcGISRuntime/Toolkit/BookmarksView.qml

@@ -79,7 +79,7 @@ Pane {
             text: name
             width: listView.width
             indicator: null
-            onPressed: controller.zoomToBookmarkExtent(variantObject)
+            onPressed: controller.zoomToBookmarkExtent(dataRole)
         }
     }
 

uitools/import/Esri/ArcGISRuntime/Toolkit/ClientCertificateView.qml

@@ -97,7 +97,7 @@ Dialog {
             }
 
             delegate: ItemDelegate {
-                text: variantObject
+                text: dataRole
                 anchors {
                     left: parent.left
                     right: parent.right

uitools/import/Esri/ArcGISRuntime/Toolkit/CoordinateConversion.qml

@@ -286,11 +286,11 @@ Pane {
                         MenuItem {
                             text: "Copy to clipboard"
                             // Copy not available in pure QML API
-                            enabled: typeof variantObject !== "undefined"
+                            enabled: typeof dataRole !== "undefined"
                             visible: enabled
                             height: enabled ? implicitHeight : 0
                             onClicked: {
-                                variantObject.copyNotationToClipboard();
+                                dataRole.copyNotationToClipboard();
                             }
                         }
                     }