From 38d4dcc576fea5b7b482825afe2c68729ab330e9 Mon Sep 17 00:00:00 2001
From: Mark Doffman <mark.doffman@codethink.co.uk>
Date: Sun, 9 May 2010 10:41:21 +0100
Subject: [PATCH] Modify the name of the Qt object generated by XML
 description.

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

diff --git a/xml/Accessible.xml b/xml/Accessible.xml
index c168430..f09f9fb 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="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiObjectReference"/>
   </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="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetIndexInParent">
@@ -46,12 +46,12 @@
 
   <method name="GetAttributes">
     <arg direction="out" type="a{ss}"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttributeArray"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
   </method>
 
   <method name="GetApplication">
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
 </interface>
diff --git a/xml/Cache.xml b/xml/Cache.xml
index 8b5315f..ad01bce 100644
--- a/xml/Cache.xml
+++ b/xml/Cache.xml
@@ -9,12 +9,12 @@
 
   <signal name="AddAccessible">
     <arg name="nodeAdded" type="((so)(so)a(so)assusau)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleCacheArray"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleCacheItem"/>
   </signal>
 
   <signal name="RemoveAccessible">
     <arg name="nodeRemoved" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
   </signal>
 
 </interface>
diff --git a/xml/Collection.xml b/xml/Collection.xml
index 75135a2..f4dca8a 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="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
     <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="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
     <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 494bf06..2e8f19d 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="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetExtents">
diff --git a/xml/Hyperlink.xml b/xml/Hyperlink.xml
index 0511c97..d306894 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="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetURI">
diff --git a/xml/Hypertext.xml b/xml/Hypertext.xml
index 7a57d9c..18a3b34 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="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetLinkIndex">
diff --git a/xml/Selection.xml b/xml/Selection.xml
index 46a6012..32e55b8 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="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="SelectChild">
diff --git a/xml/Socket.xml b/xml/Socket.xml
index 1dede11..5f9367e 100644
--- a/xml/Socket.xml
+++ b/xml/Socket.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/node">
-<interface name="org.a11y.atspi.Image">
+<interface name="org.a11y.atspi.Socket">
 
   <method name="Embed">
     <arg direction="in" name="plug" type="(so)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleObject"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
     </arg>
     <arg direction="out" name="socket" type="(so)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
     </arg>
   </method>
 
   <method name="Unembed">
     <arg direction="in" name="plug" type="(so)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleObject"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
     </arg>
   </method>
 
   <signal name="Available">
     <arg direction="in" name="socket" type="(so)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleObject"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
     </arg>
   </method>
 
diff --git a/xml/Table.xml b/xml/Table.xml
index 746252a..b27df82 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="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiObjectReference"/>
   </property>
 
   <property name="summary" type="(so)" access="read">
-    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiObjectReference"/>
   </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="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </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="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetColumnHeader">
     <arg direction="in" name="column" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleObject"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetSelectedRows">
diff --git a/xml/Text.xml b/xml/Text.xml
index 097e1d9..a88fbe3 100644
--- a/xml/Text.xml
+++ b/xml/Text.xml
@@ -60,12 +60,12 @@
     <arg direction="out" type="a{ss}"/>
     <arg direction="out" name="startOffset" type="i"/>
     <arg direction="out" name="endOffset" type="i"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttributeArray"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
   </method>
 
   <method name="GetDefaultAttributes">
     <arg direction="out" type="a{ss}"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttributeArray"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
   </method>
 
   <method name="GetCharacterExtents">
@@ -140,7 +140,7 @@
     <arg direction="out" type="a{ss}"/>
     <arg direction="out" name="startOffset" type="i"/>
     <arg direction="out" name="endOffset" type="i"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttributeArray"/>
+    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
   </method>
 
   <method name="GetDefaultAttributeSet">
-- 
2.7.4