s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use G_DEFINE_BOXED_TYPE.

Browse Source
This commit is contained in:
Daiki Ueno
2011-04-12 11:08:30 +09:00
parent 8d2d612547
commit 8c407ae482
3 changed files with 22 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -85,7 +85,7 @@ AM_CONDITIONAL([HAVE_GTK_2],[test "$with_gtk" = "2.0"])
AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"]) AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"])
AM_PATH_GLIB_2_0 AM_PATH_GLIB_2_0
PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.25.4], , PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.26.0], ,
[AC_MSG_ERROR([GLib2 not found])]) [AC_MSG_ERROR([GLib2 not found])])
PKG_CHECK_MODULES([GIO2], [gio-2.0], , PKG_CHECK_MODULES([GIO2], [gio-2.0], ,
[AC_MSG_ERROR([Gio2 not found])]) [AC_MSG_ERROR([Gio2 not found])])

69
eek/eek-types.c
View File

@ -33,31 +33,20 @@
#include "eek-types.h" #include "eek-types.h"
/* EekPoint */ /* EekPoint */
static EekPoint * G_DEFINE_BOXED_TYPE(EekPoint, eek_point, eek_point_copy, eek_point_free);
EekPoint *
eek_point_copy (const EekPoint *point) eek_point_copy (const EekPoint *point)
{ {
return g_slice_dup (EekPoint, point); return g_slice_dup (EekPoint, point);
} }
static void void
eek_point_free (EekPoint *point) eek_point_free (EekPoint *point)
{ {
g_slice_free (EekPoint, point); g_slice_free (EekPoint, point);
} }
GType
eek_point_get_type (void)
{
static GType our_type = 0;
if (our_type == 0)
our_type =
g_boxed_type_register_static ("EekPoint",
(GBoxedCopyFunc)eek_point_copy,
(GBoxedFreeFunc)eek_point_free);
return our_type;
}
void void
eek_point_rotate (EekPoint *point, gint angle) eek_point_rotate (EekPoint *point, gint angle)
{ {
@ -71,32 +60,24 @@ eek_point_rotate (EekPoint *point, gint angle)
} }
/* EekBounds */ /* EekBounds */
static EekBounds * G_DEFINE_BOXED_TYPE(EekBounds, eek_bounds, eek_bounds_copy, eek_bounds_free);
EekBounds *
eek_bounds_copy (const EekBounds *bounds) eek_bounds_copy (const EekBounds *bounds)
{ {
return g_slice_dup (EekBounds, bounds); return g_slice_dup (EekBounds, bounds);
} }
static void void
eek_bounds_free (EekBounds *bounds) eek_bounds_free (EekBounds *bounds)
{ {
g_slice_free (EekBounds, bounds); g_slice_free (EekBounds, bounds);
} }
GType
eek_bounds_get_type (void)
{
static GType our_type = 0;
if (our_type == 0)
our_type =
g_boxed_type_register_static ("EekBounds",
(GBoxedCopyFunc)eek_bounds_copy,
(GBoxedFreeFunc)eek_bounds_free);
return our_type;
}
/* EekOutline */ /* EekOutline */
G_DEFINE_BOXED_TYPE(EekOutline, eek_outline,
eek_outline_copy, eek_outline_free);
EekOutline * EekOutline *
eek_outline_copy (const EekOutline *outline) eek_outline_copy (const EekOutline *outline)
{ {
@ -115,20 +96,9 @@ eek_outline_free (EekOutline *outline)
g_slice_free (EekOutline, outline); g_slice_free (EekOutline, outline);
} }
GType
eek_outline_get_type (void)
{
static GType our_type = 0;
if (our_type == 0)
our_type =
g_boxed_type_register_static ("EekOutline",
(GBoxedCopyFunc)eek_outline_copy,
(GBoxedFreeFunc)eek_outline_free);
return our_type;
}
/* EekColor */ /* EekColor */
G_DEFINE_BOXED_TYPE(EekColor, eek_color, eek_color_copy, eek_color_free);
EekColor * EekColor *
eek_color_copy (const EekColor *color) eek_color_copy (const EekColor *color)
{ {
@ -141,19 +111,6 @@ eek_color_free (EekColor *color)
g_slice_free (EekColor, color); g_slice_free (EekColor, color);
} }
GType
eek_color_get_type (void)
{
static GType our_type = 0;
if (our_type == 0)
our_type =
g_boxed_type_register_static ("EekColor",
(GBoxedCopyFunc)eek_color_copy,
(GBoxedFreeFunc)eek_color_free);
return our_type;
}
EekColor * EekColor *
eek_color_new (gdouble red, eek_color_new (gdouble red,
gdouble green, gdouble green,

12
eek/eek-types.h
View File

@ -159,9 +159,11 @@ struct _EekPoint
gdouble y; gdouble y;
}; };
GType eek_point_get_type (void) G_GNUC_CONST; GType eek_point_get_type (void) G_GNUC_CONST;
void eek_point_rotate (EekPoint *point, EekPoint *eek_point_copy (const EekPoint *point);
gint angle); void eek_point_free (EekPoint *point);
void eek_point_rotate (EekPoint *point,
gint angle);
/** /**
* EekBounds: * EekBounds:
@ -181,7 +183,9 @@ struct _EekBounds
gdouble height; gdouble height;
}; };
GType eek_bounds_get_type (void) G_GNUC_CONST; GType eek_bounds_get_type (void) G_GNUC_CONST;
EekBounds *eek_bounds_copy (const EekBounds *bounds);
void eek_bounds_free (EekBounds *bounds);
G_INLINE_FUNC gdouble G_INLINE_FUNC gdouble
eek_bounds_long_side (EekBounds *bounds) eek_bounds_long_side (EekBounds *bounds)