From a13182c740c9d61e897c8f41d958ca31ebbe6797 Mon Sep 17 00:00:00 2001
From: Damien Lespiau <damien.lespiau@intel.com>
Date: Tue, 5 Oct 2010 08:03:19 +0100
Subject: [PATCH] cogl: Use Cogl (not COGL) consistently

If I remember correctly, Robert wants to name Cogl, Cogl (not COGL) so
start by having a consistent naming in the code.
---
 clutter/clutter-texture.c      | 16 ++++++++--------
 clutter/cogl/cogl/cogl-debug.c |  8 ++++----
 configure.ac                   |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index 5e48faf..8852665 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -1041,16 +1041,16 @@ clutter_texture_class_init (ClutterTextureClass *klass)
   g_object_class_install_property (gobject_class, PROP_PIXEL_FORMAT, pspec);
 
   pspec = g_param_spec_boxed ("cogl-texture",
-                              P_("COGL Texture"),
-                              P_("The underlying COGL texture handle used to draw this actor"),
+                              P_("Cogl Texture"),
+                              P_("The underlying Cogl texture handle used to draw this actor"),
                               COGL_TYPE_HANDLE,
                               CLUTTER_PARAM_READWRITE);
   obj_props[PROP_COGL_TEXTURE] = pspec;
   g_object_class_install_property (gobject_class, PROP_COGL_TEXTURE, pspec);
 
   pspec = g_param_spec_boxed ("cogl-material",
-                              P_("COGL Material"),
-                              P_("The underlying COGL material handle used to draw this actor"),
+                              P_("Cogl Material"),
+                              P_("The underlying Cogl material handle used to draw this actor"),
                               COGL_TYPE_HANDLE,
                               CLUTTER_PARAM_READWRITE);
   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,
                    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);
 
@@ -1935,7 +1935,7 @@ clutter_texture_async_load (ClutterTexture *self,
     {
       g_set_error (error, CLUTTER_TEXTURE_ERROR,
 		   CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
-		   "Failed to create COGL texture");
+		   "Failed to create Cogl texture");
       return FALSE;
     }
   else
@@ -2030,7 +2030,7 @@ clutter_texture_set_from_file (ClutterTexture *texture,
     {
       g_set_error (&internal_error, CLUTTER_TEXTURE_ERROR,
                    CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
-		   "Failed to create COGL texture");
+		   "Failed to create Cogl texture");
     }
 
   if (internal_error != NULL)
@@ -2337,7 +2337,7 @@ clutter_texture_set_area_from_rgb_data (ClutterTexture     *texture,
     {
       g_set_error (error, CLUTTER_TEXTURE_ERROR,
 		   CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
-		   "Failed to upload COGL texture data");
+		   "Failed to upload Cogl texture data");
       return FALSE;
     }
 
diff --git a/clutter/cogl/cogl/cogl-debug.c b/clutter/cogl/cogl/cogl-debug.c
index 2289af2..99049a6 100644
--- a/clutter/cogl/cogl/cogl-debug.c
+++ b/clutter/cogl/cogl/cogl-debug.c
@@ -151,9 +151,9 @@ cogl_arg_no_debug_cb (const char *key,
 static GOptionEntry cogl_args[] = {
 #ifdef COGL_ENABLE_DEBUG
   { "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,
-    N_("COGL debugging flags to unset"), "FLAGS" },
+    N_("Cogl debugging flags to unset"), "FLAGS" },
 #endif /* COGL_ENABLE_DEBUG */
   { NULL, },
 };
@@ -184,8 +184,8 @@ cogl_get_option_group (void)
   GOptionGroup *group;
 
   group = g_option_group_new ("cogl",
-                              _("COGL Options"),
-                              _("Show COGL options"),
+                              _("Cogl Options"),
+                              _("Show Cogl options"),
                               NULL, NULL);
 
   g_option_group_set_parse_hooks (group, pre_parse_hook, NULL);
diff --git a/configure.ac b/configure.ac
index e659217..05f4c3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1126,9 +1126,9 @@ echo " • Extra:"
 echo "        Build introspection data: ${enable_introspection}"
 echo "        Build conformance test suite: ${enable_conformance}"
 
-# COGL flags
+# Cogl flags
 echo ""
-echo " • COGL Backend:"
+echo " • Cogl Backend:"
 echo "        Driver: ${COGL_DRIVER}"
 echo "        GL header: ${cogl_gl_headers}"
 
-- 
2.7.4