diff options
| author | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 20:50:21 +0000 |
|---|---|---|
| committer | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 20:50:21 +0000 |
| commit | 68ff94340891f1ae4ea24546acdbbc39c4dcbcd0 (patch) | |
| tree | 46f02cba671bcb321482c7961acd91aeee57ced5 /tests/scanner/drawable.h | |
| parent | 19da3f81593614198206c45527f973a22cdd621e (diff) | |
| parent | 89e84d06dffbc732bac26a105244b7270c42e3ec (diff) | |
| download | gobject-introspection-baserock/markdoffman/1_39_90-merge.tar.gz | |
Merge tag 'GOBJECT_INTROSPECTION_1_39_90' into baserock/markdoffman/1_39_90-mergebaserock/markdoffman/1_39_90-merge
Tag 1_39_90
Conflicts:
autogen.sh
configure.ac
Diffstat (limited to 'tests/scanner/drawable.h')
| -rw-r--r-- | tests/scanner/drawable.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/scanner/drawable.h b/tests/scanner/drawable.h index d1752e44..58383589 100644 --- a/tests/scanner/drawable.h +++ b/tests/scanner/drawable.h @@ -1,33 +1,33 @@ -#ifndef __TEST_INHERIT_DRAWABLE_H__ -#define __TEST_INHERIT_DRAWABLE_H__ +#ifndef __REGRESS_TEST_INHERIT_DRAWABLE_H__ +#define __REGRESS_TEST_INHERIT_DRAWABLE_H__ #include <glib-object.h> -typedef struct _TestInheritDrawable TestInheritDrawable; -typedef struct _TestInheritDrawableClass TestInheritDrawableClass; +typedef struct _RegressTestInheritDrawable RegressTestInheritDrawable; +typedef struct _RegressTestInheritDrawableClass RegressTestInheritDrawableClass; -struct _TestInheritDrawable +struct _RegressTestInheritDrawable { GObject parent_instance; }; -struct _TestInheritDrawableClass +struct _RegressTestInheritDrawableClass { GObjectClass parent_class; }; -GType test_inherit_drawable_get_type (void) G_GNUC_CONST; +GType regress_test_inherit_drawable_get_type (void) G_GNUC_CONST; -void test_inherit_drawable_do_foo (TestInheritDrawable *drawable, int x); -void test_inherit_drawable_get_origin (TestInheritDrawable *drawable, int *x, int *y); -void test_inherit_drawable_get_size (TestInheritDrawable *drawable, guint *width, guint *height); -void test_inherit_drawable_do_foo_maybe_throw (TestInheritDrawable *drawable, int x, GError **error); +void regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable *drawable, int x); +void regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable *drawable, int *x, int *y); +void regress_test_inherit_drawable_get_size (RegressTestInheritDrawable *drawable, guint *width, guint *height); +void regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawable *drawable, int x, GError **error); -typedef struct _TestInheritPixmapObjectClass TestInheritPixmapObjectClass; +typedef struct _RegressTestInheritPixmapObjectClass RegressTestInheritPixmapObjectClass; -struct _TestInheritPixmapObjectClass +struct _RegressTestInheritPixmapObjectClass { - TestInheritDrawableClass parent_class; + RegressTestInheritDrawableClass parent_class; }; -#endif /* __TEST_INHERIT_DRAWABLE_H__ */ +#endif /* __REGRESS_TEST_INHERIT_DRAWABLE_H__ */ |