brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl: Use Cogl (not COGL) consistently

Browse Source 
If I remember correctly, Robert wants to name Cogl, Cogl (not COGL) so
start by having a consistent naming in the code.
This commit is contained in:
Damien Lespiau 2010-10-05 08:03:19 +01:00
parent 24577a0538
commit a13182c740
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clutter/clutter-texture.c
View File

@ -1041,16 +1041,16 @@ clutter_texture_class_init (ClutterTextureClass *klass)
g_object_class_install_property (gobject_class, PROP_PIXEL_FORMAT, pspec); g_object_class_install_property (gobject_class, PROP_PIXEL_FORMAT, pspec);
pspec = g_param_spec_boxed ("cogl-texture", pspec = g_param_spec_boxed ("cogl-texture",
P_("COGL Texture"), P_("Cogl Texture"),
P_("The underlying COGL texture handle used to draw this actor"), P_("The underlying Cogl texture handle used to draw this actor"),
COGL_TYPE_HANDLE, COGL_TYPE_HANDLE,
CLUTTER_PARAM_READWRITE); CLUTTER_PARAM_READWRITE);
obj_props[PROP_COGL_TEXTURE] = pspec; obj_props[PROP_COGL_TEXTURE] = pspec;
g_object_class_install_property (gobject_class, PROP_COGL_TEXTURE, pspec); g_object_class_install_property (gobject_class, PROP_COGL_TEXTURE, pspec);
pspec = g_param_spec_boxed ("cogl-material", pspec = g_param_spec_boxed ("cogl-material",
P_("COGL Material"), P_("Cogl Material"),
P_("The underlying COGL material handle used to draw this actor"), P_("The underlying Cogl material handle used to draw this actor"),
COGL_TYPE_HANDLE, COGL_TYPE_HANDLE,
CLUTTER_PARAM_READWRITE); CLUTTER_PARAM_READWRITE);
obj_props[PROP_COGL_MATERIAL] = pspec; obj_props[PROP_COGL_MATERIAL] = pspec;
@ -1539,7 +1539,7 @@ clutter_texture_set_from_data (ClutterTexture *texture,
g_set_error (&inner_error, CLUTTER_TEXTURE_ERROR, g_set_error (&inner_error, CLUTTER_TEXTURE_ERROR,
CLUTTER_TEXTURE_ERROR_BAD_FORMAT, CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
"Failed to create COGL texture"); "Failed to create Cogl texture");
g_signal_emit (texture, texture_signals[LOAD_FINISHED], 0, inner_error); g_signal_emit (texture, texture_signals[LOAD_FINISHED], 0, inner_error);
@ -1935,7 +1935,7 @@ clutter_texture_async_load (ClutterTexture *self,
{ {
g_set_error (error, CLUTTER_TEXTURE_ERROR, g_set_error (error, CLUTTER_TEXTURE_ERROR,
CLUTTER_TEXTURE_ERROR_BAD_FORMAT, CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
"Failed to create COGL texture"); "Failed to create Cogl texture");
return FALSE; return FALSE;
} }
else else
@ -2030,7 +2030,7 @@ clutter_texture_set_from_file (ClutterTexture *texture,
{ {
g_set_error (&internal_error, CLUTTER_TEXTURE_ERROR, g_set_error (&internal_error, CLUTTER_TEXTURE_ERROR,
CLUTTER_TEXTURE_ERROR_BAD_FORMAT, CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
"Failed to create COGL texture"); "Failed to create Cogl texture");
} }
if (internal_error != NULL) if (internal_error != NULL)
@ -2337,7 +2337,7 @@ clutter_texture_set_area_from_rgb_data (ClutterTexture *texture,
{ {
g_set_error (error, CLUTTER_TEXTURE_ERROR, g_set_error (error, CLUTTER_TEXTURE_ERROR,
CLUTTER_TEXTURE_ERROR_BAD_FORMAT, CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
"Failed to upload COGL texture data"); "Failed to upload Cogl texture data");
return FALSE; return FALSE;
} }

8
clutter/cogl/cogl/cogl-debug.c
View File

@ -151,9 +151,9 @@ cogl_arg_no_debug_cb (const char *key,
static GOptionEntry cogl_args[] = { static GOptionEntry cogl_args[] = {
#ifdef COGL_ENABLE_DEBUG #ifdef COGL_ENABLE_DEBUG
{ "cogl-debug", 0, 0, G_OPTION_ARG_CALLBACK, cogl_arg_debug_cb, { "cogl-debug", 0, 0, G_OPTION_ARG_CALLBACK, cogl_arg_debug_cb,
N_("COGL debugging flags to set"), "FLAGS" }, N_("Cogl debugging flags to set"), "FLAGS" },
{ "cogl-no-debug", 0, 0, G_OPTION_ARG_CALLBACK, cogl_arg_no_debug_cb, { "cogl-no-debug", 0, 0, G_OPTION_ARG_CALLBACK, cogl_arg_no_debug_cb,
N_("COGL debugging flags to unset"), "FLAGS" }, N_("Cogl debugging flags to unset"), "FLAGS" },
#endif /* COGL_ENABLE_DEBUG */ #endif /* COGL_ENABLE_DEBUG */
{ NULL, }, { NULL, },
}; };
@ -184,8 +184,8 @@ cogl_get_option_group (void)
GOptionGroup *group; GOptionGroup *group;
group = g_option_group_new ("cogl", group = g_option_group_new ("cogl",
_("COGL Options"), _("Cogl Options"),
_("Show COGL options"), _("Show Cogl options"),
NULL, NULL); NULL, NULL);
g_option_group_set_parse_hooks (group, pre_parse_hook, NULL); g_option_group_set_parse_hooks (group, pre_parse_hook, NULL);

4
configure.ac
View File

@ -1126,9 +1126,9 @@ echo " • Extra:"
echo " Build introspection data: ${enable_introspection}" echo " Build introspection data: ${enable_introspection}"
echo " Build conformance test suite: ${enable_conformance}" echo " Build conformance test suite: ${enable_conformance}"
# COGL flags # Cogl flags
echo "" echo ""
echo " • COGL Backend:" echo " • Cogl Backend:"
echo " Driver: ${COGL_DRIVER}" echo " Driver: ${COGL_DRIVER}"
echo " GL header: ${cogl_gl_headers}" echo " GL header: ${cogl_gl_headers}"