GNOME.org
 

[gimp] app: rename GimpTransformTool::recalc() to ::recalc_matrix()

commit 8512675088dce12ffd17ccaec00af3378666026c
Author: Michael Natterer <mitch gimp org>
Date:   Sun Mar 27 23:12:11 2011 +0200

    app: rename GimpTransformTool::recalc() to ::recalc_matrix()

 app/tools/gimpperspectivetool.c |    6 +++---
 app/tools/gimprotatetool.c      |   10 +++++-----
 app/tools/gimpscaletool.c       |    8 ++++----
 app/tools/gimpsheartool.c       |   10 +++++-----
 app/tools/gimptransformtool.c   |   20 ++++++++++----------
 app/tools/gimptransformtool.h   |    6 +++---
 6 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c
index 3a05912..d80b6c4 100644
--- a/app/tools/gimpperspectivetool.c
+++ b/app/tools/gimpperspectivetool.c
@@ -47,7 +47,7 @@ static void   gimp_perspective_tool_dialog        (GimpTransformTool *tr_tool);
 static void   gimp_perspective_tool_dialog_update (GimpTransformTool *tr_tool);
 static void   gimp_perspective_tool_prepare       (GimpTransformTool *tr_tool);
 static void   gimp_perspective_tool_motion        (GimpTransformTool *tr_tool);
-static void   gimp_perspective_tool_recalc        (GimpTransformTool *tr_tool);
+static void   gimp_perspective_tool_recalc_matrix (GimpTransformTool *tr_tool);
 
 
 G_DEFINE_TYPE (GimpPerspectiveTool, gimp_perspective_tool,
@@ -81,7 +81,7 @@ gimp_perspective_tool_class_init (GimpPerspectiveToolClass *klass)
   trans_class->dialog_update = gimp_perspective_tool_dialog_update;
   trans_class->prepare       = gimp_perspective_tool_prepare;
   trans_class->motion        = gimp_perspective_tool_motion;
-  trans_class->recalc        = gimp_perspective_tool_recalc;
+  trans_class->recalc_matrix = gimp_perspective_tool_recalc_matrix;
 }
 
 static void
@@ -209,7 +209,7 @@ gimp_perspective_tool_motion (GimpTransformTool *transform_tool)
 }
 
 static void
-gimp_perspective_tool_recalc (GimpTransformTool *tr_tool)
+gimp_perspective_tool_recalc_matrix (GimpTransformTool *tr_tool)
 {
   gimp_matrix3_identity (&tr_tool->transform);
   gimp_transform_matrix_perspective (&tr_tool->transform,
diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c
index ce8e20f..cdc779e 100644
--- a/app/tools/gimprotatetool.c
+++ b/app/tools/gimprotatetool.c
@@ -63,7 +63,7 @@ static void     gimp_rotate_tool_dialog        (GimpTransformTool   *tr_tool);
 static void     gimp_rotate_tool_dialog_update (GimpTransformTool   *tr_tool);
 static void     gimp_rotate_tool_prepare       (GimpTransformTool   *tr_tool);
 static void     gimp_rotate_tool_motion        (GimpTransformTool   *tr_tool);
-static void     gimp_rotate_tool_recalc        (GimpTransformTool   *tr_tool);
+static void     gimp_rotate_tool_recalc_matrix (GimpTransformTool   *tr_tool);
 static void     rotate_angle_changed           (GtkAdjustment       *adj,
                                                 GimpTransformTool   *tr_tool);
 static void     rotate_center_changed          (GtkWidget           *entry,
@@ -104,7 +104,7 @@ gimp_rotate_tool_class_init (GimpRotateToolClass *klass)
   trans_class->dialog_update = gimp_rotate_tool_dialog_update;
   trans_class->prepare       = gimp_rotate_tool_prepare;
   trans_class->motion        = gimp_rotate_tool_motion;
-  trans_class->recalc        = gimp_rotate_tool_recalc;
+  trans_class->recalc_matrix = gimp_rotate_tool_recalc_matrix;
 }
 
 static void
@@ -348,7 +348,7 @@ gimp_rotate_tool_motion (GimpTransformTool *tr_tool)
 }
 
 static void
-gimp_rotate_tool_recalc (GimpTransformTool *tr_tool)
+gimp_rotate_tool_recalc_matrix (GimpTransformTool *tr_tool)
 {
   tr_tool->cx = tr_tool->trans_info[CENTER_X];
   tr_tool->cy = tr_tool->trans_info[CENTER_Y];
@@ -374,7 +374,7 @@ rotate_angle_changed (GtkAdjustment     *adj,
 
       tr_tool->trans_info[REAL_ANGLE] = tr_tool->trans_info[ANGLE] = value;
 
-      gimp_transform_tool_recalc (tr_tool);
+      gimp_transform_tool_recalc_matrix (tr_tool);
 
       gimp_draw_tool_resume (GIMP_DRAW_TOOL (tr_tool));
     }
@@ -399,7 +399,7 @@ rotate_center_changed (GtkWidget         *widget,
       tr_tool->cx = cx;
       tr_tool->cy = cy;
 
-      gimp_transform_tool_recalc (tr_tool);
+      gimp_transform_tool_recalc_matrix (tr_tool);
 
       gimp_draw_tool_resume (GIMP_DRAW_TOOL (tr_tool));
     }
diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c
index cb2d00c..aa2fa57 100644
--- a/app/tools/gimpscaletool.c
+++ b/app/tools/gimpscaletool.c
@@ -50,7 +50,7 @@ static void   gimp_scale_tool_dialog        (GimpTransformTool  *tr_tool);
 static void   gimp_scale_tool_dialog_update (GimpTransformTool  *tr_tool);
 static void   gimp_scale_tool_prepare       (GimpTransformTool  *tr_tool);
 static void   gimp_scale_tool_motion        (GimpTransformTool  *tr_tool);
-static void   gimp_scale_tool_recalc        (GimpTransformTool  *tr_tool);
+static void   gimp_scale_tool_recalc_matrix (GimpTransformTool  *tr_tool);
 
 static void   gimp_scale_tool_size_notify   (GtkWidget          *box,
                                              GParamSpec         *pspec,
@@ -88,7 +88,7 @@ gimp_scale_tool_class_init (GimpScaleToolClass *klass)
   trans_class->dialog_update = gimp_scale_tool_dialog_update;
   trans_class->prepare       = gimp_scale_tool_prepare;
   trans_class->motion        = gimp_scale_tool_motion;
-  trans_class->recalc        = gimp_scale_tool_recalc;
+  trans_class->recalc_matrix = gimp_scale_tool_recalc_matrix;
 }
 
 static void
@@ -300,7 +300,7 @@ gimp_scale_tool_motion (GimpTransformTool *tr_tool)
 }
 
 static void
-gimp_scale_tool_recalc (GimpTransformTool *tr_tool)
+gimp_scale_tool_recalc_matrix (GimpTransformTool *tr_tool)
 {
   gimp_matrix3_identity (&tr_tool->transform);
   gimp_transform_matrix_scale (&tr_tool->transform,
@@ -344,7 +344,7 @@ gimp_scale_tool_size_notify (GtkWidget         *box,
           tr_tool->trans_info[X1] = tr_tool->trans_info[X0] + width;
           tr_tool->trans_info[Y1] = tr_tool->trans_info[Y0] + height;
 
-          gimp_transform_tool_recalc (tr_tool);
+          gimp_transform_tool_recalc_matrix (tr_tool);
 
           gimp_draw_tool_resume (GIMP_DRAW_TOOL (tr_tool));
         }
diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c
index 49623bd..4219bcc 100644
--- a/app/tools/gimpsheartool.c
+++ b/app/tools/gimpsheartool.c
@@ -55,7 +55,7 @@ static void   gimp_shear_tool_dialog_update (GimpTransformTool  *tr_tool);
 
 static void   gimp_shear_tool_prepare       (GimpTransformTool  *tr_tool);
 static void   gimp_shear_tool_motion        (GimpTransformTool  *tr_tool);
-static void   gimp_shear_tool_recalc        (GimpTransformTool  *tr_tool);
+static void   gimp_shear_tool_recalc_matrix (GimpTransformTool  *tr_tool);
 
 static void   shear_x_mag_changed           (GtkAdjustment      *adj,
                                              GimpTransformTool  *tr_tool);
@@ -92,7 +92,7 @@ gimp_shear_tool_class_init (GimpShearToolClass *klass)
   trans_class->dialog_update = gimp_shear_tool_dialog_update;
   trans_class->prepare       = gimp_shear_tool_prepare;
   trans_class->motion        = gimp_shear_tool_motion;
-  trans_class->recalc        = gimp_shear_tool_recalc;
+  trans_class->recalc_matrix = gimp_shear_tool_recalc_matrix;
 }
 
 static void
@@ -213,7 +213,7 @@ gimp_shear_tool_motion (GimpTransformTool *tr_tool)
 }
 
 static void
-gimp_shear_tool_recalc (GimpTransformTool *tr_tool)
+gimp_shear_tool_recalc_matrix (GimpTransformTool *tr_tool)
 {
   gdouble amount;
 
@@ -253,7 +253,7 @@ shear_x_mag_changed (GtkAdjustment     *adj,
 
       tr_tool->trans_info[XSHEAR] = value;
 
-      gimp_transform_tool_recalc (tr_tool);
+      gimp_transform_tool_recalc_matrix (tr_tool);
 
       gimp_draw_tool_resume (GIMP_DRAW_TOOL (tr_tool));
     }
@@ -274,7 +274,7 @@ shear_y_mag_changed (GtkAdjustment     *adj,
 
       tr_tool->trans_info[YSHEAR] = value;
 
-      gimp_transform_tool_recalc (tr_tool);
+      gimp_transform_tool_recalc_matrix (tr_tool);
 
       gimp_draw_tool_resume (GIMP_DRAW_TOOL (tr_tool));
     }
diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
index 96f8c4c..3f7dcf5 100644
--- a/app/tools/gimptransformtool.c
+++ b/app/tools/gimptransformtool.c
@@ -181,7 +181,7 @@ gimp_transform_tool_class_init (GimpTransformToolClass *klass)
   klass->dialog_update            = NULL;
   klass->prepare                  = NULL;
   klass->motion                   = NULL;
-  klass->recalc                   = NULL;
+  klass->recalc_matrix            = NULL;
   klass->transform                = gimp_transform_tool_real_transform;
 }
 
@@ -294,7 +294,7 @@ gimp_transform_tool_initialize (GimpTool     *tool,
       gimp_transform_tool_prepare (tr_tool, display);
 
       /*  Recalculate the transform tool  */
-      gimp_transform_tool_recalc (tr_tool);
+      gimp_transform_tool_recalc_matrix (tr_tool);
 
       /*  start drawing the bounding box and handles...  */
       gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
@@ -326,7 +326,7 @@ gimp_transform_tool_control (GimpTool       *tool,
 
     case GIMP_TOOL_ACTION_RESUME:
       gimp_transform_tool_bounds (tr_tool, display);
-      gimp_transform_tool_recalc (tr_tool);
+      gimp_transform_tool_recalc_matrix (tr_tool);
       break;
 
     case GIMP_TOOL_ACTION_HALT:
@@ -395,7 +395,7 @@ gimp_transform_tool_button_release (GimpTool              *tool,
       gimp_transform_tool_bounds (tr_tool, display);
 
       /*  recalculate the tool's transformation matrix  */
-      gimp_transform_tool_recalc (tr_tool);
+      gimp_transform_tool_recalc_matrix (tr_tool);
 
       gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
     }
@@ -429,7 +429,7 @@ gimp_transform_tool_motion (GimpTool         *tool,
     {
       tr_tool_class->motion (tr_tool);
 
-      gimp_transform_tool_recalc (tr_tool);
+      gimp_transform_tool_recalc_matrix (tr_tool);
     }
 
   tr_tool->lastx = tr_tool->curx;
@@ -723,7 +723,7 @@ gimp_transform_tool_options_notify (GimpTool         *tool,
                   gimp_transform_tool_bounds (tr_tool, tool->display);
 
                   /*  recalculate the tool's transformation matrix  */
-                  gimp_transform_tool_recalc (tr_tool);
+                  gimp_transform_tool_recalc_matrix (tr_tool);
                 }
             }
         }
@@ -1535,12 +1535,12 @@ gimp_transform_tool_prepare (GimpTransformTool *tr_tool,
 }
 
 void
-gimp_transform_tool_recalc (GimpTransformTool *tr_tool)
+gimp_transform_tool_recalc_matrix (GimpTransformTool *tr_tool)
 {
   g_return_if_fail (GIMP_IS_TRANSFORM_TOOL (tr_tool));
 
-  if (GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->recalc)
-    GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->recalc (tr_tool);
+  if (GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->recalc_matrix)
+    GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->recalc_matrix (tr_tool);
 
   gimp_transform_tool_transform_bounding_box (tr_tool);
 
@@ -1573,7 +1573,7 @@ gimp_transform_tool_response (GtkWidget         *widget,
         gimp_transform_tool_bounds (tr_tool, tool->display);
 
         /*  recalculate the tool's transformation matrix  */
-        gimp_transform_tool_recalc (tr_tool);
+        gimp_transform_tool_recalc_matrix (tr_tool);
 
         gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
       }
diff --git a/app/tools/gimptransformtool.h b/app/tools/gimptransformtool.h
index 4e9167a..b33a074 100644
--- a/app/tools/gimptransformtool.h
+++ b/app/tools/gimptransformtool.h
@@ -114,7 +114,7 @@ struct _GimpTransformToolClass
   void          (* dialog_update) (GimpTransformTool *tool);
   void          (* prepare)       (GimpTransformTool *tool);
   void          (* motion)        (GimpTransformTool *tool);
-  void          (* recalc)        (GimpTransformTool *tool);
+  void          (* recalc_matrix) (GimpTransformTool *tool);
   TileManager * (* transform)     (GimpTransformTool *tool,
                                    GimpItem          *item,
                                    TileManager       *orig_tiles,
@@ -125,9 +125,9 @@ struct _GimpTransformToolClass
 };
 
 
-GType   gimp_transform_tool_get_type (void) G_GNUC_CONST;
+GType   gimp_transform_tool_get_type      (void) G_GNUC_CONST;
 
-void    gimp_transform_tool_recalc   (GimpTransformTool *tr_tool);
+void    gimp_transform_tool_recalc_matrix (GimpTransformTool *tr_tool);
 
 
 #endif  /*  __GIMP_TRANSFORM_TOOL_H__  */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]