gobject-introspection 2.2.0-x86-mingw32 → 2.2.1-x86-mingw32

data/vendor/local/share/gobject-introspection-1.0/tests/annotation.c

@@ -1,4 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+#include "config.h"
+
 #include "annotation.h"
 
 char backslash_parsing_tester = '\\';
@@ -128,12 +130,12 @@ regress_annotation_object_class_init (RegressAnnotationObjectClass *klass)
   /**
    * RegressAnnotationObject::attribute-signal:
    * @regress_annotation: the regress_annotation object
-   * @arg1: (attribute some.annotation.foo1 val1): a value
-   * @arg2: (attribute some.annotation.foo2 val2): another value
+   * @arg1: (attributes some.annotation.foo1=val1): a value
+   * @arg2: (attributes some.annotation.foo2=val2): another value
    *
    * This signal tests a signal with attributes.
    *
-   * Returns: (attribute some.annotation.foo3 val3): the return value
+   * Returns: (attributes some.annotation.foo3=val3): the return value
    */
   regress_annotation_object_signals[ATTRIBUTE_SIGNAL] =
     g_signal_new ("attribute-signal",
@@ -163,9 +165,7 @@ regress_annotation_object_class_init (RegressAnnotationObjectClass *klass)
                                                         NULL,
                                                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   /**
-   * RegressAnnotationObject:function-property:
-   *
-   * Type: RegressAnnotationCallback
+   * RegressAnnotationObject:function-property: (type RegressAnnotationCallback)
    */
   g_object_class_install_property (gobject_class,
                                    PROP_FUNCTION_PROPERTY,
@@ -616,15 +616,13 @@ regress_annotation_object_watch (RegressAnnotationObject *object,
 }
 
 /**
- * regress_annotation_object_watch_full:
+ * regress_annotation_object_watch_full: (rename-to regress_annotation_object_watch)
  * @object: A #RegressAnnotationObject
  * @func: The callback
  * @user_data: The callback data
  * @destroy: Destroy notification
  *
  * Test overriding via the "Rename To" annotation.
- *
- * Rename to: regress_annotation_object_watch
  */
 void
 regress_annotation_object_watch_full (RegressAnnotationObject *object,
@@ -707,9 +705,7 @@ regress_annotation_string_array_length (guint n_properties, const gchar * const
 }
 
 /**
- * regress_annotation_object_extra_annos:
- *
- * Attributes: (org.foobar testvalue)
+ * regress_annotation_object_extra_annos: (attributes org.foobar=testvalue)
  */
 void
 regress_annotation_object_extra_annos (RegressAnnotationObject *object)
@@ -763,9 +759,9 @@ regress_annotation_ptr_array (GPtrArray *array)
 /**
  * regress_annotation_attribute_func:
  * @object: A #RegressAnnotationObject.
- * @data: (attribute some.annotation value) (attribute another.annotation blahvalue): Some data.
+ * @data: (attributes some.annotation=value another.annotation=blahvalue): Some data.
  *
- * Returns: (attribute some.other.annotation value2) (attribute yet.another.annotation another_value): The return value.
+ * Returns: (attributes some.other.annotation=value2 yet.another.annotation=another_value): The return value.
  */
 gint
 regress_annotation_attribute_func (RegressAnnotationObject *object,

data/vendor/local/share/gobject-introspection-1.0/tests/annotation.h

@@ -1,6 +1,8 @@
 #ifndef __REGRESS_ANNOTATION_OBJECT_H__
 #define __REGRESS_ANNOTATION_OBJECT_H__
 
+#include "gitestmacros.h"
+
 #include <glib-object.h>
 
 typedef enum /*< flags,prefix=ANN >*/
@@ -37,11 +39,9 @@ typedef GList* (*RegressAnnotationListCallback) (GList *in);
 typedef void (*RegressAnnotationNotifyFunc) (gpointer data);
 
 /**
- * RegressAnnotationObject:
+ * RegressAnnotationObject: (attributes org.example.Test=cows)
  *
  * This is an object used to test annotations.
- *
- * Attributes: (org.example.Test cows)
  */
 typedef struct _RegressAnnotationObject          RegressAnnotationObject;
 typedef struct _RegressAnnotationObjectClass     RegressAnnotationObjectClass;
@@ -60,95 +60,177 @@ struct _RegressAnnotationObjectClass
   GObjectClass parent_class;
 };
 
+_GI_TEST_EXTERN
 GType    regress_annotation_object_get_type (void);
 
+_GI_TEST_EXTERN
 gint     regress_annotation_object_method       (RegressAnnotationObject *object);
+
+_GI_TEST_EXTERN
 gint     regress_annotation_object_out          (RegressAnnotationObject *object,
 					 int              *outarg);
+
+_GI_TEST_EXTERN
 GObject* regress_annotation_object_create_object(RegressAnnotationObject *object);
+
+_GI_TEST_EXTERN
 GObject* regress_annotation_object_allow_none   (RegressAnnotationObject *object,
 					 const gchar      *somearg);
+
+_GI_TEST_EXTERN
 GObject* regress_annotation_object_notrans      (RegressAnnotationObject *object);
+
+_GI_TEST_EXTERN
 gint     regress_annotation_object_inout        (RegressAnnotationObject *object,
 					 int              *inoutarg);
+
+_GI_TEST_EXTERN
 gint     regress_annotation_object_inout2       (RegressAnnotationObject *object,
 					 int              *inoutarg);
+
+_GI_TEST_EXTERN
 gint     regress_annotation_object_inout3       (RegressAnnotationObject *object,
 					 int              *inoutarg);
+
+_GI_TEST_EXTERN
 gint     regress_annotation_object_in           (RegressAnnotationObject *object,
 					 int              *inarg);
+
+_GI_TEST_EXTERN
 gint     regress_annotation_object_calleeowns   (RegressAnnotationObject *object,
 					 GObject          **toown);
+
+_GI_TEST_EXTERN
 gint     regress_annotation_object_calleesowns  (RegressAnnotationObject *object,
 					 GObject          **toown1,
 					 GObject          **toown2);
+
+_GI_TEST_EXTERN
 GList*   regress_annotation_object_get_strings  (RegressAnnotationObject *object);
+
+_GI_TEST_EXTERN
 GHashTable*regress_annotation_object_get_hash   (RegressAnnotationObject *object);
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_with_voidp   (RegressAnnotationObject *object,
 					 void             *data);
+
+_GI_TEST_EXTERN
 GSList*  regress_annotation_object_get_objects  (RegressAnnotationObject *object);
 
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_use_buffer   (RegressAnnotationObject *object,
 					 guchar           *bytes);
 
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_compute_sum  (RegressAnnotationObject *object,
 					 int              *nums);
 
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_compute_sum_n(RegressAnnotationObject *object,
 					 int              *nums,
 					 int               n_nums);
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_compute_sum_nz(RegressAnnotationObject *object,
                                           int             *nums,
                                           int              n_nums);
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_parse_args   (RegressAnnotationObject *object,
                                          int              *argc,
                                          char           ***argv);
+
+_GI_TEST_EXTERN
 gboolean regress_annotation_object_string_out   (RegressAnnotationObject *object,
                                          char            **str_out);
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_foreach      (RegressAnnotationObject *object,
                                          RegressAnnotationForeachFunc func,
                                          gpointer user_data);
 
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_set_data     (RegressAnnotationObject *object,
                                          const guchar     *data,
                                          gsize             length);
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_set_data2    (RegressAnnotationObject *object,
                                          const gchar      *data,
                                          gsize             length);
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_set_data3    (RegressAnnotationObject *object,
                                          gpointer          data,
                                          gsize             length);
 
+
+_GI_TEST_EXTERN
 GObject* regress_annotation_object_do_not_use   (RegressAnnotationObject *object);
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_watch        (RegressAnnotationObject *object,
                                          RegressAnnotationForeachFunc func,
                                          gpointer user_data);
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_watch_full   (RegressAnnotationObject *object,
                                          RegressAnnotationForeachFunc func,
                                          gpointer user_data,
                                          GDestroyNotify destroy);
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_hidden_self  (gpointer object);
 
+
+_GI_TEST_EXTERN
 void     regress_annotation_init                (int              *argc, 
 					 char           ***argv);
+
+_GI_TEST_EXTERN
 char **  regress_annotation_return_array        (int             *length);
+
+_GI_TEST_EXTERN
 void     regress_annotation_versioned           (void);
+
+_GI_TEST_EXTERN
 char **  regress_annotation_string_zero_terminated (void);
+
+_GI_TEST_EXTERN
 void     regress_annotation_string_zero_terminated_out (char ***out);
 
+
+_GI_TEST_EXTERN
 void     regress_annotation_string_array_length (guint n_properties, const gchar * const properties[]);
 
+
+_GI_TEST_EXTERN
 void     regress_annotation_object_extra_annos (RegressAnnotationObject *object);
 
+
+_GI_TEST_EXTERN
 void     regress_annotation_custom_destroy (RegressAnnotationCallback callback,
                                     RegressAnnotationNotifyFunc destroy,
                                     gpointer data);
+
+_GI_TEST_EXTERN
 char *   regress_annotation_get_source_file (void);
+
+_GI_TEST_EXTERN
 void     regress_annotation_set_source_file (const char *fname);
 
+
+_GI_TEST_EXTERN
 gint     regress_annotation_attribute_func (RegressAnnotationObject *object,
                                     const gchar      *data);
 
+
+_GI_TEST_EXTERN
 void     regress_annotation_invalid_regress_annotation (int foo);
 
 /**
@@ -161,36 +243,57 @@ struct RegressAnnotationStruct
   RegressAnnotationObject *objects[10];
 };
 
+/**
+ * RegressAnnotationFields:
+ * @field1: Some documentation
+ * @arr: (array length=len): an array of length @len
+ * @len: the length of array
+ *
+ * This is a struct for testing field documentation and annotations
+ */
+struct RegressAnnotationFields
+{
+  int field1;
+  guchar *arr;
+  gulong len;
+};
+
+
+_GI_TEST_EXTERN
 void    regress_annotation_ptr_array (GPtrArray *array);
 
+
+_GI_TEST_EXTERN
 GObject  * regress_annotation_test_parsing_bug630862 (void);
 
+
+_GI_TEST_EXTERN
 void regress_annotation_space_after_comment_bug631690 (void);
 
+
+_GI_TEST_EXTERN
 gchar* regress_annotation_return_filename (void);
 
+
+_GI_TEST_EXTERN
 GObject * regress_annotation_transfer_floating(void);
 
 /* This one we can handle properly */
 #define REGRESS_ANNOTATION_CALCULATED_DEFINE (10 * 10)
 
 /**
- * REGRESS_ANNOTATION_CALCULATED_LARGE:
+ * REGRESS_ANNOTATION_CALCULATED_LARGE: (value 10000000000UL)
  *
  * Constant to define a calculated large value
  *
- * Value: 10000000000UL
- *
  * Since: 1.4
  */
 #define REGRESS_ANNOTATION_CALCULATED_LARGE (1000 * G_GINT64_CONSTANT (10000000))
 
 /**
- * REGRESS_ANNOTATION_CALCULATED_LARGE_DIV:
+ * REGRESS_ANNOTATION_CALCULATED_LARGE_DIV: (value 1000000UL)
  *
  * Constant to define a calculated large value
- *
- * Value: 1000000UL
  */
 #define REGRESS_ANNOTATION_CALCULATED_LARGE_DIV (1000 / G_GINT64_CONSTANT (10000000))
 

data/vendor/local/share/gobject-introspection-1.0/tests/drawable.c

@@ -1,4 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+#include "config.h"
+
 #include "drawable.h"
 
 G_DEFINE_ABSTRACT_TYPE (RegressTestInheritDrawable, regress_test_inherit_drawable, G_TYPE_OBJECT);

data/vendor/local/share/gobject-introspection-1.0/tests/drawable.h

@@ -3,6 +3,8 @@
 
 #include <glib-object.h>
 
+#include "gitestmacros.h"
+
 typedef struct _RegressTestInheritDrawable RegressTestInheritDrawable;
 typedef struct _RegressTestInheritDrawableClass RegressTestInheritDrawableClass;
 
@@ -16,11 +18,20 @@ struct _RegressTestInheritDrawableClass
   GObjectClass parent_class;
 };
 
+_GI_TEST_EXTERN
 GType regress_test_inherit_drawable_get_type (void) G_GNUC_CONST;
 
+
+_GI_TEST_EXTERN
 void regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable *drawable, int x);
+
+_GI_TEST_EXTERN
 void regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable *drawable, int *x, int *y);
+
+_GI_TEST_EXTERN
 void regress_test_inherit_drawable_get_size (RegressTestInheritDrawable *drawable, guint *width, guint *height);
+
+_GI_TEST_EXTERN
 void regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawable *drawable, int x, GError **error);
 
 typedef struct _RegressTestInheritPixmapObjectClass RegressTestInheritPixmapObjectClass;