Revision: 49270
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49270
Author: campbellbarton
Date: 2012-07-26 22:47:05 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
code cleanup: remove unneeded 'struct' qualifiers
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/screen.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/mask/mask_edit.c
trunk/blender/source/blender/editors/space_clip/clip_editor.c
trunk/blender/source/blender/editors/space_console/console_draw.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_info/info_draw.c
trunk/blender/source/blender/editors/space_node/space_node.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/editors/transform/transform.c
Modified: trunk/blender/source/blender/blenkernel/intern/screen.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/screen.c 2012-07-26
22:41:40 UTC (rev 49269)
+++ trunk/blender/source/blender/blenkernel/intern/screen.c 2012-07-26
22:47:05 UTC (rev 49270)
@@ -356,7 +356,7 @@
/* note, using this function is generally a last resort, you really want to be
* using the context when you can - campbell
* -1 for any type */
-struct ScrArea *BKE_screen_find_big_area(struct bScreen *sc, const int
spacetype, const short min)
+ScrArea *BKE_screen_find_big_area(bScreen *sc, const int spacetype, const
short min)
{
ScrArea *sa, *big = NULL;
int size, maxsize = 0;
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c
2012-07-26 22:41:40 UTC (rev 49269)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c
2012-07-26 22:47:05 UTC (rev 49270)
@@ -1635,7 +1635,7 @@
}
/* NOTE: this is a block-menu, needs 0 events, otherwise the menu closes */
-static uiBlock *curvemap_clipping_func(bContext *C, struct ARegion *ar, void
*cumap_v)
+static uiBlock *curvemap_clipping_func(bContext *C, ARegion *ar, void *cumap_v)
{
CurveMapping *cumap = cumap_v;
uiBlock *block;
@@ -1696,7 +1696,7 @@
ED_region_tag_redraw(CTX_wm_region(C));
}
-static uiBlock *curvemap_tools_func(bContext *C, struct ARegion *ar, void
*cumap_v)
+static uiBlock *curvemap_tools_func(bContext *C, ARegion *ar, void *cumap_v)
{
uiBlock *block;
short yco = 0, menuwidth = 10 * UI_UNIT_X;
@@ -1718,7 +1718,7 @@
return block;
}
-static uiBlock *curvemap_brush_tools_func(bContext *C, struct ARegion *ar,
void *cumap_v)
+static uiBlock *curvemap_brush_tools_func(bContext *C, ARegion *ar, void
*cumap_v)
{
uiBlock *block;
short yco = 0, menuwidth = 10 * UI_UNIT_X;
Modified: trunk/blender/source/blender/editors/mask/mask_edit.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_edit.c 2012-07-26
22:41:40 UTC (rev 49269)
+++ trunk/blender/source/blender/editors/mask/mask_edit.c 2012-07-26
22:47:05 UTC (rev 49270)
@@ -130,7 +130,7 @@
/* input: x/y - mval space
* output: xr/yr - mask point space */
-void ED_mask_point_pos(struct ScrArea *sa, struct ARegion *ar, float x, float
y, float *xr, float *yr)
+void ED_mask_point_pos(ScrArea *sa, ARegion *ar, float x, float y, float *xr,
float *yr)
{
float co[2];
@@ -217,7 +217,7 @@
*yr = co[1];
}
-void ED_mask_get_size(struct ScrArea *sa, int *width, int *height)
+void ED_mask_get_size(ScrArea *sa, int *width, int *height)
{
if (sa && sa->spacedata.first) {
switch (sa->spacetype) {
@@ -255,7 +255,7 @@
}
}
-void ED_mask_zoom(struct ScrArea *sa, struct ARegion *ar, float *zoomx, float
*zoomy)
+void ED_mask_zoom(ScrArea *sa, ARegion *ar, float *zoomx, float *zoomy)
{
if (sa && sa->spacedata.first) {
switch (sa->spacetype) {
@@ -289,7 +289,7 @@
}
}
-void ED_mask_get_aspect(struct ScrArea *sa, struct ARegion *UNUSED(ar), float
*aspx, float *aspy)
+void ED_mask_get_aspect(ScrArea *sa, ARegion *UNUSED(ar), float *aspx, float
*aspy)
{
if (sa && sa->spacedata.first) {
switch (sa->spacetype) {
@@ -323,7 +323,7 @@
}
}
-void ED_mask_pixelspace_factor(struct ScrArea *sa, struct ARegion *ar, float
*scalex, float *scaley)
+void ED_mask_pixelspace_factor(ScrArea *sa, ARegion *ar, float *scalex, float
*scaley)
{
if (sa && sa->spacedata.first) {
switch (sa->spacetype) {
Modified: trunk/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_editor.c
2012-07-26 22:41:40 UTC (rev 49269)
+++ trunk/blender/source/blender/editors/space_clip/clip_editor.c
2012-07-26 22:47:05 UTC (rev 49270)
@@ -124,7 +124,7 @@
/* ******** common editing functions ******** */
-void ED_space_clip_get_size(struct SpaceClip *sc, int *width, int *height)
+void ED_space_clip_get_size(SpaceClip *sc, int *width, int *height)
{
if (sc->clip) {
BKE_movieclip_get_size(sc->clip, &sc->user, width, height);
@@ -134,7 +134,7 @@
}
}
-void ED_space_clip_get_size_fl(struct SpaceClip *sc, float size[2])
+void ED_space_clip_get_size_fl(SpaceClip *sc, float size[2])
{
int size_i[2];
ED_space_clip_get_size(sc, &size_i[0], &size_i[1]);
@@ -142,7 +142,7 @@
size[1] = size_i[1];
}
-void ED_space_clip_get_zoom(struct SpaceClip *sc, struct ARegion *ar, float
*zoomx, float *zoomy)
+void ED_space_clip_get_zoom(SpaceClip *sc, ARegion *ar, float *zoomx, float
*zoomy)
{
int width, height;
@@ -381,7 +381,7 @@
}
}
-void ED_clip_point_stable_pos(struct SpaceClip *sc, struct ARegion *ar, float
x, float y, float *xr, float *yr)
+void ED_clip_point_stable_pos(SpaceClip *sc, ARegion *ar, float x, float y,
float *xr, float *yr)
{
int sx, sy, width, height;
float zoomx, zoomy, pos[3], imat[4][4];
@@ -418,7 +418,7 @@
* \brief the reverse of ED_clip_point_stable_pos(), gets the marker region
coords.
* better name here? view_to_track / track_to_view or so?
*/
-void ED_clip_point_stable_pos__reverse(struct SpaceClip *sc, struct ARegion
*ar, const float co[2], float r_co[2])
+void ED_clip_point_stable_pos__reverse(SpaceClip *sc, ARegion *ar, const float
co[2], float r_co[2])
{
float zoomx, zoomy;
float pos[3];
@@ -439,7 +439,7 @@
r_co[1] = (pos[1] * height * zoomy) + (float)sy;
}
-void ED_clip_mouse_pos(struct SpaceClip *sc, struct ARegion *ar, wmEvent
*event, float co[2])
+void ED_clip_mouse_pos(SpaceClip *sc, ARegion *ar, wmEvent *event, float co[2])
{
ED_clip_point_stable_pos(sc, ar, event->mval[0], event->mval[1],
&co[0], &co[1]);
}
Modified: trunk/blender/source/blender/editors/space_console/console_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_console/console_draw.c
2012-07-26 22:41:40 UTC (rev 49269)
+++ trunk/blender/source/blender/editors/space_console/console_draw.c
2012-07-26 22:47:05 UTC (rev 49270)
@@ -191,7 +191,7 @@
}
-static int console_textview_main__internal(struct SpaceConsole *sc, struct
ARegion *ar, int draw, int mval[2], void **mouse_pick, int *pos_pick)
+static int console_textview_main__internal(struct SpaceConsole *sc, ARegion
*ar, int draw, int mval[2], void **mouse_pick, int *pos_pick)
{
ConsoleLine cl_dummy = {NULL};
int ret = 0;
@@ -226,19 +226,19 @@
}
-void console_textview_main(struct SpaceConsole *sc, struct ARegion *ar)
+void console_textview_main(struct SpaceConsole *sc, ARegion *ar)
{
int mval[2] = {INT_MAX, INT_MAX};
console_textview_main__internal(sc, ar, 1, mval, NULL, NULL);
}
-int console_textview_height(struct SpaceConsole *sc, struct ARegion *ar)
+int console_textview_height(struct SpaceConsole *sc, ARegion *ar)
{
int mval[2] = {INT_MAX, INT_MAX};
return console_textview_main__internal(sc, ar, 0, mval, NULL, NULL);
}
-int console_char_pick(struct SpaceConsole *sc, struct ARegion *ar, int mval[2])
+int console_char_pick(struct SpaceConsole *sc, ARegion *ar, int mval[2])
{
int pos_pick = 0;
void *mouse_pick = NULL;
Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c 2012-07-26
22:41:40 UTC (rev 49269)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c 2012-07-26
22:47:05 UTC (rev 49270)
@@ -70,7 +70,7 @@
#define INACTIVATE 2
/* ---------- FILE SELECTION ------------ */
-static FileSelection find_file_mouse_rect(SpaceFile *sfile, struct ARegion
*ar, const rcti *rect)
+static FileSelection find_file_mouse_rect(SpaceFile *sfile, ARegion *ar, const
rcti *rect)
{
FileSelection sel;
float fxmin, fymin, fxmax, fymax;
@@ -1277,7 +1277,7 @@
ot->poll = ED_operator_file_active; /* <- important, handler is on
window level */
}
-struct ARegion *file_buttons_region(struct ScrArea *sa)
+ARegion *file_buttons_region(ScrArea *sa)
{
ARegion *ar, *arnew;
Modified: trunk/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filesel.c 2012-07-26
22:41:40 UTC (rev 49269)
+++ trunk/blender/source/blender/editors/space_file/filesel.c 2012-07-26
22:47:05 UTC (rev 49270)
@@ -265,7 +265,7 @@
sfile->params->title[0] = '\0';
}
-int ED_fileselect_layout_numfiles(FileLayout *layout, struct ARegion *ar)
+int ED_fileselect_layout_numfiles(FileLayout *layout, ARegion *ar)
{
int numfiles;
@@ -472,7 +472,7 @@
}
}
-void ED_fileselect_init_layout(struct SpaceFile *sfile, struct ARegion *ar)
+void ED_fileselect_init_layout(struct SpaceFile *sfile, ARegion *ar)
{
FileSelectParams *params = ED_fileselect_get_params(sfile);
FileLayout *layout = NULL;
@@ -559,7 +559,7 @@
layout->dirty = FALSE;
}
-FileLayout *ED_fileselect_get_layout(struct SpaceFile *sfile, struct ARegion
*ar)
+FileLayout *ED_fileselect_get_layout(struct SpaceFile *sfile, ARegion *ar)
{
if (!sfile->layout) {
ED_fileselect_init_layout(sfile, ar);
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c
2012-07-26 22:41:40 UTC (rev 49269)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c
2012-07-26 22:47:05 UTC (rev 49270)
@@ -258,7 +258,7 @@
/* nothing drawn here, we use it to store values */
-static void preview_cb(struct ScrArea *sa, struct uiBlock *block)
+static void preview_cb(ScrArea *sa, struct uiBlock *block)
{
SpaceImage *sima = sa->spacedata.first;
rctf dispf;
Modified: trunk/blender/source/blender/editors/space_info/info_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/info_draw.c 2012-07-26
22:41:40 UTC (rev 49269)
+++ trunk/blender/source/blender/editors/space_info/info_draw.c 2012-07-26
22:47:05 UTC (rev 49270)
@@ -249,7 +249,7 @@
#undef USE_INFO_NEWLINE
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
