[gimp] app: s/nbrushes/n_brushes/ in GimpBrushPipe



commit 054957a1eea994391042095cb3d69ae9bbce73d9
Author: Michael Natterer <mitch gimp org>
Date:   Tue Apr 5 15:16:06 2011 +0200

    app: s/nbrushes/n_brushes/ in GimpBrushPipe

 app/core/gimpbrushpipe-load.c       |   12 ++++++------
 app/core/gimpbrushpipe.c            |   12 ++++++------
 app/core/gimpbrushpipe.h            |    2 +-
 app/widgets/gimpviewrendererbrush.c |    2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/app/core/gimpbrushpipe-load.c b/app/core/gimpbrushpipe-load.c
index 58fd7a3..56a3b6d 100644
--- a/app/core/gimpbrushpipe-load.c
+++ b/app/core/gimpbrushpipe-load.c
@@ -208,14 +208,14 @@ gimp_brush_pipe_load (GimpContext  *context,
 
   pipe->brushes = g_new0 (GimpBrush *, num_of_brushes);
 
-  while (pipe->nbrushes < num_of_brushes)
+  while (pipe->n_brushes < num_of_brushes)
     {
-      pipe->brushes[pipe->nbrushes] = gimp_brush_load_brush (context,
-                                                             fd, filename, NULL);
+      pipe->brushes[pipe->n_brushes] = gimp_brush_load_brush (context,
+                                                              fd, filename, NULL);
 
-      if (pipe->brushes[pipe->nbrushes])
+      if (pipe->brushes[pipe->n_brushes])
         {
-          gimp_object_set_name (GIMP_OBJECT (pipe->brushes[pipe->nbrushes]),
+          gimp_object_set_name (GIMP_OBJECT (pipe->brushes[pipe->n_brushes]),
                                 NULL);
         }
       else
@@ -229,7 +229,7 @@ gimp_brush_pipe_load (GimpContext  *context,
           return NULL;
         }
 
-      pipe->nbrushes++;
+      pipe->n_brushes++;
     }
 
   close (fd);
diff --git a/app/core/gimpbrushpipe.c b/app/core/gimpbrushpipe.c
index c525059..618885a 100644
--- a/app/core/gimpbrushpipe.c
+++ b/app/core/gimpbrushpipe.c
@@ -80,7 +80,7 @@ gimp_brush_pipe_init (GimpBrushPipe *pipe)
   pipe->dimension = 0;
   pipe->rank      = NULL;
   pipe->stride    = NULL;
-  pipe->nbrushes  = 0;
+  pipe->n_brushes = 0;
   pipe->brushes   = NULL;
   pipe->select    = NULL;
   pipe->index     = NULL;
@@ -106,7 +106,7 @@ gimp_brush_pipe_finalize (GObject *object)
     {
       gint i;
 
-      for (i = 0; i < pipe->nbrushes; i++)
+      for (i = 0; i < pipe->n_brushes; i++)
         if (pipe->brushes[i])
           g_object_unref (pipe->brushes[i]);
 
@@ -143,7 +143,7 @@ gimp_brush_pipe_get_memsize (GimpObject *object,
                                 sizeof (gint) /* stride */ +
                                 sizeof (PipeSelectModes));
 
-  for (i = 0; i < pipe->nbrushes; i++)
+  for (i = 0; i < pipe->n_brushes; i++)
     memsize += gimp_object_get_memsize (GIMP_OBJECT (pipe->brushes[i]),
                                         gui_size);
 
@@ -171,7 +171,7 @@ gimp_brush_pipe_select_brush (GimpBrush        *brush,
   gint           i, brushix, ix;
   gdouble        velocity, spacing;
 
-  if (pipe->nbrushes == 1)
+  if (pipe->n_brushes == 1)
     return GIMP_BRUSH (pipe->current);
 
 
@@ -230,7 +230,7 @@ gimp_brush_pipe_select_brush (GimpBrush        *brush,
     }
 
   /* Make sure is inside bounds */
-  brushix = CLAMP (brushix, 0, pipe->nbrushes - 1);
+  brushix = CLAMP (brushix, 0, pipe->n_brushes - 1);
 
   pipe->current = pipe->brushes[brushix];
 
@@ -245,7 +245,7 @@ gimp_brush_pipe_want_null_motion (GimpBrush        *brush,
   GimpBrushPipe *pipe = GIMP_BRUSH_PIPE (brush);
   gint           i;
 
-  if (pipe->nbrushes == 1)
+  if (pipe->n_brushes == 1)
     return TRUE;
 
   for (i = 0; i < pipe->dimension; i++)
diff --git a/app/core/gimpbrushpipe.h b/app/core/gimpbrushpipe.h
index 4a0b260..8756951 100644
--- a/app/core/gimpbrushpipe.h
+++ b/app/core/gimpbrushpipe.h
@@ -57,7 +57,7 @@ struct _GimpBrushPipe
 
   gint             *index;      /* Current index for incremental dimensions */
 
-  gint              nbrushes;   /* Might be less than the product of the
+  gint              n_brushes;  /* Might be less than the product of the
                                  * ranks in some odd special case */
   GimpBrush       **brushes;
   GimpBrush        *current;    /* Currently selected brush */
diff --git a/app/widgets/gimpviewrendererbrush.c b/app/widgets/gimpviewrendererbrush.c
index 809f577..ac0a363 100644
--- a/app/widgets/gimpviewrendererbrush.c
+++ b/app/widgets/gimpviewrendererbrush.c
@@ -154,7 +154,7 @@ gimp_view_renderer_brush_render_timeout (gpointer data)
 
   renderbrush->pipe_animation_index++;
 
-  if (renderbrush->pipe_animation_index >= brush_pipe->nbrushes)
+  if (renderbrush->pipe_animation_index >= brush_pipe->n_brushes)
     renderbrush->pipe_animation_index = 0;
 
   brush =



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]