qt6.natvis: improve QMap display

Don't show the internal std::map anymore, but directly the values (avoid
one click).

Task-number: QTVSADDINBUG-991
Change-Id: I38760f0845c4969fbbcbfa5d47afd0d0331a69c3
Reviewed-by: Miguel Costa <miguel.costa@qt.io>

Author: narnaud

QtMSBuild/QtMsBuild/qt6.natvis.xml

@@ -409,10 +409,20 @@
         <AlternativeType Name="##NAMESPACE##::QMultiMap&lt;*,*&gt;"/>
         <DisplayString>{{ size={d.d-&gt;m._Mypair._Myval2._Myval2._Mysize} }}</DisplayString>
         <Expand>
-            <Item Name="[std::map]">d.d-&gt;m</Item>
+            <TreeItems>
+                <Size>d.d-&gt;m._Mypair._Myval2._Myval2._Mysize</Size>
+                <HeadPointer>d.d-&gt;m._Mypair._Myval2._Myval2._Myhead-&gt;_Parent</HeadPointer>
+                <LeftPointer>_Left</LeftPointer>
+                <RightPointer>_Right</RightPointer>
+                <ValueNode Condition="_Isnil == 0" Name="[{_Myval.first}]">_Myval,view(MapHelper)</ValueNode>
+            </TreeItems>
         </Expand>
     </Type>
 
+   <Type Name="std::pair&lt;*, *&gt;" IncludeView="MapHelper">
+        <DisplayString>{second}</DisplayString>
+    </Type>
+
    <Type Name="##NAMESPACE##::QHash&lt;*,*&gt;">
         <AlternativeType Name="##NAMESPACE##::QMultiHash&lt;*,*&gt;"/>
         <DisplayString>{{ size = {d-&gt;size} }}</DisplayString>

QtVsTools.Package/qt6.natvis.xml

@@ -409,10 +409,20 @@
         <AlternativeType Name="##NAMESPACE##::QMultiMap&lt;*,*&gt;"/>
         <DisplayString>{{ size={d.d-&gt;m._Mypair._Myval2._Myval2._Mysize} }}</DisplayString>
         <Expand>
-            <Item Name="[std::map]">d.d-&gt;m</Item>
+            <TreeItems>
+                <Size>d.d-&gt;m._Mypair._Myval2._Myval2._Mysize</Size>
+                <HeadPointer>d.d-&gt;m._Mypair._Myval2._Myval2._Myhead-&gt;_Parent</HeadPointer>
+                <LeftPointer>_Left</LeftPointer>
+                <RightPointer>_Right</RightPointer>
+                <ValueNode Condition="_Isnil == 0" Name="[{_Myval.first}]">_Myval,view(MapHelper)</ValueNode>
+            </TreeItems>
         </Expand>
     </Type>
 
+   <Type Name="std::pair&lt;*, *&gt;" IncludeView="MapHelper">
+        <DisplayString>{second}</DisplayString>
+    </Type>
+
    <Type Name="##NAMESPACE##::QHash&lt;*,*&gt;">
         <AlternativeType Name="##NAMESPACE##::QMultiHash&lt;*,*&gt;"/>
         <DisplayString>{{ size = {d-&gt;size} }}</DisplayString>