Add .gbs.conf to track remote git properly

[platform/upstream/atk.git] / atk / atktable.h

diff --git a/atk/atktable.h b/atk/atktable.h
index 909b508..8aace1f 100755 (executable)
--- a/atk/atktable.h
+++ b/atk/atktable.h
@@ -28,12 +28,6 @@
 
 G_BEGIN_DECLS
 
-/*
- * AtkTable describes a user-interface component that presents data in
- * two-dimensional table format.
- */
-
-
 #define ATK_TYPE_TABLE                    (atk_table_get_type ())
 #define ATK_IS_TABLE(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TABLE)
 #define ATK_TABLE(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_TABLE, AtkTable)
@@ -69,13 +63,11 @@ struct _AtkTableIface
                                                   gint          column);
   AtkObject*
                     (* get_caption)              (AtkTable      *table);
-  G_CONST_RETURN gchar*
-                    (* get_column_description)   (AtkTable      *table,
+  const gchar*      (* get_column_description)   (AtkTable      *table,
                                                   gint          column);
   AtkObject*        (* get_column_header)        (AtkTable      *table,
                                                  gint          column);
-  G_CONST_RETURN gchar*
-                    (* get_row_description)      (AtkTable      *table,
+  const gchar*      (* get_row_description)      (AtkTable      *table,
                                                   gint          row);
   AtkObject*        (* get_row_header)           (AtkTable      *table,
                                                  gint          row);
@@ -134,11 +126,6 @@ struct _AtkTableIface
   void              (* row_reordered)            (AtkTable      *table);
   void              (* column_reordered)         (AtkTable      *table);
   void              (* model_changed)            (AtkTable      *table);
-
-  AtkFunction       pad1;
-  AtkFunction       pad2;
-  AtkFunction       pad3;
-  AtkFunction       pad4;
 };
 
 GType atk_table_get_type (void);
@@ -146,11 +133,14 @@ GType atk_table_get_type (void);
 AtkObject*        atk_table_ref_at               (AtkTable         *table,
                                                   gint             row,
                                                   gint             column);
+G_DEPRECATED_FOR(atk_table_ref_at)
 gint              atk_table_get_index_at         (AtkTable         *table,
                                                   gint             row,
                                                   gint             column);
+G_DEPRECATED
 gint              atk_table_get_column_at_index  (AtkTable         *table,
                                                   gint             index_);
+G_DEPRECATED
 gint              atk_table_get_row_at_index     (AtkTable         *table,
                                                   gint             index_);
 gint              atk_table_get_n_columns        (AtkTable         *table);
@@ -163,13 +153,12 @@ gint              atk_table_get_row_extent_at    (AtkTable         *table,
                                                   gint             column);
 AtkObject*
                   atk_table_get_caption          (AtkTable         *table);
-G_CONST_RETURN gchar*
-                  atk_table_get_column_description (AtkTable         *table,
+const gchar*      atk_table_get_column_description
+                                                 (AtkTable         *table,
                                                   gint             column);
 AtkObject*        atk_table_get_column_header    (AtkTable         *table,
                                                  gint             column);
-G_CONST_RETURN gchar*
-                  atk_table_get_row_description  (AtkTable         *table,
+const gchar*      atk_table_get_row_description  (AtkTable         *table,
                                                   gint             row);
 AtkObject*        atk_table_get_row_header       (AtkTable         *table,
                                                  gint             row);