Changed IDL for State, Component, and Image to reduce use of out params.

[platform/core/uifw/at-spi2-atk.git] / cspi / spi_editabletext.c

diff --git a/cspi/spi_editabletext.c b/cspi/spi_editabletext.c
index e64bf2d..23b973e 100644 (file)
--- a/cspi/spi_editabletext.c
+++ b/cspi/spi_editabletext.c
@@ -1,3 +1,5 @@
+#include <cspi/spi-private.h>
+
 /**
  * AccessibleEditableText_ref:
  * @obj: a pointer to the #AccessibleEditableText object on which to operate.
@@ -12,14 +14,14 @@
 int
 AccessibleEditableText_ref (AccessibleEditableText *obj)
 {
-  Accessibility_EditableText_ref (*obj, &ev);
+  cspi_object_ref (obj);
   return 0;
 }
 
 
 
 /**
- * AccessibleEditableText_ref:
+ * AccessibleEditableText_unref:
  * @obj: a pointer to the #AccessibleEditableText object on which to operate.
  *
  * Decrement the reference count for an #AccessibleEdiitableText object.
@@ -32,7 +34,7 @@ AccessibleEditableText_ref (AccessibleEditableText *obj)
 int
 AccessibleEditableText_unref (AccessibleEditableText *obj)
 {
-  Accessibility_EditableText_unref (*obj, &ev);
+  cspi_object_unref (obj);
   return 0;
 }
 
@@ -41,6 +43,8 @@ AccessibleEditableText_unref (AccessibleEditableText *obj)
 /**
  * AccessibleEditableText_setAttributes:
  * @obj: a pointer to the #AccessibleEditableText object to modify.
+ * @attributes: a character string indicating the attributes to apply to the range,
+ *        delimited by ':'.
  * @startOffset: a #long indicating the start of the desired text range.
  * @endOffset: a #long indicating the first character past the desired range.
  *
@@ -50,17 +54,17 @@ AccessibleEditableText_unref (AccessibleEditableText *obj)
  * Returns: #TRUE if the operation was successful, otherwise #FALSE.
  *
  **/
-boolean
+SPIBoolean
 AccessibleEditableText_setAttributes (AccessibleEditableText *obj,
                                      const char *attributes,
                                      long int startPos,
                                      long int endPos)
 {
-  return (boolean)
-    Accessibility_EditableText_setAttributes (*obj,
+  return (SPIBoolean)
+    Accessibility_EditableText_setAttributes (CSPI_OBJREF (obj),
                                              (CORBA_char *) attributes,
                                              (CORBA_long) startPos,
-                                             (CORBA_long) endPos, &ev);
+                                             (CORBA_long) endPos, cspi_ev ());
 }
 
 
@@ -76,12 +80,12 @@ AccessibleEditableText_setAttributes (AccessibleEditableText *obj,
  * Returns: #TRUE if the operation was successful, otherwise #FALSE.
  *
  **/
-boolean
+SPIBoolean
 AccessibleEditableText_setTextContents (AccessibleEditableText *obj,
                                         const char *newContents)
 {
-  Accessibility_EditableText_setTextContents (*obj,
-                                             (CORBA_char *) newContents, &ev);
+  Accessibility_EditableText_setTextContents (CSPI_OBJREF (obj),
+                                             (CORBA_char *) newContents, cspi_ev ());
   return TRUE; /* TODO: make bonobo method return a boolean */
 }
 
@@ -103,15 +107,15 @@ AccessibleEditableText_setTextContents (AccessibleEditableText *obj,
  * Returns: #TRUE if the operation was successful, otherwise #FALSE.
  *
  **/
-boolean
+SPIBoolean
 AccessibleEditableText_insertText (AccessibleEditableText *obj,
                                    long int position,
                                    char *text,
                                    long int length)
 {
-  Accessibility_EditableText_insertText (*obj,
+  Accessibility_EditableText_insertText (CSPI_OBJREF (obj),
                                         (CORBA_long) position, (CORBA_char *) text,
-                                        (CORBA_long) length, &ev);
+                                        (CORBA_long) length, cspi_ev ());
   return TRUE;
 }
 
@@ -132,13 +136,13 @@ AccessibleEditableText_insertText (AccessibleEditableText *obj,
  * Returns: #TRUE if the operation was successful, otherwise #FALSE.
  *
  **/
-boolean
+SPIBoolean
 AccessibleEditableText_copyText (AccessibleText *obj,
                                  long int startPos,
                                  long int endPos)
 {
-  Accessibility_EditableText_copyText (*obj,
-                                      (CORBA_long) startPos, (CORBA_long) endPos, &ev);
+  Accessibility_EditableText_copyText (CSPI_OBJREF (obj),
+                                      (CORBA_long) startPos, (CORBA_long) endPos, cspi_ev ());
   return TRUE;
 }
 
@@ -159,13 +163,13 @@ AccessibleEditableText_copyText (AccessibleText *obj,
  * Returns: #TRUE if operation was successful, #FALSE otherwise.
  *
  **/
-boolean
+SPIBoolean
 AccessibleEditableText_cutText (AccessibleEditableText *obj,
                                 long int startPos,
                                 long int endPos)
 {
-  Accessibility_EditableText_cutText (*obj,
-                                      (CORBA_long) startPos, (CORBA_long) endPos, &ev);
+  Accessibility_EditableText_cutText (CSPI_OBJREF (obj),
+                                      (CORBA_long) startPos, (CORBA_long) endPos, cspi_ev ());
   return TRUE;
 }
 
@@ -187,13 +191,13 @@ AccessibleEditableText_cutText (AccessibleEditableText *obj,
  * Returns: #TRUE if the operation was successful, otherwise #FALSE.
  *
  **/
-boolean
+SPIBoolean
 AccessibleEditableText_deleteText (AccessibleEditableText *obj,
                                    long startPos,
                                    long endPos)
 {
-  Accessibility_EditableText_deleteText (*obj,
-                                      (CORBA_long) startPos, (CORBA_long) endPos, &ev);
+  Accessibility_EditableText_deleteText (CSPI_OBJREF (obj),
+                                      (CORBA_long) startPos, (CORBA_long) endPos, cspi_ev ());
   return TRUE;
 }
 
@@ -213,12 +217,12 @@ AccessibleEditableText_deleteText (AccessibleEditableText *obj,
  * Returns: #TRUE if the operation was successful, otherwise #FALSE.
  *
  **/
-boolean
+SPIBoolean
 AccessibleEditableText_pasteText (AccessibleEditableText *obj,
                                   long int position)
 {
-  Accessibility_EditableText_pasteText (*obj,
-                                       (CORBA_long) position, &ev);
+  Accessibility_EditableText_pasteText (CSPI_OBJREF (obj),
+                                       (CORBA_long) position, cspi_ev ());
   return TRUE;
 }