[beast: 4/12] BEAST: rename ic0n and p1xel to make room for new API

[Tim Janik <timj src gnome org>]

commit e49da733bd6e24cf81d8eea65dda7632b5f20668
Author: Tim Janik <timj gnu org>
Date:   Fri Sep 18 10:37:01 2015 +0200

    BEAST: rename ic0n and p1xel to make room for new API

 beast-gtk/bstcanvassource.cc |   12 ++++++------
 beast-gtk/bstmenus.cc        |    8 ++++----
 beast-gtk/bstmenus.hh        |    2 +-
 beast-gtk/bstsnetrouter.cc   |    2 +-
 beast-gtk/bstutils.cc        |    2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/beast-gtk/bstcanvassource.cc b/beast-gtk/bstcanvassource.cc
index e506820..790a7e1 100644
--- a/beast-gtk/bstcanvassource.cc
+++ b/beast-gtk/bstcanvassource.cc
@@ -47,7 +47,7 @@ static gboolean bst_canvas_source_child_event (BstCanvasSource        *csource,
                                                 GnomeCanvasItem        *child);
 static void     bst_canvas_source_changed       (BstCanvasSource        *csource);
 static void    bst_canvas_icon_set             (GnomeCanvasItem        *item,
-                                                BseIcon                *icon,
+                                                BseIc0n                *icon,
                                                  const gchar            *module_type);
 static void    csource_info_update             (BstCanvasSource        *csource);
 static void     bst_canvas_source_build         (BstCanvasSource        *csource);
@@ -167,7 +167,7 @@ source_name_changed (BstCanvasSource *csource)
 static void
 source_icon_changed (BstCanvasSource *csource)
 {
-  BseIcon *icon;
+  BseIc0n *icon;
 
   /* update icon in group, revert to a stock icon if none is available
    */
@@ -592,7 +592,7 @@ bst_canvas_source_ochannel_at (BstCanvasSource *csource,
 
 static void
 bst_canvas_icon_set (GnomeCanvasItem *item,
-                    BseIcon         *icon,
+                    BseIc0n         *icon,
                      const gchar     *module_type)
 {
   GdkPixbuf *pixbuf;
@@ -600,15 +600,15 @@ bst_canvas_icon_set (GnomeCanvasItem *item,
   if (icon && icon->pixel_seq->n_pixels)
     {
       g_assert (icon->width * icon->height == int (icon->pixel_seq->n_pixels));
-      icon = bse_icon_copy_shallow (icon);
+      icon = bse_ic0n_copy_shallow (icon);
       pixbuf = gdk_pixbuf_new_from_data ((guchar*) icon->pixel_seq->pixels, GDK_COLORSPACE_RGB, true,
                                         8, icon->width, icon->height,
                                         icon->width * 4,
                                         NULL, NULL);
       g_object_set_data_full (G_OBJECT (pixbuf),
-                             "BseIcon",
+                             "BseIc0n",
                              icon,
-                             (GtkDestroyNotify) bse_icon_free);
+                             (GtkDestroyNotify) bse_ic0n_free);
       need_unref = TRUE;
     }
   else if (module_type && strncmp (module_type, "BseLadspaModule_", 16) == 0)
diff --git a/beast-gtk/bstmenus.cc b/beast-gtk/bstmenus.cc
index e90276c..260a0ba 100644
--- a/beast-gtk/bstmenus.cc
+++ b/beast-gtk/bstmenus.cc
@@ -8,7 +8,7 @@ struct _BstChoice
 {
   BstChoiceFlags type_and_flags;
   const gchar   *icon_stock_id;
-  BseIcon       *bse_icon;
+  BseIc0n       *bse_icon;
   const gchar   *name;
   gpointer       p_id;
 };
@@ -26,13 +26,13 @@ bst_choice_alloc (BstChoiceFlags type,
                  const gchar   *choice_name,
                  gpointer       choice_id,
                  const gchar   *icon_stock_id,
-                 BseIcon       *icon)
+                 BseIc0n       *icon)
 {
   BstChoice *choice = g_new (BstChoice, 1);
 
   choice->type_and_flags = type;
   choice->icon_stock_id = icon_stock_id;
-  choice->bse_icon = icon ? bse_icon_copy_shallow (icon) : NULL;
+  choice->bse_icon = icon ? bse_ic0n_copy_shallow (icon) : NULL;
   choice->name = choice_name;
   choice->p_id = choice_id;
 
@@ -105,7 +105,7 @@ static void
 free_choice (BstChoice *choice)
 {
   if (choice->bse_icon)
-    bse_icon_free (choice->bse_icon);
+    bse_ic0n_free (choice->bse_icon);
   g_free (choice);
 }
 
diff --git a/beast-gtk/bstmenus.hh b/beast-gtk/bstmenus.hh
index 053ce12..b786edc 100644
--- a/beast-gtk/bstmenus.hh
+++ b/beast-gtk/bstmenus.hh
@@ -69,7 +69,7 @@ BstChoice* bst_choice_alloc               (BstChoiceFlags          type,
                                           const gchar            *choice_name,
                                           gpointer                choice_id,
                                           const gchar            *icon_stock_id,
-                                          BseIcon                *bse_icon);
+                                          BseIc0n                *bse_icon);
 
 G_END_DECLS
 
diff --git a/beast-gtk/bstsnetrouter.cc b/beast-gtk/bstsnetrouter.cc
index cdbb122..bc50a50 100644
--- a/beast-gtk/bstsnetrouter.cc
+++ b/beast-gtk/bstsnetrouter.cc
@@ -1093,7 +1093,7 @@ bst_snet_router_init (BstSNetRouter      *self)
 
         if (cat->icon)
           {
-            BseIcon *icon = cat->icon;
+            BseIc0n *icon = cat->icon;
             g_assert (icon->width * icon->height == int (icon->pixel_seq->n_pixels));
             bst_stock_register_icon (cat->category, 4,
                                      icon->width, icon->height,
diff --git a/beast-gtk/bstutils.cc b/beast-gtk/bstutils.cc
index ac88c02..d1b7f34 100644
--- a/beast-gtk/bstutils.cc
+++ b/beast-gtk/bstutils.cc
@@ -455,7 +455,7 @@ bst_action_list_add_cat (GxkActionList          *alist,
 
   if (cat->icon)
     {
-      BseIcon *icon = cat->icon;
+      BseIc0n *icon = cat->icon;
       g_assert (icon->width * icon->height == int (icon->pixel_seq->n_pixels));
       bst_stock_register_icon (cat->category, 4,
                                icon->width, icon->height,