From af9e1e2b0c5c9d30b8f5f59843ac33eabf10efe4 Mon Sep 17 00:00:00 2001
From: Mark Doffman <mark.doffman@codethink.co.uk>
Date: Fri, 12 Feb 2010 02:25:46 -0800
Subject: [PATCH] Change the Qt names for AT-SPI structures.

---
 xml/Accessible.xml |  6 +++---
 xml/Cache.xml      |  2 +-
 xml/Collection.xml |  4 ++--
 xml/Component.xml  |  2 +-
 xml/Hyperlink.xml  |  2 +-
 xml/Hypertext.xml  |  2 +-
 xml/Selection.xml  |  2 +-
 xml/Socket.xml     |  8 ++++----
 xml/Table.xml      | 10 +++++-----
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/xml/Accessible.xml b/xml/Accessible.xml
index 5e41be9..c168430 100644
--- a/xml/Accessible.xml
+++ b/xml/Accessible.xml
@@ -7,7 +7,7 @@
   <property name="description" type="s" access="read"/>
 
   <property name="parent" type="(so)" access="read">
-    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiAccessibleObject"/>
   </property>
 
   <property name="childCount" type="i" access="read"/>
@@ -15,7 +15,7 @@
   <method name="GetChildAtIndex">
     <arg direction="in" name="index" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
   </method>
 
   <method name="GetIndexInParent">
@@ -51,7 +51,7 @@
 
   <method name="GetApplication">
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
   </method>
 
 </interface>
diff --git a/xml/Cache.xml b/xml/Cache.xml
index 6f79786..8b5315f 100644
--- a/xml/Cache.xml
+++ b/xml/Cache.xml
@@ -14,7 +14,7 @@
 
   <signal name="RemoveAccessible">
     <arg name="nodeRemoved" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleObject"/>
   </signal>
 
 </interface>
diff --git a/xml/Collection.xml b/xml/Collection.xml
index f4dca8a..75135a2 100644
--- a/xml/Collection.xml
+++ b/xml/Collection.xml
@@ -14,7 +14,7 @@
 
   <method name="GetMatchesTo">
     <arg direction="in" name="current_object" type="o"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleObject"/>
     <arg direction="in" name="rule" type="(auuasuauusub)"/>
     <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QSpiMatchRule"/>
     <arg direction="in" name="sortby" type="u"/>
@@ -28,7 +28,7 @@
 
   <method name="GetMatchesFrom">
     <arg direction="in" name="current_object" type="o"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleObject"/>
     <arg direction="in" name="rule" type="(auuasuauusub)"/>
     <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QSpiMatchRule"/>
     <arg direction="in" name="sortby" type="u"/>
diff --git a/xml/Component.xml b/xml/Component.xml
index 2e8f19d..494bf06 100644
--- a/xml/Component.xml
+++ b/xml/Component.xml
@@ -14,7 +14,7 @@
     <arg direction="in" name="y" type="i"/>
     <arg direction="in" name="coord_type" type="u"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
   </method>
 
   <method name="GetExtents">
diff --git a/xml/Hyperlink.xml b/xml/Hyperlink.xml
index d306894..0511c97 100644
--- a/xml/Hyperlink.xml
+++ b/xml/Hyperlink.xml
@@ -11,7 +11,7 @@
   <method name="GetObject">
     <arg direction="in" name="i" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
   </method>
 
   <method name="GetURI">
diff --git a/xml/Hypertext.xml b/xml/Hypertext.xml
index 18a3b34..7a57d9c 100644
--- a/xml/Hypertext.xml
+++ b/xml/Hypertext.xml
@@ -9,7 +9,7 @@
   <method name="GetLink">
     <arg direction="in" name="linkIndex" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
   </method>
 
   <method name="GetLinkIndex">
diff --git a/xml/Selection.xml b/xml/Selection.xml
index 32e55b8..46a6012 100644
--- a/xml/Selection.xml
+++ b/xml/Selection.xml
@@ -7,7 +7,7 @@
   <method name="GetSelectedChild">
     <arg direction="in" name="selectedChildIndex" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
   </method>
 
   <method name="SelectChild">
diff --git a/xml/Socket.xml b/xml/Socket.xml
index ae49e48..1dede11 100644
--- a/xml/Socket.xml
+++ b/xml/Socket.xml
@@ -4,22 +4,22 @@
 
   <method name="Embed">
     <arg direction="in" name="plug" type="(so)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleObject"/>
     </arg>
     <arg direction="out" name="socket" type="(so)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
     </arg>
   </method>
 
   <method name="Unembed">
     <arg direction="in" name="plug" type="(so)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleObject"/>
     </arg>
   </method>
 
   <signal name="Available">
     <arg direction="in" name="socket" type="(so)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleObject"/>
     </arg>
   </method>
 
diff --git a/xml/Table.xml b/xml/Table.xml
index b27df82..746252a 100644
--- a/xml/Table.xml
+++ b/xml/Table.xml
@@ -7,11 +7,11 @@
   <property name="nColumns" type="i" access="read"/>
 
   <property name="caption" type="(so)" access="read">
-    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiAccessibleObject"/>
   </property>
 
   <property name="summary" type="(so)" access="read">
-    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiAccessibleObject"/>
   </property>
 
   <property name="nSelectedRows" type="i" access="read"/>
@@ -22,7 +22,7 @@
     <arg direction="in" name="row" type="i"/>
     <arg direction="in" name="column" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
   </method>
 
   <method name="GetIndexAt">
@@ -66,13 +66,13 @@
   <method name="GetRowHeader">
     <arg direction="in" name="row" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
   </method>
 
   <method name="GetColumnHeader">
     <arg direction="in" name="column" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
   </method>
 
   <method name="GetSelectedRows">
-- 
2.7.4