GNOME.org
 

[java-atk-wrapper] Share declarations

commit 72080b4d597ccfb628b57550ac673f1f40abde7a
Author: Samuel Thibault <samuel thibault ens-lyon org>
Date:   Sat Jun 1 20:23:48 2019 +0200

    Share declarations

 jni/src/jawaction.c       |  4 ----
 jni/src/jawcomponent.c    |  4 ----
 jni/src/jaweditabletext.c |  4 ----
 jni/src/jawhypertext.c    |  4 ----
 jni/src/jawimage.c        |  4 ----
 jni/src/jawimpl.c         | 40 ----------------------------------------
 jni/src/jawimpl.h         | 40 ++++++++++++++++++++++++++++++++++++++++
 jni/src/jawselection.c    |  4 ----
 jni/src/jawtable.c        |  4 ----
 jni/src/jawtablecell.c    |  4 ----
 jni/src/jawtext.c         |  4 ----
 jni/src/jawvalue.c        |  4 ----
 12 files changed, 40 insertions(+), 80 deletions(-)
---
diff --git a/jni/src/jawaction.c b/jni/src/jawaction.c
index 2ebeeee..7c963da 100644
--- a/jni/src/jawaction.c
+++ b/jni/src/jawaction.c
@@ -22,10 +22,6 @@
 #include "jawimpl.h"
 #include "jawutil.h"
 
-extern void    jaw_action_interface_init (AtkActionIface*);
-extern gpointer        jaw_action_data_init (jobject ac);
-extern void    jaw_action_data_finalize (gpointer);
-
 static gboolean jaw_action_do_action(AtkAction *action, gint i);
 static gint jaw_action_get_n_actions(AtkAction *action);
 static const gchar* jaw_action_get_description(AtkAction *action, gint i);
diff --git a/jni/src/jawcomponent.c b/jni/src/jawcomponent.c
index 1879cdd..9a23f7b 100644
--- a/jni/src/jawcomponent.c
+++ b/jni/src/jawcomponent.c
@@ -24,10 +24,6 @@
 #include "jawimpl.h"
 #include "jawutil.h"
 
-extern void jaw_component_interface_init(AtkComponentIface*);
-extern gpointer jaw_component_data_init(jobject);
-extern void jaw_component_data_finalize(gpointer);
-
 static gboolean jaw_component_contains(AtkComponent *component,
                                        gint         x,
                                        gint         y,
diff --git a/jni/src/jaweditabletext.c b/jni/src/jaweditabletext.c
index 6658a24..bf11bcf 100644
--- a/jni/src/jaweditabletext.c
+++ b/jni/src/jaweditabletext.c
@@ -23,10 +23,6 @@
 #include "jawutil.h"
 #include "jawobject.h"
 
-extern void jaw_editable_text_interface_init(AtkEditableTextIface*);
-extern gpointer jaw_editable_text_data_init(jobject);
-extern void jaw_editable_text_data_finalize(gpointer);
-
 static void jaw_editable_text_set_text_contents(AtkEditableText *text,
                                                 const gchar *string);
 static void jaw_editable_text_insert_text(AtkEditableText *text,
diff --git a/jni/src/jawhypertext.c b/jni/src/jawhypertext.c
index 9ab9040..5d9ed31 100644
--- a/jni/src/jawhypertext.c
+++ b/jni/src/jawhypertext.c
@@ -23,10 +23,6 @@
 #include "jawutil.h"
 #include "jawhyperlink.h"
 
-extern void    jaw_hypertext_interface_init    (AtkHypertextIface*);
-extern gpointer        jaw_hypertext_data_init         (jobject);
-extern void    jaw_hypertext_data_finalize     (gpointer);
-
 static AtkHyperlink*           jaw_hypertext_get_link          (AtkHypertext *hypertext,
                                                                 gint link_index);
 static gint                    jaw_hypertext_get_n_links       (AtkHypertext *hypertext);
diff --git a/jni/src/jawimage.c b/jni/src/jawimage.c
index e7425fe..069cdb3 100644
--- a/jni/src/jawimage.c
+++ b/jni/src/jawimage.c
@@ -22,10 +22,6 @@
 #include "jawimpl.h"
 #include "jawutil.h"
 
-extern void    jaw_image_interface_init (AtkImageIface*);
-extern gpointer        jaw_image_data_init (jobject ac);
-extern void    jaw_image_data_finalize (gpointer);
-
 static void                    jaw_image_get_image_position            (AtkImage       *image,
                                                                         gint           *x,
                                                                         gint           *y,
diff --git a/jni/src/jawimpl.c b/jni/src/jawimpl.c
index f2f19fa..943d73d 100644
--- a/jni/src/jawimpl.c
+++ b/jni/src/jawimpl.c
@@ -45,46 +45,6 @@ static AtkObject* jaw_impl_get_parent(AtkObject *atk_obj);
 static AtkObject* jaw_impl_ref_child (AtkObject *atk_obj, gint i);
 static AtkRelationSet* jaw_impl_ref_relation_set(AtkObject *atk_obj);
 
-extern void jaw_action_interface_init(AtkActionIface*);
-extern gpointer jaw_action_data_init(jobject);
-extern void jaw_action_data_finalize(gpointer);
-
-extern void jaw_component_interface_init(AtkComponentIface*);
-extern gpointer jaw_component_data_init(jobject);
-extern void jaw_component_data_finalize(gpointer);
-
-extern void jaw_text_interface_init(AtkTextIface*);
-extern gpointer        jaw_text_data_init(jobject);
-extern void jaw_text_data_finalize(gpointer);
-
-extern void jaw_editable_text_interface_init(AtkEditableTextIface*);
-extern gpointer jaw_editable_text_data_init(jobject);
-extern void jaw_editable_text_data_finalize (gpointer);
-
-extern void jaw_hypertext_interface_init(AtkHypertextIface*);
-extern gpointer jaw_hypertext_data_init(jobject);
-extern void jaw_hypertext_data_finalize(gpointer);
-
-extern void jaw_image_interface_init(AtkImageIface*);
-extern gpointer jaw_image_data_init(jobject);
-extern void jaw_image_data_finalize(gpointer);
-
-extern void jaw_selection_interface_init(AtkSelectionIface*);
-extern gpointer jaw_selection_data_init(jobject);
-extern void jaw_selection_data_finalize(gpointer);
-
-extern void jaw_value_interface_init (AtkValueIface*);
-extern gpointer jaw_value_data_init (jobject);
-extern void jaw_value_data_finalize (gpointer);
-
-extern void jaw_table_interface_init (AtkTableIface*);
-extern gpointer jaw_table_data_init (jobject);
-extern void jaw_table_data_finalize (gpointer);
-
-extern void jaw_table_cell_interface_init (AtkTableCellIface*);
-extern gpointer jaw_table_cell_data_init (jobject);
-extern void jaw_table_cell_data_finalize (gpointer);
-
 typedef struct _JawInterfaceInfo {
   void (*finalize) (gpointer);
   gpointer data;
diff --git a/jni/src/jawimpl.h b/jni/src/jawimpl.h
index 818c06c..fbbf207 100644
--- a/jni/src/jawimpl.h
+++ b/jni/src/jawimpl.h
@@ -64,6 +64,46 @@ struct _JawImplClass
        JawObjectClass parent_class;
 };
 
+extern void jaw_action_interface_init(AtkActionIface*);
+extern gpointer jaw_action_data_init(jobject);
+extern void jaw_action_data_finalize(gpointer);
+
+extern void jaw_component_interface_init(AtkComponentIface*);
+extern gpointer jaw_component_data_init(jobject);
+extern void jaw_component_data_finalize(gpointer);
+
+extern void jaw_editable_text_interface_init(AtkEditableTextIface*);
+extern gpointer jaw_editable_text_data_init(jobject);
+extern void jaw_editable_text_data_finalize (gpointer);
+
+extern void jaw_hypertext_interface_init(AtkHypertextIface*);
+extern gpointer jaw_hypertext_data_init(jobject);
+extern void jaw_hypertext_data_finalize(gpointer);
+
+extern void jaw_image_interface_init(AtkImageIface*);
+extern gpointer jaw_image_data_init(jobject);
+extern void jaw_image_data_finalize(gpointer);
+
+extern void jaw_selection_interface_init(AtkSelectionIface*);
+extern gpointer jaw_selection_data_init(jobject);
+extern void jaw_selection_data_finalize(gpointer);
+
+extern void jaw_table_interface_init (AtkTableIface*);
+extern gpointer jaw_table_data_init (jobject);
+extern void jaw_table_data_finalize (gpointer);
+
+extern void jaw_table_cell_interface_init (AtkTableCellIface*);
+extern gpointer jaw_table_cell_data_init (jobject ac);
+extern void jaw_table_cell_data_finalize (gpointer);
+
+extern void jaw_text_interface_init(AtkTextIface*);
+extern gpointer        jaw_text_data_init(jobject);
+extern void jaw_text_data_finalize(gpointer);
+
+extern void jaw_value_interface_init (AtkValueIface*);
+extern gpointer jaw_value_data_init (jobject);
+extern void jaw_value_data_finalize (gpointer);
+
 G_END_DECLS
 
 #endif
diff --git a/jni/src/jawselection.c b/jni/src/jawselection.c
index e882b50..55f9605 100644
--- a/jni/src/jawselection.c
+++ b/jni/src/jawselection.c
@@ -22,10 +22,6 @@
 #include "jawimpl.h"
 #include "jawutil.h"
 
-extern void    jaw_selection_interface_init (AtkSelectionIface*);
-extern gpointer        jaw_selection_data_init (jobject ac);
-extern void    jaw_selection_data_finalize (gpointer);
-
 static gboolean                        jaw_selection_add_selection             (AtkSelection   *selection,
                                                                         gint           i);
 static gboolean                        jaw_selection_clear_selection           (AtkSelection   *selection);
diff --git a/jni/src/jawtable.c b/jni/src/jawtable.c
index 5fc6c32..09220ff 100644
--- a/jni/src/jawtable.c
+++ b/jni/src/jawtable.c
@@ -23,10 +23,6 @@
 #include "jawimpl.h"
 #include "jawutil.h"
 
-extern void jaw_table_interface_init (AtkTableIface*);
-extern gpointer jaw_table_data_init (jobject ac);
-extern void jaw_table_data_finalize (gpointer);
-
 static AtkObject*   jaw_table_ref_at(AtkTable *table, gint row, gint column);
 static gint         jaw_table_get_column_at_index(AtkTable *table, gint index);
 static gint         jaw_table_get_row_at_index(AtkTable *table, gint index);
diff --git a/jni/src/jawtablecell.c b/jni/src/jawtablecell.c
index db67e4d..9de18c8 100644
--- a/jni/src/jawtablecell.c
+++ b/jni/src/jawtablecell.c
@@ -22,10 +22,6 @@
 #include "jawimpl.h"
 #include "jawutil.h"
 
-extern void jaw_table_cell_interface_init (AtkTableCellIface*);
-extern gpointer jaw_table_cell_data_init (jobject ac);
-extern void jaw_table_cell_data_finalize (gpointer);
-
 static AtkObject *jaw_table_cell_get_table (AtkTableCell *cell);
 static gboolean jaw_table_cell_get_position(AtkTableCell *cell, gint *row, gint *column);
 static gboolean jaw_table_cell_get_row_column_span(AtkTableCell *cell,
diff --git a/jni/src/jawtext.c b/jni/src/jawtext.c
index d7d4c25..60e31d0 100644
--- a/jni/src/jawtext.c
+++ b/jni/src/jawtext.c
@@ -22,10 +22,6 @@
 #include "jawimpl.h"
 #include "jawutil.h"
 
-extern void jaw_text_interface_init(AtkTextIface*);
-extern gpointer jaw_text_data_init(jobject);
-extern void jaw_text_data_finalize(gpointer);
-
 static gchar* jaw_text_get_text(AtkText *text,
                                 gint start_offset,
                                 gint end_offset);
diff --git a/jni/src/jawvalue.c b/jni/src/jawvalue.c
index ef36a6d..4cc86c2 100644
--- a/jni/src/jawvalue.c
+++ b/jni/src/jawvalue.c
@@ -27,10 +27,6 @@
 extern "C" {
 #endif
 
-extern void    jaw_value_interface_init (AtkValueIface*);
-extern gpointer        jaw_value_data_init (jobject ac);
-extern void    jaw_value_data_finalize (gpointer);
-
 static void jaw_value_get_current_value(AtkValue *obj, GValue *value);
 static void    jaw_value_set_value(AtkValue *obj, const gdouble value);
 static gdouble jaw_value_get_increment (AtkValue *obj);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]