code cleanup: remove unneeded 'struct' qualifiers
This commit is contained in:
parent
ff078d309e
commit
61469d2e3e
@ -356,7 +356,7 @@ ARegion *BKE_area_find_region_type(ScrArea *sa, int type)
|
||||
/* 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;
|
||||
|
@ -1635,7 +1635,7 @@ static void curvemap_buttons_delete(bContext *C, void *cb_v, void *cumap_v)
|
||||
}
|
||||
|
||||
/* 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 @@ static void curvemap_tools_dofunc(bContext *C, void *cumap_v, int event)
|
||||
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 @@ static uiBlock *curvemap_tools_func(bContext *C, struct ARegion *ar, void *cumap
|
||||
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;
|
||||
|
@ -130,7 +130,7 @@ void ED_mask_mouse_pos(ScrArea *sa, ARegion *ar, wmEvent *event, float co[2])
|
||||
|
||||
/* 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 @@ void ED_mask_point_pos__reverse(ScrArea *sa, ARegion *ar, float x, float y, floa
|
||||
*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_get_size(struct ScrArea *sa, int *width, int *height)
|
||||
}
|
||||
}
|
||||
|
||||
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_zoom(struct ScrArea *sa, struct ARegion *ar, float *zoomx, float *z
|
||||
}
|
||||
}
|
||||
|
||||
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_get_aspect(struct ScrArea *sa, struct ARegion *UNUSED(ar), float *a
|
||||
}
|
||||
}
|
||||
|
||||
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) {
|
||||
|
@ -124,7 +124,7 @@ int ED_space_clip_maskedit_mask_poll(bContext *C)
|
||||
|
||||
/* ******** 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(struct SpaceClip *sc, int *width, int *height)
|
||||
}
|
||||
}
|
||||
|
||||
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 @@ void ED_space_clip_get_size_fl(struct SpaceClip *sc, float size[2])
|
||||
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_undistorted_pos(SpaceClip *sc, const float co[2], float r_co[
|
||||
}
|
||||
}
|
||||
|
||||
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 @@ void ED_clip_point_stable_pos(struct SpaceClip *sc, struct ARegion *ar, float x,
|
||||
* \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 @@ void ED_clip_point_stable_pos__reverse(struct SpaceClip *sc, struct ARegion *ar,
|
||||
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]);
|
||||
}
|
||||
|
@ -191,7 +191,7 @@ static int console_textview_line_color(struct TextViewContext *tvc, unsigned cha
|
||||
}
|
||||
|
||||
|
||||
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 @@ static int console_textview_main__internal(struct SpaceConsole *sc, struct ARegi
|
||||
}
|
||||
|
||||
|
||||
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;
|
||||
|
@ -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 @@ void FILE_OT_hidedot(struct wmOperatorType *ot)
|
||||
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;
|
||||
|
||||
|
@ -265,7 +265,7 @@ void ED_fileselect_reset_params(SpaceFile *sfile)
|
||||
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 @@ static void column_widths(struct FileList *files, struct FileLayout *layout)
|
||||
}
|
||||
}
|
||||
|
||||
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 @@ void ED_fileselect_init_layout(struct SpaceFile *sfile, struct ARegion *ar)
|
||||
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);
|
||||
|
@ -258,7 +258,7 @@ void image_preview_event(int event)
|
||||
|
||||
|
||||
/* 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;
|
||||
|
@ -249,7 +249,7 @@ static int report_textview_line_color(struct TextViewContext *tvc, unsigned char
|
||||
|
||||
#undef USE_INFO_NEWLINE
|
||||
|
||||
static int info_textview_main__internal(struct SpaceInfo *sinfo, struct ARegion *ar, ReportList *reports, int draw, int mval[2], void **mouse_pick, int *pos_pick)
|
||||
static int info_textview_main__internal(struct SpaceInfo *sinfo, ARegion *ar, ReportList *reports, int draw, int mval[2], void **mouse_pick, int *pos_pick)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
@ -279,7 +279,7 @@ static int info_textview_main__internal(struct SpaceInfo *sinfo, struct ARegion
|
||||
return ret;
|
||||
}
|
||||
|
||||
void *info_text_pick(struct SpaceInfo *sinfo, struct ARegion *ar, ReportList *reports, int mouse_y)
|
||||
void *info_text_pick(struct SpaceInfo *sinfo, ARegion *ar, ReportList *reports, int mouse_y)
|
||||
{
|
||||
void *mouse_pick = NULL;
|
||||
int mval[2];
|
||||
@ -292,13 +292,13 @@ void *info_text_pick(struct SpaceInfo *sinfo, struct ARegion *ar, ReportList *re
|
||||
}
|
||||
|
||||
|
||||
int info_textview_height(struct SpaceInfo *sinfo, struct ARegion *ar, ReportList *reports)
|
||||
int info_textview_height(struct SpaceInfo *sinfo, ARegion *ar, ReportList *reports)
|
||||
{
|
||||
int mval[2] = {INT_MAX, INT_MAX};
|
||||
return info_textview_main__internal(sinfo, ar, reports, 0, mval, NULL, NULL);
|
||||
}
|
||||
|
||||
void info_textview_main(struct SpaceInfo *sinfo, struct ARegion *ar, ReportList *reports)
|
||||
void info_textview_main(struct SpaceInfo *sinfo, ARegion *ar, ReportList *reports)
|
||||
{
|
||||
int mval[2] = {INT_MAX, INT_MAX};
|
||||
info_textview_main__internal(sinfo, ar, reports, 1, mval, NULL, NULL);
|
||||
|
@ -263,7 +263,7 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn)
|
||||
}
|
||||
}
|
||||
|
||||
static void node_area_refresh(const struct bContext *C, struct ScrArea *sa)
|
||||
static void node_area_refresh(const struct bContext *C, ScrArea *sa)
|
||||
{
|
||||
/* default now: refresh node is starting preview */
|
||||
SpaceNode *snode = sa->spacedata.first;
|
||||
|
@ -984,7 +984,7 @@ static void view3d_props_area_listener(ARegion *ar, wmNotifier *wmn)
|
||||
}
|
||||
|
||||
/*area (not region) level listener*/
|
||||
static void space_view3d_listener(struct ScrArea *sa, struct wmNotifier *wmn)
|
||||
static void space_view3d_listener(ScrArea *sa, struct wmNotifier *wmn)
|
||||
{
|
||||
View3D *v3d = sa->spacedata.first;
|
||||
|
||||
|
@ -3648,7 +3648,7 @@ int ED_view3d_autodist_simple(ARegion *ar, const int mval[2], float mouse_worldl
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ED_view3d_autodist_depth(struct ARegion *ar, const int mval[2], int margin, float *depth)
|
||||
int ED_view3d_autodist_depth(ARegion *ar, const int mval[2], int margin, float *depth)
|
||||
{
|
||||
*depth = view_autodist_depth_margin(ar, mval, margin);
|
||||
|
||||
@ -3657,7 +3657,7 @@ int ED_view3d_autodist_depth(struct ARegion *ar, const int mval[2], int margin,
|
||||
|
||||
static int depth_segment_cb(int x, int y, void *userData)
|
||||
{
|
||||
struct { struct ARegion *ar; int margin; float depth; } *data = userData;
|
||||
struct { ARegion *ar; int margin; float depth; } *data = userData;
|
||||
int mval[2];
|
||||
float depth;
|
||||
|
||||
@ -3675,10 +3675,10 @@ static int depth_segment_cb(int x, int y, void *userData)
|
||||
}
|
||||
}
|
||||
|
||||
int ED_view3d_autodist_depth_seg(struct ARegion *ar, const int mval_sta[2], const int mval_end[2],
|
||||
int ED_view3d_autodist_depth_seg(ARegion *ar, const int mval_sta[2], const int mval_end[2],
|
||||
int margin, float *depth)
|
||||
{
|
||||
struct { struct ARegion *ar; int margin; float depth; } data = {NULL};
|
||||
struct { ARegion *ar; int margin; float depth; } data = {NULL};
|
||||
int p1[2];
|
||||
int p2[2];
|
||||
|
||||
|
@ -219,7 +219,7 @@ typedef struct FlyInfo {
|
||||
|
||||
} FlyInfo;
|
||||
|
||||
static void drawFlyPixel(const struct bContext *UNUSED(C), struct ARegion *UNUSED(ar), void *arg)
|
||||
static void drawFlyPixel(const struct bContext *UNUSED(C), ARegion *UNUSED(ar), void *arg)
|
||||
{
|
||||
FlyInfo *fly = arg;
|
||||
|
||||
|
@ -94,7 +94,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
static void drawTransformApply(const struct bContext *C, struct ARegion *ar, void *arg);
|
||||
static void drawTransformApply(const struct bContext *C, ARegion *ar, void *arg);
|
||||
static int doEdgeSlide(TransInfo *t, float perc);
|
||||
|
||||
/* ************************** SPACE DEPENDANT CODE **************************** */
|
||||
@ -1497,7 +1497,7 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata)
|
||||
}
|
||||
}
|
||||
|
||||
static void drawTransformView(const struct bContext *C, struct ARegion *UNUSED(ar), void *arg)
|
||||
static void drawTransformView(const struct bContext *C, ARegion *UNUSED(ar), void *arg)
|
||||
{
|
||||
TransInfo *t = arg;
|
||||
|
||||
@ -1508,7 +1508,7 @@ static void drawTransformView(const struct bContext *C, struct ARegion *UNUSED(a
|
||||
}
|
||||
|
||||
#if 0
|
||||
static void drawTransformPixel(const struct bContext *UNUSED(C), struct ARegion *UNUSED(ar), void *UNUSED(arg))
|
||||
static void drawTransformPixel(const struct bContext *UNUSED(C), ARegion *UNUSED(ar), void *UNUSED(arg))
|
||||
{
|
||||
// TransInfo *t = arg;
|
||||
//
|
||||
@ -1949,7 +1949,7 @@ void transformApply(bContext *C, TransInfo *t)
|
||||
t->context = NULL;
|
||||
}
|
||||
|
||||
static void drawTransformApply(const bContext *C, struct ARegion *UNUSED(ar), void *arg)
|
||||
static void drawTransformApply(const bContext *C, ARegion *UNUSED(ar), void *arg)
|
||||
{
|
||||
TransInfo *t = arg;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user