callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmitics. More strictly align static function prototypes and consistently

Browse Source 
2007-11-18  Martin Nordholts  <martinn@svn.gnome.org>

	* app/tools/gimprectangleselecttool.c: Cosmitics. More strictly
	align static function prototypes and consistently use the name
	rect_sel_tool for pointers to GimpRectSelectTool.

svn path=/trunk/; revision=24192
This commit is contained in:
Martin Nordholts
2007-11-18 21:26:52 +00:00
committed by Martin Nordholts
parent ffe0afe922
commit 9ddec7eb78
2 changed files with 111 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,7 +1,13 @@
2007-11-18 Martin Nordholts <martinn@svn.gnome.org>
* app/tools/gimprectangleselecttool.c: Cosmitics. More strictly
align static function prototypes and consistently use the name
rect_sel_tool for pointers to GimpRectSelectTool.
2007-11-18 Bill Skaggs <weskaggs@primate.ucdavis.edu> 2007-11-18 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* libgimp/gimp.def: forgot in previous commit * libgimp/gimp.def: forgot in previous commit
2007-11-18 Bill Skaggs <weskaggs@primate.ucdavis.edu> 2007-11-18 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* tools/pdbgen/pdb/vectors.pdb: add code for * tools/pdbgen/pdb/vectors.pdb: add code for

208
app/tools/gimprectangleselecttool.c
View File

@ -80,66 +80,66 @@ typedef struct GimpRectSelectToolPrivate
static void gimp_rect_select_tool_rectangle_tool_iface_init (GimpRectangleToolInterface *iface); static void gimp_rect_select_tool_rectangle_tool_iface_init (GimpRectangleToolInterface *iface);
static GObject *gimp_rect_select_tool_constructor (GType type, static GObject *gimp_rect_select_tool_constructor (GType type,
guint n_params, guint n_params,
GObjectConstructParam *params); GObjectConstructParam *params);
static void gimp_rect_select_tool_control (GimpTool *tool, static void gimp_rect_select_tool_control (GimpTool *tool,
GimpToolAction action, GimpToolAction action,
GimpDisplay *display); GimpDisplay *display);
static void gimp_rect_select_tool_button_press (GimpTool *tool, static void gimp_rect_select_tool_button_press (GimpTool *tool,
GimpCoords *coords, GimpCoords *coords,
guint32 time, guint32 time,
GdkModifierType state, GdkModifierType state,
GimpDisplay *display); GimpDisplay *display);
static void gimp_rect_select_tool_button_release (GimpTool *tool, static void gimp_rect_select_tool_button_release (GimpTool *tool,
GimpCoords *coords, GimpCoords *coords,
guint32 time, guint32 time,
GdkModifierType state, GdkModifierType state,
GimpButtonReleaseType release_type, GimpButtonReleaseType release_type,
GimpDisplay *display); GimpDisplay *display);
static void gimp_rect_select_tool_active_modifier_key (GimpTool *tool, static void gimp_rect_select_tool_active_modifier_key (GimpTool *tool,
GdkModifierType key, GdkModifierType key,
gboolean press, gboolean press,
GdkModifierType state, GdkModifierType state,
GimpDisplay *display); GimpDisplay *display);
static gboolean gimp_rect_select_tool_key_press (GimpTool *tool, static gboolean gimp_rect_select_tool_key_press (GimpTool *tool,
GdkEventKey *kevent, GdkEventKey *kevent,
GimpDisplay *display); GimpDisplay *display);
static void gimp_rect_select_tool_oper_update (GimpTool *tool, static void gimp_rect_select_tool_oper_update (GimpTool *tool,
GimpCoords *coords, GimpCoords *coords,
GdkModifierType state, GdkModifierType state,
gboolean proximity, gboolean proximity,
GimpDisplay *display); GimpDisplay *display);
static void gimp_rect_select_tool_cursor_update (GimpTool *tool, static void gimp_rect_select_tool_cursor_update (GimpTool *tool,
GimpCoords *coords, GimpCoords *coords,
GdkModifierType state, GdkModifierType state,
GimpDisplay *display); GimpDisplay *display);
static void gimp_rect_select_tool_draw (GimpDrawTool *draw_tool); static void gimp_rect_select_tool_draw (GimpDrawTool *draw_tool);
static gboolean gimp_rect_select_tool_select (GimpRectangleTool *rect_tool, static gboolean gimp_rect_select_tool_select (GimpRectangleTool *rect_tool,
gint x, gint x,
gint y, gint y,
gint w, gint w,
gint h); gint h);
static gboolean gimp_rect_select_tool_execute (GimpRectangleTool *rect_tool, static gboolean gimp_rect_select_tool_execute (GimpRectangleTool *rect_tool,
gint x, gint x,
gint y, gint y,
gint w, gint w,
gint h); gint h);
static void gimp_rect_select_tool_cancel (GimpRectangleTool *rect_tool); static void gimp_rect_select_tool_cancel (GimpRectangleTool *rect_tool);
static gboolean gimp_rect_select_tool_rectangle_changed (GimpRectangleTool *rect_tool); static gboolean gimp_rect_select_tool_rectangle_changed (GimpRectangleTool *rect_tool);
static void gimp_rect_select_tool_real_select (GimpRectSelectTool *rect_select, static void gimp_rect_select_tool_real_select (GimpRectSelectTool *rect_sel_tool,
GimpChannelOps operation, GimpChannelOps operation,
gint x, gint x,
gint y, gint y,
gint w, gint w,
gint h); gint h);
static void gimp_rect_select_tool_update_option_defaults static void gimp_rect_select_tool_update_option_defaults
(GimpRectSelectTool *rect_select_tool, (GimpRectSelectTool *rect_sel_tool,
gboolean ignore_pending); gboolean ignore_pending);
static void gimp_rect_select_tool_round_corners_notify (GimpRectSelectOptions *options, static void gimp_rect_select_tool_round_corners_notify(GimpRectSelectOptions *options,
GParamSpec *pspec, GParamSpec *pspec,
GimpRectSelectTool *rect_sel); GimpRectSelectTool *rect_sel_tool);
G_DEFINE_TYPE_WITH_CODE (GimpRectSelectTool, gimp_rect_select_tool, G_DEFINE_TYPE_WITH_CODE (GimpRectSelectTool, gimp_rect_select_tool,
@ -205,16 +205,16 @@ gimp_rect_select_tool_rectangle_tool_iface_init (GimpRectangleToolInterface *ifa
} }
static void static void
gimp_rect_select_tool_init (GimpRectSelectTool *rect_select) gimp_rect_select_tool_init (GimpRectSelectTool *rect_sel_tool)
{ {
GimpTool *tool = GIMP_TOOL (rect_select); GimpTool *tool = GIMP_TOOL (rect_sel_tool);
GimpRectSelectToolPrivate *priv; GimpRectSelectToolPrivate *priv;
rect_select->priv = G_TYPE_INSTANCE_GET_PRIVATE (rect_select, rect_sel_tool->priv = G_TYPE_INSTANCE_GET_PRIVATE (rect_sel_tool,
GIMP_TYPE_RECT_SELECT_TOOL, GIMP_TYPE_RECT_SELECT_TOOL,
GimpRectSelectToolPrivate); GimpRectSelectToolPrivate);
priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE (rect_select); priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE (rect_sel_tool);
gimp_tool_control_set_wants_click (tool->control, TRUE); gimp_tool_control_set_wants_click (tool->control, TRUE);
gimp_tool_control_set_tool_cursor (tool->control, gimp_tool_control_set_tool_cursor (tool->control,
@ -236,7 +236,7 @@ gimp_rect_select_tool_constructor (GType type,
GObjectConstructParam *params) GObjectConstructParam *params)
{ {
GObject *object; GObject *object;
GimpRectSelectTool *rect_sel; GimpRectSelectTool *rect_sel_tool;
GimpRectSelectOptions *options; GimpRectSelectOptions *options;
GimpRectSelectToolPrivate *priv; GimpRectSelectToolPrivate *priv;
@ -244,9 +244,9 @@ gimp_rect_select_tool_constructor (GType type,
gimp_rectangle_tool_constructor (object); gimp_rectangle_tool_constructor (object);
rect_sel = GIMP_RECT_SELECT_TOOL (object); rect_sel_tool = GIMP_RECT_SELECT_TOOL (object);
options = GIMP_RECT_SELECT_TOOL_GET_OPTIONS (rect_sel); options = GIMP_RECT_SELECT_TOOL_GET_OPTIONS (rect_sel_tool);
priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_sel); priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_sel_tool);
priv->round_corners = options->round_corners; priv->round_corners = options->round_corners;
priv->corner_radius = options->corner_radius; priv->corner_radius = options->corner_radius;
@ -277,11 +277,11 @@ gimp_rect_select_tool_control (GimpTool *tool,
static void static void
gimp_rect_select_tool_draw (GimpDrawTool *draw_tool) gimp_rect_select_tool_draw (GimpDrawTool *draw_tool)
{ {
GimpRectSelectTool *rect_sel; GimpRectSelectTool *rect_sel_tool;
GimpRectSelectToolPrivate *priv; GimpRectSelectToolPrivate *priv;
rect_sel = GIMP_RECT_SELECT_TOOL (draw_tool); rect_sel_tool = GIMP_RECT_SELECT_TOOL (draw_tool);
priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_sel); priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_sel_tool);
gimp_rectangle_tool_draw (draw_tool); gimp_rectangle_tool_draw (draw_tool);
@ -291,7 +291,7 @@ gimp_rect_select_tool_draw (GimpDrawTool *draw_tool)
gdouble radius; gdouble radius;
gint square_size; gint square_size;
g_object_get (rect_sel, g_object_get (rect_sel_tool,
"x1", &x1, "x1", &x1,
"y1", &y1, "y1", &y1,
"x2", &x2, "x2", &x2,
@ -337,15 +337,15 @@ gimp_rect_select_tool_button_press (GimpTool *tool,
GimpDisplay *display) GimpDisplay *display)
{ {
GimpRectangleTool *rectangle; GimpRectangleTool *rectangle;
GimpRectSelectTool *rect_select; GimpRectSelectTool *rect_sel_tool;
GimpDisplayShell *shell; GimpDisplayShell *shell;
GimpRectSelectToolPrivate *priv; GimpRectSelectToolPrivate *priv;
GimpRectangleFunction function; GimpRectangleFunction function;
rectangle = GIMP_RECTANGLE_TOOL (tool); rectangle = GIMP_RECTANGLE_TOOL (tool);
rect_select = GIMP_RECT_SELECT_TOOL (tool); rect_sel_tool = GIMP_RECT_SELECT_TOOL (tool);
shell = GIMP_DISPLAY_SHELL (display->shell); shell = GIMP_DISPLAY_SHELL (display->shell);
priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_select); priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_sel_tool);
if (tool->display && display != tool->display) if (tool->display && display != tool->display)
gimp_rectangle_tool_cancel (GIMP_RECTANGLE_TOOL (tool)); gimp_rectangle_tool_cancel (GIMP_RECTANGLE_TOOL (tool));
@ -438,11 +438,11 @@ gimp_rect_select_tool_button_release (GimpTool *tool,
GimpButtonReleaseType release_type, GimpButtonReleaseType release_type,
GimpDisplay *display) GimpDisplay *display)
{ {
GimpRectSelectTool *rect_select; GimpRectSelectTool *rect_sel_tool;
GimpRectSelectToolPrivate *priv; GimpRectSelectToolPrivate *priv;
rect_select = GIMP_RECT_SELECT_TOOL (tool); rect_sel_tool = GIMP_RECT_SELECT_TOOL (tool);
priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_select); priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_sel_tool);
gimp_tool_pop_status (tool, display); gimp_tool_pop_status (tool, display);
gimp_display_shell_set_show_selection (GIMP_DISPLAY_SHELL (display->shell), gimp_display_shell_set_show_selection (GIMP_DISPLAY_SHELL (display->shell),
@ -489,7 +489,7 @@ gimp_rect_select_tool_button_release (GimpTool *tool,
priv->redo = NULL; priv->redo = NULL;
gimp_rect_select_tool_update_option_defaults (rect_select, gimp_rect_select_tool_update_option_defaults (rect_sel_tool,
FALSE); FALSE);
} }
@ -561,19 +561,19 @@ gimp_rect_select_tool_select (GimpRectangleTool *rectangle,
gint h) gint h)
{ {
GimpTool *tool; GimpTool *tool;
GimpRectSelectTool *rect_select; GimpRectSelectTool *rect_sel_tool;
GimpSelectionOptions *options; GimpSelectionOptions *options;
GimpImage *image; GimpImage *image;
GimpRectSelectToolPrivate *priv; GimpRectSelectToolPrivate *priv;
gboolean rectangle_exists; gboolean rectangle_exists;
GimpChannelOps operation; GimpChannelOps operation;
tool = GIMP_TOOL (rectangle); tool = GIMP_TOOL (rectangle);
rect_select = GIMP_RECT_SELECT_TOOL (rectangle); rect_sel_tool = GIMP_RECT_SELECT_TOOL (rectangle);
options = GIMP_SELECTION_TOOL_GET_OPTIONS (tool); options = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_select); priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_sel_tool);
image = tool->display->image; image = tool->display->image;
gimp_tool_pop_status (tool, tool->display); gimp_tool_pop_status (tool, tool->display);
@ -588,22 +588,22 @@ gimp_rect_select_tool_select (GimpRectangleTool *rectangle,
/* if rectangle exists, turn it into a selection */ /* if rectangle exists, turn it into a selection */
if (rectangle_exists) if (rectangle_exists)
GIMP_RECT_SELECT_TOOL_GET_CLASS (rect_select)->select (rect_select, GIMP_RECT_SELECT_TOOL_GET_CLASS (rect_sel_tool)->select (rect_sel_tool,
operation, operation,
x, y, w, h); x, y, w, h);
return rectangle_exists; return rectangle_exists;
} }
static void static void
gimp_rect_select_tool_real_select (GimpRectSelectTool *rect_select, gimp_rect_select_tool_real_select (GimpRectSelectTool *rect_sel_tool,
GimpChannelOps operation, GimpChannelOps operation,
gint x, gint x,
gint y, gint y,
gint w, gint w,
gint h) gint h)
{ {
GimpTool *tool = GIMP_TOOL (rect_select); GimpTool *tool = GIMP_TOOL (rect_sel_tool);
GimpSelectionOptions *options = GIMP_SELECTION_TOOL_GET_OPTIONS (tool); GimpSelectionOptions *options = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
GimpRectSelectOptions *rect_select_options; GimpRectSelectOptions *rect_select_options;
GimpChannel *channel; GimpChannel *channel;
@ -651,14 +651,14 @@ gimp_rect_select_tool_real_select (GimpRectSelectTool *rect_select,
* properties. * properties.
*/ */
static void static void
gimp_rect_select_tool_update_option_defaults (GimpRectSelectTool *rect_select_tool, gimp_rect_select_tool_update_option_defaults (GimpRectSelectTool *rect_sel_tool,
gboolean ignore_pending) gboolean ignore_pending)
{ {
GimpTool *tool; GimpTool *tool;
GimpRectangleTool *rectangle_tool; GimpRectangleTool *rectangle_tool;
GimpRectangleOptions *rectangle_options; GimpRectangleOptions *rectangle_options;
tool = GIMP_TOOL (rect_select_tool); tool = GIMP_TOOL (rect_sel_tool);
rectangle_tool = GIMP_RECTANGLE_TOOL (tool); rectangle_tool = GIMP_RECTANGLE_TOOL (tool);
rectangle_options = GIMP_RECTANGLE_TOOL_GET_OPTIONS (rectangle_tool); rectangle_options = GIMP_RECTANGLE_TOOL_GET_OPTIONS (rectangle_tool);
@ -781,12 +781,12 @@ static void
gimp_rect_select_tool_cancel (GimpRectangleTool *rectangle) gimp_rect_select_tool_cancel (GimpRectangleTool *rectangle)
{ {
GimpTool *tool; GimpTool *tool;
GimpRectSelectTool *rect_select; GimpRectSelectTool *rect_sel_tool;
GimpRectSelectToolPrivate *priv; GimpRectSelectToolPrivate *priv;
tool = GIMP_TOOL (rectangle); tool = GIMP_TOOL (rectangle);
rect_select = GIMP_RECT_SELECT_TOOL (rectangle); rect_sel_tool = GIMP_RECT_SELECT_TOOL (rectangle);
priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_select); priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_sel_tool);
if (tool->display) if (tool->display)
{ {
@ -819,12 +819,12 @@ static gboolean
gimp_rect_select_tool_rectangle_changed (GimpRectangleTool *rectangle) gimp_rect_select_tool_rectangle_changed (GimpRectangleTool *rectangle)
{ {
GimpTool *tool; GimpTool *tool;
GimpRectSelectTool *rect_select; GimpRectSelectTool *rect_sel_tool;
GimpRectSelectToolPrivate *priv; GimpRectSelectToolPrivate *priv;
tool = GIMP_TOOL (rectangle); tool = GIMP_TOOL (rectangle);
rect_select = GIMP_RECT_SELECT_TOOL (tool); rect_sel_tool = GIMP_RECT_SELECT_TOOL (tool);
priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_select); priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_sel_tool);
/* prevent change in selection from halting the tool */ /* prevent change in selection from halting the tool */
gimp_tool_control_set_preserve (tool->control, TRUE); gimp_tool_control_set_preserve (tool->control, TRUE);
@ -885,15 +885,15 @@ gimp_rect_select_tool_rectangle_changed (GimpRectangleTool *rectangle)
static void static void
gimp_rect_select_tool_round_corners_notify (GimpRectSelectOptions *options, gimp_rect_select_tool_round_corners_notify (GimpRectSelectOptions *options,
GParamSpec *pspec, GParamSpec *pspec,
GimpRectSelectTool *rect_sel) GimpRectSelectTool *rect_sel_tool)
{ {
GimpDrawTool *draw_tool; GimpDrawTool *draw_tool;
GimpRectangleTool *rect_tool; GimpRectangleTool *rect_tool;
GimpRectSelectToolPrivate *priv; GimpRectSelectToolPrivate *priv;
draw_tool = GIMP_DRAW_TOOL (rect_sel); draw_tool = GIMP_DRAW_TOOL (rect_sel_tool);
rect_tool = GIMP_RECTANGLE_TOOL (rect_sel); rect_tool = GIMP_RECTANGLE_TOOL (rect_sel_tool);
priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_sel); priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_sel_tool);
gimp_draw_tool_pause (draw_tool); gimp_draw_tool_pause (draw_tool);