From 92cf870ad6de2a4baa796330fa8b1597f41189c4 Mon Sep 17 00:00:00 2001
From: Sebastian Wick <sebastian.wick@redhat.com>
Date: Wed, 13 Nov 2024 14:19:41 +0100
Subject: [PATCH] data: Add missing Qt type annotations and move them to the
 right place

---
 data/org.freedesktop.background.Monitor.xml          | 4 +++-
 data/org.freedesktop.impl.portal.GlobalShortcuts.xml | 4 ++--
 data/org.freedesktop.impl.portal.InputCapture.xml    | 1 +
 data/org.freedesktop.impl.portal.PermissionStore.xml | 3 +++
 data/org.freedesktop.impl.portal.Settings.xml        | 1 +
 data/org.freedesktop.portal.Documents.xml            | 5 +++++
 data/org.freedesktop.portal.FileTransfer.xml         | 1 +
 data/org.freedesktop.portal.GlobalShortcuts.xml      | 5 ++---
 data/org.freedesktop.portal.InputCapture.xml         | 1 +
 data/org.freedesktop.portal.Settings.xml             | 1 +
 10 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/data/org.freedesktop.background.Monitor.xml b/data/org.freedesktop.background.Monitor.xml
index 426b2ea87..6a0845752 100644
--- a/data/org.freedesktop.background.Monitor.xml
+++ b/data/org.freedesktop.background.Monitor.xml
@@ -50,7 +50,9 @@
 
         Status message reported by the application. Optional.
     -->
-    <property name="BackgroundApps" type="aa{sv}" access="read"/>
+    <property name="BackgroundApps" type="aa{sv}" access="read">
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="QList&lt;QVariantMap&gt;"/>
+    </property>
 
     <property name="version" type="u" access="read"/>
   </interface>
diff --git a/data/org.freedesktop.impl.portal.GlobalShortcuts.xml b/data/org.freedesktop.impl.portal.GlobalShortcuts.xml
index 49690646a..e12780e47 100644
--- a/data/org.freedesktop.impl.portal.GlobalShortcuts.xml
+++ b/data/org.freedesktop.impl.portal.GlobalShortcuts.xml
@@ -68,12 +68,12 @@
     <method name="BindShortcuts">
       <arg type="o" name="handle" direction="in"/>
       <arg type="o" name="session_handle" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QList&lt;QPair&lt;QString,QVariantMap&gt;&gt;"/>
       <arg type="a(sa{sv})" name="shortcuts" direction="in"/>
       <arg type="s" name="parent_window" direction="in"/>
       <arg type="a{sv}" name="options" direction="in"/>
       <arg type="u" name="response" direction="out"/>
       <arg type="a{sv}" name="results" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QList&lt;QPair&lt;QString,QVariantMap&gt;&gt;"/>
     </method>
 
     <!--
@@ -145,8 +145,8 @@
     -->
     <signal name="ShortcutsChanged">
       <arg type="o" name="session_handle" direction="out"/>
-      <arg type="a(sa{sv})" name="shortcuts" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QList&lt;QPair&lt;QString,QVariantMap&gt;&gt;"/>
+      <arg type="a(sa{sv})" name="shortcuts" direction="out"/>
     </signal>
 
     <property name="version" type="u" access="read"/>
diff --git a/data/org.freedesktop.impl.portal.InputCapture.xml b/data/org.freedesktop.impl.portal.InputCapture.xml
index a7cb5fe53..bb1527e59 100644
--- a/data/org.freedesktop.impl.portal.InputCapture.xml
+++ b/data/org.freedesktop.impl.portal.InputCapture.xml
@@ -140,6 +140,7 @@
       <arg type="o" name="session_handle" direction="in"/>
       <arg type="s" name="app_id" direction="in"/>
       <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In4" value="QList&lt;QVariantMap&gt;"/>
       <arg type="aa{sv}" name="barriers" direction="in"/>
       <arg type="u" name="zone_set" direction="in"/>
       <arg type="u" name="response" direction="out"/>
diff --git a/data/org.freedesktop.impl.portal.PermissionStore.xml b/data/org.freedesktop.impl.portal.PermissionStore.xml
index cac27ddae..10033388e 100644
--- a/data/org.freedesktop.impl.portal.PermissionStore.xml
+++ b/data/org.freedesktop.impl.portal.PermissionStore.xml
@@ -61,6 +61,7 @@
     <method name="Lookup">
       <arg name='table' type='s' direction='in'/>
       <arg name='id' type='s' direction='in'/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QMap&lt;QString,QStringList&gt;"/>
       <arg name='permissions' type='a{sas}' direction='out'/>
       <arg name='data' type='v' direction='out'/>
     </method>
@@ -79,6 +80,7 @@
       <arg name='table' type='s' direction='in'/>
       <arg name='create' type='b' direction='in'/>
       <arg name='id' type='s' direction='in'/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="QMap&lt;QString,QStringList&gt;"/>
       <arg name='app_permissions' type='a{sas}' direction='in'/>
       <arg name='data' type='v' direction='in'/>
     </method>
@@ -194,6 +196,7 @@
       <arg name='id' type='s' direction='out'/>
       <arg name='deleted' type='b' direction='out'/>
       <arg name='data' type='v' direction='out'/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out4" value="QMap&lt;QString,QStringList&gt;"/>
       <arg name='permissions' type='a{sas}' direction='out'/>
     </signal>
   </interface>
diff --git a/data/org.freedesktop.impl.portal.Settings.xml b/data/org.freedesktop.impl.portal.Settings.xml
index 38eb64ea5..f76e371d3 100644
--- a/data/org.freedesktop.impl.portal.Settings.xml
+++ b/data/org.freedesktop.impl.portal.Settings.xml
@@ -77,6 +77,7 @@
     -->
     <method name='ReadAll'>
       <arg name='namespaces' type='as'/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QMap&lt;QString,QVariantMap&gt;"/>
       <arg name='value' direction='out' type='a{sa{sv}}'/>
     </method>
 
diff --git a/data/org.freedesktop.portal.Documents.xml b/data/org.freedesktop.portal.Documents.xml
index b7f4bc3c4..3c112bee8 100644
--- a/data/org.freedesktop.portal.Documents.xml
+++ b/data/org.freedesktop.portal.Documents.xml
@@ -98,6 +98,7 @@
     <method name="AddNamed">
       <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
       <arg type='h' name='o_path_parent_fd' direction='in'/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QByteArray"/>
       <arg type='ay' name='filename' direction='in'/>
       <arg type='b' name='reuse_existing' direction='in'/>
       <arg type='b' name='persistent' direction='in'/>
@@ -135,6 +136,7 @@
     -->
     <method name="AddFull">
       <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QList&lt;QDBusUnixFileDescriptor&gt;"/>
       <arg type='ah' name='o_path_fds' direction='in'/>
       <arg type='u' name='flags' direction='in'/>
       <arg type='s' name='app_id' direction='in'/>
@@ -258,6 +260,7 @@
     <method name="Info">
       <arg type='s' name='doc_id' direction='in'/>
       <arg type='ay' name='path' direction='out'/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QMap&lt;QString,QStringList&gt;"/>
       <arg type='a{sas}' name='apps' direction='out'/>
     </method>
 
@@ -273,6 +276,7 @@
     -->
     <method name="List">
       <arg type='s' name='app_id' direction='in'/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QMap&lt;QString,QByteArray&gt;"/>
       <arg type='a{say}' name='docs' direction='out'/>
     </method>
 
@@ -291,6 +295,7 @@
     -->
     <method name="GetHostPaths">
       <arg type='as' name='doc_ids' direction='in'/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QMap&lt;QString,QByteArray&gt;"/>
       <arg type='a{say}' name='paths' direction='out'/>
     </method>
   </interface>
diff --git a/data/org.freedesktop.portal.FileTransfer.xml b/data/org.freedesktop.portal.FileTransfer.xml
index 699b217ee..ff3cb58c6 100644
--- a/data/org.freedesktop.portal.FileTransfer.xml
+++ b/data/org.freedesktop.portal.FileTransfer.xml
@@ -105,6 +105,7 @@
     <method name="AddFiles">
       <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
       <arg type="s" name="key" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QList&lt;QDBusUnixFileDescriptor&gt;"/>
       <arg type="ah" name="fds" direction="in"/>
       <arg type="a{sv}" name="options" direction="in"/>
     </method>
diff --git a/data/org.freedesktop.portal.GlobalShortcuts.xml b/data/org.freedesktop.portal.GlobalShortcuts.xml
index 506269a2e..343c5d74f 100644
--- a/data/org.freedesktop.portal.GlobalShortcuts.xml
+++ b/data/org.freedesktop.portal.GlobalShortcuts.xml
@@ -141,12 +141,11 @@
     -->
     <method name="BindShortcuts">
       <arg type="o" name="session_handle" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QList&lt;QPair&lt;QString,QVariantMap&gt;&gt;"/>
       <arg type="a(sa{sv})" name="shortcuts" direction="in"/>
       <arg type="s" name="parent_window" direction="in"/>
       <arg type="a{sv}" name="options" direction="in"/>
       <arg type="o" name="request_handle" direction="out"/>
-
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QList&lt;QPair&lt;QString,QVariantMap&gt;&gt;"/>
     </method>
 
     <!--
@@ -226,8 +225,8 @@
     -->
     <signal name="ShortcutsChanged">
       <arg type="o" name="session_handle" direction="out"/>
-      <arg type="a(sa{sv})" name="shortcuts" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QList&lt;QPair&lt;QString,QVariantMap&gt;&gt;"/>
+      <arg type="a(sa{sv})" name="shortcuts" direction="out"/>
     </signal>
 
     <property name="version" type="u" access="read"/>
diff --git a/data/org.freedesktop.portal.InputCapture.xml b/data/org.freedesktop.portal.InputCapture.xml
index 890d09b5f..899dc47f0 100644
--- a/data/org.freedesktop.portal.InputCapture.xml
+++ b/data/org.freedesktop.portal.InputCapture.xml
@@ -251,6 +251,7 @@
     <method name="SetPointerBarriers">
       <arg type="o" name="session_handle" direction="in"/>
       <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QList&lt;QVariantMap&gt;"/>
       <arg type="aa{sv}" name="barriers" direction="in"/>
       <arg type="u" name="zone_set" direction="in"/>
       <arg type="o" name="handle" direction="out"/>
diff --git a/data/org.freedesktop.portal.Settings.xml b/data/org.freedesktop.portal.Settings.xml
index 861086da9..f10d456f1 100644
--- a/data/org.freedesktop.portal.Settings.xml
+++ b/data/org.freedesktop.portal.Settings.xml
@@ -76,6 +76,7 @@
     -->
     <method name='ReadAll'>
       <arg name='namespaces' type='as'/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QMap&lt;QString,QVariantMap&gt;"/>
       <arg name='value' direction='out' type='a{sa{sv}}'/>
     </method>