"Unfixed" some things :-). cleaned up and made some of the namespace changes more...

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

diff --git a/cspi/spi_text.c b/cspi/spi_text.c
index 2922abb..8d15f57 100644 (file)
--- a/cspi/spi_text.c
+++ b/cspi/spi_text.c
@@ -1,29 +1,29 @@
 int
-SpiAccessibleText_ref (SpiAccessibleText *obj)
+AccessibleText_ref (AccessibleText *obj)
 {
-  Accessibility_SpiText_ref (*obj, &ev);
+  Accessibility_Text_ref (*obj, &ev);
   return 0;
 }
 
 
 
 int
-SpiAccessibleText_unref (SpiAccessibleText *obj)
+AccessibleText_unref (AccessibleText *obj)
 {
-  Accessibility_SpiText_unref (*obj, &ev);
+  Accessibility_Text_unref (*obj, &ev);
   return 0;
 }
 
 
 
 long
-SpiAccessibleText_getCharacterCount (SpiAccessibleText *obj)
+AccessibleText_getCharacterCount (AccessibleText *obj)
 {
   long retval;
 
   CORBA_exception_init (&ev);
   retval = (long)
-    Accessibility_SpiText__get_characterCount (*obj, &ev);
+    Accessibility_Text__get_characterCount (*obj, &ev);
 
   spi_check_ev (&ev, "SpiAccessibleText_getCharacterCount");
 
@@ -33,12 +33,12 @@ SpiAccessibleText_getCharacterCount (SpiAccessibleText *obj)
 
 
 char *
-SpiAccessibleText_getText (SpiAccessibleText *obj,
+AccessibleText_getText (AccessibleText *obj,
                         long startOffset,
                         long endOffset)
 {
   return (char *)
-    Accessibility_SpiText_getText (*obj,
+    Accessibility_Text_getText (*obj,
                                (CORBA_long) startOffset, (CORBA_long) endOffset, &ev);
 }
 
@@ -46,24 +46,24 @@ SpiAccessibleText_getText (SpiAccessibleText *obj,
 
 
 long
-SpiAccessibleText_getCaretOffset (SpiAccessibleText *obj)
+AccessibleText_getCaretOffset (AccessibleText *obj)
 {
   return (long)
-    Accessibility_SpiText__get_caretOffset (*obj, &ev);
+    Accessibility_Text__get_caretOffset (*obj, &ev);
 }
 
 
 
 char *
-SpiAccessibleText_getAttributes (SpiAccessibleText *obj,
-                                long offset,
-                                long *startOffset,
-                                long *endOffset)
+AccessibleText_getAttributes (AccessibleText *obj,
+                             long offset,
+                             long *startOffset,
+                             long *endOffset)
 {
   CORBA_long retStartOffset, retEndOffset;
   char *retval;        
   retval = (char *)
-    Accessibility_SpiText_getAttributes (*obj,
+    Accessibility_Text_getAttributes (*obj,
                                      (CORBA_long) offset,
                                      &retStartOffset,
                                      &retEndOffset,
@@ -76,26 +76,26 @@ SpiAccessibleText_getAttributes (SpiAccessibleText *obj,
 
 
 boolean
-SpiAccessibleText_setCaretOffset (SpiAccessibleText *obj,
+AccessibleText_setCaretOffset (AccessibleText *obj,
                                long newOffset)
 {
   return (boolean)
-    Accessibility_SpiText_setCaretOffset (*obj,
+    Accessibility_Text_setCaretOffset (*obj,
                                       (CORBA_long) newOffset, &ev);
 }
 
 
 
 char *
-SpiAccessibleText_getTextBeforeOffset (SpiAccessibleText *obj,
+AccessibleText_getTextBeforeOffset (AccessibleText *obj,
                                     long offset,
-                                    SPI_TEXT_BOUNDARY_TYPE type,
+                                    AccessibleTextBoundaryType type,
                                    long *startOffset, long *endOffset)
 {
   char *retval;
   CORBA_long retStartOffset, retEndOffset;
   retval = (char *)
-    Accessibility_SpiText_getTextBeforeOffset (*obj,
+    Accessibility_Text_getTextBeforeOffset (*obj,
                                           (CORBA_long) offset, (Accessibility_TEXT_BOUNDARY_TYPE) type,
                                           &retStartOffset, &retEndOffset,
                                           &ev);
@@ -107,15 +107,15 @@ SpiAccessibleText_getTextBeforeOffset (SpiAccessibleText *obj,
 
 
 char *
-SpiAccessibleText_getTextAtOffset (SpiAccessibleText *obj,
+AccessibleText_getTextAtOffset (AccessibleText *obj,
                                long offset,
-                               SPI_TEXT_BOUNDARY_TYPE type,
+                               AccessibleTextBoundaryType type,
                                long *startOffset, long *endOffset)
 {
   CORBA_long corbaStartOffset;
   CORBA_long corbaEndOffset;
   char *retval = "";
-  retval = Accessibility_SpiText_getTextAtOffset (*obj,
+  retval = Accessibility_Text_getTextAtOffset (*obj,
                                               (CORBA_long) offset,
                                               (Accessibility_TEXT_BOUNDARY_TYPE) type,
                                               &corbaStartOffset,
@@ -132,15 +132,15 @@ SpiAccessibleText_getTextAtOffset (SpiAccessibleText *obj,
 
 
 char *
-SpiAccessibleText_getTextAfterOffset (SpiAccessibleText *obj,
-                                    long offset,
-                                    SPI_TEXT_BOUNDARY_TYPE type,
-                                   long *startOffset, long *endOffset)
+AccessibleText_getTextAfterOffset (AccessibleText *obj,
+                                  long offset,
+                                  AccessibleTextBoundaryType type,
+                                  long *startOffset, long *endOffset)
 {
   char *retval;
   CORBA_long retStartOffset, retEndOffset;
   retval = (char *)
-    Accessibility_SpiText_getTextAfterOffset (*obj,
+    Accessibility_Text_getTextAfterOffset (*obj,
                                           (CORBA_long) offset, (Accessibility_TEXT_BOUNDARY_TYPE) type,
                                           &retStartOffset, &retEndOffset,
                                           &ev);
@@ -152,27 +152,27 @@ SpiAccessibleText_getTextAfterOffset (SpiAccessibleText *obj,
 
 
 unsigned long
-SpiAccessibleText_getCharacterAtOffset (SpiAccessibleText *obj,
+AccessibleText_getCharacterAtOffset (AccessibleText *obj,
                                      long offset)
 {
   return (unsigned long)
-    Accessibility_SpiText_getCharacterAtOffset (*obj,
+    Accessibility_Text_getCharacterAtOffset (*obj,
                                             (CORBA_long) offset, &ev);
 }
 
 
 
 void
-SpiAccessibleText_getCharacterExtents (SpiAccessibleText *obj,
+AccessibleText_getCharacterExtents (AccessibleText *obj,
                                     long offset,
                                     long *x,
                                     long *y,
                                     long *width,
                                     long *height,
-                                   SpiAccessibleCoordType type)
+                                   AccessibleCoordType type)
 {
   CORBA_long retX, retY, retWidth, retHeight;
-  Accessibility_SpiText_getCharacterExtents (*obj,
+  Accessibility_Text_getCharacterExtents (*obj,
                                          (CORBA_long) offset,
                                          &retX,
                                          &retY,
@@ -188,34 +188,33 @@ SpiAccessibleText_getCharacterExtents (SpiAccessibleText *obj,
 
 
 long
-SpiAccessibleText_getOffsetAtPoint (SpiAccessibleText *obj,
+AccessibleText_getOffsetAtPoint (AccessibleText *obj,
                                  long x,
                                  long y,
-                                SpiAccessibleCoordType type)
+                                AccessibleCoordType type)
 {
   return (long)
-    Accessibility_SpiText_getOffsetAtPoint (*obj,
+    Accessibility_Text_getOffsetAtPoint (*obj,
                                         (CORBA_long) x, (CORBA_long) y, (CORBA_short) type, &ev);
 }
 
 
-
 long
-SpiAccessibleText_getNSpiSelections (SpiAccessibleText *obj)
+AccessibleText_getNSelections (AccessibleText *obj)
 {
   return (long)
-    Accessibility_SpiText_getNSpiSelections (*obj, &ev);
+    Accessibility_Text_getNSelections (*obj, &ev);
 }
 
 
 
 void
-SpiAccessibleText_getSelection (SpiAccessibleText *obj,
+AccessibleText_getSelection (AccessibleText *obj,
                             long selectionNum, long *startOffset,
                             long *endOffset)
 {
   CORBA_long retStartOffset, retEndOffset;
-  Accessibility_SpiText_getSelection (*obj,
+  Accessibility_Text_getSelection (*obj,
                                   (CORBA_long) selectionNum,
                                   &retStartOffset, &retEndOffset, &ev);
   
@@ -226,36 +225,35 @@ SpiAccessibleText_getSelection (SpiAccessibleText *obj,
 
 
 boolean
-SpiAccessibleText_addSpiSelection (SpiAccessibleText *obj,
+AccessibleText_addSelection (AccessibleText *obj,
                             long startOffset, long endOffset)
 {
   return (boolean)
-    Accessibility_SpiText_addSpiSelection (*obj,
+    Accessibility_Text_addSelection (*obj,
                                     (CORBA_long) startOffset, (CORBA_long) endOffset,
                                     &ev);
 }
 
 
-
 boolean
-SpiAccessibleText_removeSelection (SpiAccessibleText *obj,
+AccessibleText_removeSelection (AccessibleText *obj,
                                long selectionNum)
 {
   return (boolean)
-    Accessibility_SpiText_removeSelection (*obj,
+    Accessibility_Text_removeSelection (*obj,
                                        (CORBA_long) selectionNum, &ev);
 }
 
 
 
 boolean
-SpiAccessibleText_setSelection (SpiAccessibleText *obj,
+AccessibleText_setSelection (AccessibleText *obj,
                             long selectionNum,
                             long startOffset,
                             long endOffset)
 {
   return (boolean)
-    Accessibility_SpiText_setSelection (*obj,
+    Accessibility_Text_setSelection (*obj,
                                     (CORBA_long) selectionNum,
                                     (CORBA_long) startOffset,
                                     (CORBA_long) endOffset, &ev);