Cleanup: use r_* prefix for return args
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 May 2015 21:25:39 +0000 (07:25 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 May 2015 21:25:39 +0000 (07:25 +1000)
19 files changed:
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/BKE_movieclip.h
source/blender/blenkernel/BKE_tracking.h
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/packedFile.c
source/blender/blenkernel/intern/tracking.c
source/blender/editors/include/BIF_glutil.h
source/blender/editors/include/ED_image.h
source/blender/editors/screen/glutil.c
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_image/image_edit.c
source/blender/makesrna/intern/rna_sequencer.c
source/blender/windowmanager/WM_keymap.h
source/blender/windowmanager/intern/wm_keymap.c
source/blender/windowmanager/intern/wm_playanim.c
source/blender/windowmanager/intern/wm_window.c
source/blender/windowmanager/wm_window.h
source/blenderplayer/bad_level_call_stubs/stubs.c

index 155f26d9bd9593305f16d836f2862ac075b04ac6..a49301eebee4b671d9eec8187b040e73bda7df3d 100644 (file)
@@ -155,7 +155,7 @@ bool BKE_image_has_ibuf(struct Image *ima, struct ImageUser *iuser);
 
 /* same as above, but can be used to retrieve images being rendered in
  * a thread safe way, always call both acquire and release */
-struct ImBuf *BKE_image_acquire_ibuf(struct Image *ima, struct ImageUser *iuser, void **lock_r);
+struct ImBuf *BKE_image_acquire_ibuf(struct Image *ima, struct ImageUser *iuser, void **r_lock);
 void BKE_image_release_ibuf(struct Image *ima, struct ImBuf *ibuf, void *lock);
 
 struct ImagePool *BKE_image_pool_new(void);
index 2cdd2ec88e0101b8e6218d55ebe19a172f7e33f7..7d7675270dec0353cf6c74d661dfb16c08f0cf2a 100644 (file)
@@ -60,7 +60,7 @@ void BKE_movieclip_user_set_frame(struct MovieClipUser *user, int framenr);
 
 void BKE_movieclip_update_scopes(struct MovieClip *clip, struct MovieClipUser *user, struct MovieClipScopes *scopes);
 
-void BKE_movieclip_get_cache_segments(struct MovieClip *clip, struct MovieClipUser *user, int *totseg_r, int **points_r);
+void BKE_movieclip_get_cache_segments(struct MovieClip *clip, struct MovieClipUser *user, int *r_totseg, int **r_points);
 
 void BKE_movieclip_build_proxy_frame(struct MovieClip *clip, int clip_flag, struct MovieDistortion *distortion,
                                      int cfra, int *build_sizes, int build_count, bool undistorted);
index ea56c084fb5d338720827464fd46234bd1cc95eb..b03a234e1e725bd5b4601c71f036da2d8c0bfac3 100644 (file)
@@ -90,7 +90,7 @@ struct MovieTrackingTrack *BKE_tracking_track_get_named(struct MovieTracking *tr
                                                         struct MovieTrackingObject *object,
                                                         const char *name);
 struct MovieTrackingTrack *BKE_tracking_track_get_indexed(struct MovieTracking *tracking, int tracknr,
-                                                          struct ListBase **tracksbase_r);
+                                                          struct ListBase **r_tracksbase);
 
 struct MovieTrackingTrack *BKE_tracking_track_get_active(struct MovieTracking *tracking);
 
index 5169559d80b1d2635b32d41a8c78e8f826903da9..4275b0200d0e800b23ed9dd4ffaa9626163aa887 100644 (file)
@@ -101,7 +101,7 @@ static SpinLock image_spin;
 
 /* prototypes */
 static size_t image_num_files(struct Image *ima);
-static ImBuf *image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r);
+static ImBuf *image_acquire_ibuf(Image *ima, ImageUser *iuser, void **r_lock);
 static void image_update_views_format(Image *ima, ImageUser *iuser);
 static void image_add_view(Image *ima, const char *viewname, const char *filepath);
 
@@ -3522,7 +3522,7 @@ static ImBuf *image_get_ibuf_multilayer(Image *ima, ImageUser *iuser)
 /* showing RGBA result itself (from compo/sequence) or
  * like exr, using layers etc */
 /* always returns a single ibuf, also during render progress */
-static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_r)
+static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **r_lock)
 {
        Render *re;
        RenderResult rres;
@@ -3540,7 +3540,7 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
                return NULL;
 
        /* if we the caller is not going to release the lock, don't give the image */
-       if (!lock_r)
+       if (!r_lock)
                return NULL;
 
        re = RE_GetRender(iuser->scene->id.name);
@@ -3569,10 +3569,10 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
                return NULL;
        }
 
-       /* release is done in BKE_image_release_ibuf using lock_r */
+       /* release is done in BKE_image_release_ibuf using r_lock */
        if (from_render) {
                BLI_lock_thread(LOCK_VIEWER);
-               *lock_r = re;
+               *r_lock = re;
                rv = NULL;
        }
        else {
@@ -3855,13 +3855,13 @@ BLI_INLINE bool image_quick_test(Image *ima, ImageUser *iuser)
  *
  * not thread-safe, so callee should worry about thread locks
  */
-static ImBuf *image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
+static ImBuf *image_acquire_ibuf(Image *ima, ImageUser *iuser, void **r_lock)
 {
        ImBuf *ibuf = NULL;
        int frame = 0, index = 0;
 
-       if (lock_r)
-               *lock_r = NULL;
+       if (r_lock)
+               *r_lock = NULL;
 
        /* quick reject tests */
        if (!image_quick_test(ima, iuser))
@@ -3910,14 +3910,14 @@ static ImBuf *image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
                        if (ima->type == IMA_TYPE_R_RESULT) {
                                /* always verify entirely, and potentially
                                 * returns pointer to release later */
-                               ibuf = image_get_render_result(ima, iuser, lock_r);
+                               ibuf = image_get_render_result(ima, iuser, r_lock);
                        }
                        else if (ima->type == IMA_TYPE_COMPOSITE) {
                                /* requires lock/unlock, otherwise don't return image */
-                               if (lock_r) {
+                               if (r_lock) {
                                        /* unlock in BKE_image_release_ibuf */
                                        BLI_lock_thread(LOCK_VIEWER);
-                                       *lock_r = ima;
+                                       *r_lock = ima;
 
                                        /* XXX anim play for viewer nodes not yet supported */
                                        frame = 0; // XXX iuser ? iuser->framenr : 0;
@@ -3951,13 +3951,13 @@ static ImBuf *image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
  *
  * references the result, BKE_image_release_ibuf should be used to de-reference
  */
-ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
+ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **r_lock)
 {
        ImBuf *ibuf;
 
        BLI_spin_lock(&image_spin);
 
-       ibuf = image_acquire_ibuf(ima, iuser, lock_r);
+       ibuf = image_acquire_ibuf(ima, iuser, r_lock);
 
        BLI_spin_unlock(&image_spin);
 
index 1aeb7bed86c4025338f749f8fd709438f4d325a1..f063933f3f91553c16f8a513328aa7fcabf880b6 100644 (file)
@@ -1129,15 +1129,15 @@ void BKE_movieclip_get_aspect(MovieClip *clip, float *aspx, float *aspy)
 }
 
 /* get segments of cached frames. useful for debugging cache policies */
-void BKE_movieclip_get_cache_segments(MovieClip *clip, MovieClipUser *user, int *totseg_r, int **points_r)
+void BKE_movieclip_get_cache_segments(MovieClip *clip, MovieClipUser *user, int *r_totseg, int **r_points)
 {
-       *totseg_r = 0;
-       *points_r = NULL;
+       *r_totseg = 0;
+       *r_points = NULL;
 
        if (clip->cache) {
                int proxy = rendersize_to_proxy(user, clip->flag);
 
-               IMB_moviecache_get_cache_segments(clip->cache->moviecache, proxy, user->render_flag, totseg_r, points_r);
+               IMB_moviecache_get_cache_segments(clip->cache->moviecache, proxy, user->render_flag, r_totseg, r_points);
        }
 }
 
index 6821252161778c80a3b5e88b8a4847b7dd3a3c4c..800df252c69ccc23ec7f7ef33770ea35414b6ccb 100644 (file)
@@ -478,7 +478,7 @@ char *unpackFile(ReportList *reports, const char *abs_name, const char *local_na
 }
 
 static void unpack_generate_paths(
-        const char *name, ID *id, char *abspath_r, char *relpath_r, size_t abspathlen, size_t relpathlen)
+        const char *name, ID *id, char *r_abspath, char *r_relpath, size_t abspathlen, size_t relpathlen)
 {
        char tempname[FILE_MAX];
        char tempdir[FILE_MAXDIR];
@@ -500,19 +500,19 @@ static void unpack_generate_paths(
 
        switch (GS(id->name)) {
                case ID_VF:
-                       BLI_snprintf(relpath_r, relpathlen, "//fonts/%s", tempname);
+                       BLI_snprintf(r_relpath, relpathlen, "//fonts/%s", tempname);
                        break;
                case ID_SO:
-                       BLI_snprintf(relpath_r, relpathlen, "//sounds/%s", tempname);
+                       BLI_snprintf(r_relpath, relpathlen, "//sounds/%s", tempname);
                        break;
                case ID_IM:
-                       BLI_snprintf(relpath_r, relpathlen, "//textures/%s", tempname);
+                       BLI_snprintf(r_relpath, relpathlen, "//textures/%s", tempname);
                        break;
        }
 
        {
-               size_t len = BLI_strncpy_rlen(abspath_r, tempdir, abspathlen);
-               BLI_strncpy(abspath_r + len, tempname, abspathlen - len);
+               size_t len = BLI_strncpy_rlen(r_abspath, tempdir, abspathlen);
+               BLI_strncpy(r_abspath + len, tempname, abspathlen - len);
        }
 }
 
index e3f04296f50cfcea966bd0e5595904c42bee30fd..f9ae987db7071d19787c5b1438c7bd42713495e0 100644 (file)
@@ -730,7 +730,7 @@ MovieTrackingTrack *BKE_tracking_track_get_named(MovieTracking *tracking, MovieT
        return NULL;
 }
 
-MovieTrackingTrack *BKE_tracking_track_get_indexed(MovieTracking *tracking, int tracknr, ListBase **tracksbase_r)
+MovieTrackingTrack *BKE_tracking_track_get_indexed(MovieTracking *tracking, int tracknr, ListBase **r_tracksbase)
 {
        MovieTrackingObject *object;
        int cur = 1;
@@ -743,7 +743,7 @@ MovieTrackingTrack *BKE_tracking_track_get_indexed(MovieTracking *tracking, int
                while (track) {
                        if (track->flag & TRACK_HAS_BUNDLE) {
                                if (cur == tracknr) {
-                                       *tracksbase_r = tracksbase;
+                                       *r_tracksbase = tracksbase;
                                        return track;
                                }
 
@@ -756,7 +756,7 @@ MovieTrackingTrack *BKE_tracking_track_get_indexed(MovieTracking *tracking, int
                object = object->next;
        }
 
-       *tracksbase_r = NULL;
+       *r_tracksbase = NULL;
 
        return NULL;
 }
index 4dc39681ed2c6120951c40aad5f09d0cffbf158d..b904417cfcb1e3b0898cc499c79c51f7285c6da8 100644 (file)
@@ -181,8 +181,8 @@ typedef struct gla2DDrawInfo gla2DDrawInfo;
 #if 0
 
 gla2DDrawInfo  *glaBegin2DDraw(struct rcti *screen_rect, struct rctf *world_rect);
-void gla2DDrawTranslatePt(gla2DDrawInfo *di, float wo_x, float wo_y, int *sc_x_r, int *sc_y_r);
-void gla2DDrawTranslatePtv(gla2DDrawInfo *di, float world[2], int screen_r[2]);
+void gla2DDrawTranslatePt(gla2DDrawInfo *di, float wo_x, float wo_y, int *r_sc_x, int *r_sc_y);
+void gla2DDrawTranslatePtv(gla2DDrawInfo *di, float world[2], int r_screen[2]);
 
 void glaEnd2DDraw(gla2DDrawInfo *di);
 
index fc42d2b549563b020f9cffd04b5ac2c6dcf074e9..f49d4b508c6803b3032d98c768c7b895f41d246a 100644 (file)
@@ -47,7 +47,7 @@ struct Mask  *ED_space_image_get_mask(struct SpaceImage *sima);
 void          ED_space_image_set_mask(struct bContext *C, struct SpaceImage *sima, struct Mask *mask);
 
 bool ED_space_image_color_sample(struct Scene *scene, struct SpaceImage *sima, struct ARegion *ar, int mval[2], float r_col[3]);
-struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **lock_r);
+struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **r_lock);
 void ED_space_image_release_buffer(struct SpaceImage *sima, struct ImBuf *ibuf, void *lock);
 bool ED_space_image_has_buffer(struct SpaceImage *sima);
 
index 8a8b61e09fe023d040a863a6f8c5f609f432e581..fd65d81baadcadb331ecbe803355f25dbdaf6dfa 100644 (file)
@@ -841,7 +841,7 @@ void gla2DDrawTranslatePt(gla2DDrawInfo *di, float wo_x, float wo_y, int *r_sc_x
 /**
  * Translate the \a world point from world coordinates into screen space.
  */
-void gla2DDrawTranslatePtv(gla2DDrawInfo *di, float world[2], int screen_r[2])
+void gla2DDrawTranslatePtv(gla2DDrawInfo *di, float world[2], int r_screen[2])
 {
        screen_r[0] = (world[0] - di->world_rect.xmin) * di->wo_to_sc[0];
        screen_r[1] = (world[1] - di->world_rect.ymin) * di->wo_to_sc[1];
index 89693a403fe60bd7f33ea22a66145eaff1076bf6..9acb9f3effc02dac34c2b3307076cbb3840373e9 100644 (file)
@@ -626,8 +626,9 @@ static bool check_prefetch_break(void)
 }
 
 /* read file for specified frame number to the memory */
-static unsigned char *prefetch_read_file_to_memory(MovieClip *clip, int current_frame, short render_size,
-                                                   short render_flag, size_t *size_r)
+static unsigned char *prefetch_read_file_to_memory(
+        MovieClip *clip, int current_frame, short render_size, short render_flag,
+        size_t *r_size)
 {
        MovieClipUser user = {0};
        char name[FILE_MAX];
@@ -660,7 +661,7 @@ static unsigned char *prefetch_read_file_to_memory(MovieClip *clip, int current_
                return NULL;
        }
 
-       *size_r = size;
+       *r_size = size;
 
        close(file);
 
@@ -698,8 +699,9 @@ static int prefetch_find_uncached_frame(MovieClip *clip, int from_frame, int end
 }
 
 /* get memory buffer for first uncached frame within prefetch frame range */
-static unsigned char *prefetch_thread_next_frame(PrefetchQueue *queue, MovieClip *clip,
-                                                 size_t *size_r, int *current_frame_r)
+static unsigned char *prefetch_thread_next_frame(
+        PrefetchQueue *queue, MovieClip *clip,
+        size_t *r_size, int *r_current_frame)
 {
        unsigned char *mem = NULL;
 
@@ -728,9 +730,9 @@ static unsigned char *prefetch_thread_next_frame(PrefetchQueue *queue, MovieClip
                        int frames_processed;
 
                        mem = prefetch_read_file_to_memory(clip, current_frame, queue->render_size,
-                                                          queue->render_flag, size_r);
+                                                          queue->render_flag, r_size);
 
-                       *current_frame_r = current_frame;
+                       *r_current_frame = current_frame;
 
                        queue->current_frame = current_frame;
 
index 19fa068a693450548f754aae3072aab0143aa0a5..38c9604d14b6b12f28e10d39a99c804243569a83 100644 (file)
@@ -104,7 +104,7 @@ void ED_space_image_set_mask(bContext *C, SpaceImage *sima, Mask *mask)
        }
 }
 
-ImBuf *ED_space_image_acquire_buffer(SpaceImage *sima, void **lock_r)
+ImBuf *ED_space_image_acquire_buffer(SpaceImage *sima, void **r_lock)
 {
        ImBuf *ibuf;
 
@@ -114,7 +114,7 @@ ImBuf *ED_space_image_acquire_buffer(SpaceImage *sima, void **lock_r)
                        return BIF_render_spare_imbuf();
                else
 #endif
-               ibuf = BKE_image_acquire_ibuf(sima->image, &sima->iuser, lock_r);
+               ibuf = BKE_image_acquire_ibuf(sima->image, &sima->iuser, r_lock);
 
                if (ibuf) {
                        if (ibuf->rect || ibuf->rect_float)
@@ -124,7 +124,7 @@ ImBuf *ED_space_image_acquire_buffer(SpaceImage *sima, void **lock_r)
                }
        }
        else
-               *lock_r = NULL;
+               *r_lock = NULL;
 
        return NULL;
 }
index 052744a9864124ecc908194193d9e620165c6dbf..df996c8f31a3a3e4504433874939f99c3a9fc888 100644 (file)
@@ -809,7 +809,7 @@ static int colbalance_seq_cmp_cb(Sequence *seq, void *arg_pt)
        return 1;
 }
 
-static Sequence *sequence_get_by_colorbalance(Editing *ed, StripColorBalance *cb, SequenceModifierData **smd_r)
+static Sequence *sequence_get_by_colorbalance(Editing *ed, StripColorBalance *cb, SequenceModifierData **r_smd)
 {
        SequenceSearchData data;
 
@@ -820,7 +820,7 @@ static Sequence *sequence_get_by_colorbalance(Editing *ed, StripColorBalance *cb
        /* irritating we need to search for our sequence! */
        BKE_sequencer_base_recursive_apply(&ed->seqbase, colbalance_seq_cmp_cb, &data);
 
-       *smd_r = data.smd;
+       *r_smd = data.smd;
 
        return data.seq;
 }
index c6c7314e963df4f95f68f2b8b49fcf17a5b1d301..fdde28c6bf18927a7348452f8cbb8413a848264e 100644 (file)
@@ -101,7 +101,8 @@ int                 WM_keymap_map_type_get(struct wmKeyMapItem *kmi);
 const char *WM_key_event_string(short type);
 int         WM_key_event_operator_id(
         const struct bContext *C, const char *opname, int opcontext,
-        struct IDProperty *properties, const bool is_hotkey, struct wmKeyMap **keymap_r);
+        struct IDProperty *properties, const bool is_hotkey,
+        struct wmKeyMap **r_keymap);
 char       *WM_key_event_operator_string(
         const struct bContext *C, const char *opname, int opcontext,
         struct IDProperty *properties, const bool is_strict, char *str, int len);
index 82e46c1b333293e8fc1380592857882fce657327..0ee1f9f7eebe1d7c5fbd544185be958545fc82c6 100644 (file)
@@ -929,7 +929,8 @@ int WM_keymap_item_to_string(wmKeyMapItem *kmi, char *str, const int len)
 
 static wmKeyMapItem *wm_keymap_item_find_handlers(
         const bContext *C, ListBase *handlers, const char *opname, int UNUSED(opcontext),
-        IDProperty *properties, const bool is_strict, const bool is_hotkey, wmKeyMap **keymap_r)
+        IDProperty *properties, const bool is_strict, const bool is_hotkey,
+        wmKeyMap **r_keymap)
 {
        wmWindowManager *wm = CTX_wm_manager(C);
        wmEventHandler *handler;
@@ -966,7 +967,7 @@ static wmKeyMapItem *wm_keymap_item_find_handlers(
 #endif
 
                                                if (kmi->ptr && IDP_EqualsProperties_ex(properties, kmi->ptr->data, is_strict)) {
-                                                       if (keymap_r) *keymap_r = keymap;
+                                                       if (r_keymap) *r_keymap = keymap;
                                                        return kmi;
                                                }
                                                /* Debug only, helps spotting mismatches between menu entries and shortcuts! */
@@ -1004,7 +1005,7 @@ static wmKeyMapItem *wm_keymap_item_find_handlers(
                                                }
                                        }
                                        else {
-                                               if (keymap_r) *keymap_r = keymap;
+                                               if (r_keymap) *r_keymap = keymap;
                                                return kmi;
                                        }
                                }
@@ -1013,13 +1014,14 @@ static wmKeyMapItem *wm_keymap_item_find_handlers(
        }
        
        /* ensure un-initialized keymap is never used */
-       if (keymap_r) *keymap_r = NULL;
+       if (r_keymap) *r_keymap = NULL;
        return NULL;
 }
 
 static wmKeyMapItem *wm_keymap_item_find_props(
         const bContext *C, const char *opname, int opcontext,
-        IDProperty *properties, const bool is_strict, const bool is_hotkey, wmKeyMap **keymap_r)
+        IDProperty *properties, const bool is_strict, const bool is_hotkey,
+        wmKeyMap **r_keymap)
 {
        wmWindow *win = CTX_wm_window(C);
        ScrArea *sa = CTX_wm_area(C);
@@ -1028,10 +1030,10 @@ static wmKeyMapItem *wm_keymap_item_find_props(
 
        /* look into multiple handler lists to find the item */
        if (win)
-               found = wm_keymap_item_find_handlers(C, &win->handlers, opname, opcontext, properties, is_strict, is_hotkey, keymap_r);
+               found = wm_keymap_item_find_handlers(C, &win->handlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);
 
        if (sa && found == NULL)
-               found = wm_keymap_item_find_handlers(C, &sa->handlers, opname, opcontext, properties, is_strict, is_hotkey, keymap_r);
+               found = wm_keymap_item_find_handlers(C, &sa->handlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);
 
        if (found == NULL) {
                if (ELEM(opcontext, WM_OP_EXEC_REGION_WIN, WM_OP_INVOKE_REGION_WIN)) {
@@ -1040,7 +1042,7 @@ static wmKeyMapItem *wm_keymap_item_find_props(
                                        ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
                                
                                if (ar)
-                                       found = wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, is_strict, is_hotkey, keymap_r);
+                                       found = wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);
                        }
                }
                else if (ELEM(opcontext, WM_OP_EXEC_REGION_CHANNELS, WM_OP_INVOKE_REGION_CHANNELS)) {
@@ -1048,18 +1050,18 @@ static wmKeyMapItem *wm_keymap_item_find_props(
                                ar = BKE_area_find_region_type(sa, RGN_TYPE_CHANNELS);
 
                        if (ar)
-                               found = wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, is_strict, is_hotkey, keymap_r);
+                               found = wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);
                }
                else if (ELEM(opcontext, WM_OP_EXEC_REGION_PREVIEW, WM_OP_INVOKE_REGION_PREVIEW)) {
                        if (!(ar && ar->regiontype == RGN_TYPE_PREVIEW))
                                ar = BKE_area_find_region_type(sa, RGN_TYPE_PREVIEW);
 
                        if (ar)
-                               found = wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, is_strict, is_hotkey, keymap_r);
+                               found = wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);
                }
                else {
                        if (ar)
-                               found = wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, is_strict, is_hotkey, keymap_r);
+                               found = wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);
                }
        }
 
@@ -1068,7 +1070,8 @@ static wmKeyMapItem *wm_keymap_item_find_props(
 
 static wmKeyMapItem *wm_keymap_item_find(
         const bContext *C, const char *opname, int opcontext,
-        IDProperty *properties, const bool is_hotkey, bool is_strict, wmKeyMap **keymap_r)
+        IDProperty *properties, const bool is_hotkey, bool is_strict,
+        wmKeyMap **r_keymap)
 {
        wmKeyMapItem *found;
 
@@ -1081,7 +1084,7 @@ static wmKeyMapItem *wm_keymap_item_find(
                is_strict = is_strict && ((ot->flag & OPTYPE_MACRO) == 0);
        }
 
-       found = wm_keymap_item_find_props(C, opname, opcontext, properties, is_strict, is_hotkey, keymap_r);
+       found = wm_keymap_item_find_props(C, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);
 
        /* This block is *only* useful in one case: when op uses an enum menu in its prop member
         * (then, we want to rerun a comparison with that 'prop' unset). Note this remains brittle,
@@ -1105,7 +1108,7 @@ static wmKeyMapItem *wm_keymap_item_find(
                                RNA_property_unset(&opptr, ot->prop);
 
                                found = wm_keymap_item_find_props(C, opname, opcontext, properties_temp,
-                                                                 is_strict, is_hotkey, keymap_r);
+                                                                 is_strict, is_hotkey, r_keymap);
                        }
 
                        IDP_FreeProperty(properties_temp);
@@ -1167,9 +1170,10 @@ char *WM_key_event_operator_string(
 
 int WM_key_event_operator_id(
         const bContext *C, const char *opname, int opcontext,
-        IDProperty *properties, const bool is_hotkey, wmKeyMap **keymap_r)
+        IDProperty *properties, const bool is_hotkey,
+        wmKeyMap **r_keymap)
 {
-       wmKeyMapItem *kmi = wm_keymap_item_find(C, opname, opcontext, properties, is_hotkey, true, keymap_r);
+       wmKeyMapItem *kmi = wm_keymap_item_find(C, opname, opcontext, properties, is_hotkey, true, r_keymap);
        
        if (kmi)
                return kmi->id;
index 31883cf234c5e4204ab8a9619c85f834dc5cfc70..061357c39068964380978d8e588db9ab1e85749a 100644 (file)
@@ -160,11 +160,11 @@ static struct WindowStateGlobal {
        eWS_Qual qual;
 } g_WS = {NULL};
 
-static void playanim_window_get_size(int *width_r, int *height_r)
+static void playanim_window_get_size(int *r_width, int *r_height)
 {
        GHOST_RectangleHandle bounds = GHOST_GetClientBounds(g_WS.ghost_window);
-       *width_r = GHOST_GetWidthRectangle(bounds);
-       *height_r = GHOST_GetHeightRectangle(bounds);
+       *r_width = GHOST_GetWidthRectangle(bounds);
+       *r_height = GHOST_GetHeightRectangle(bounds);
        GHOST_DisposeRectangle(bounds);
 }
 
index d69cf3326b769a02115d566e488ba48b10a9fa51..9bcbbabc87bb8edadfdc7ebd10da6513438ecc10 100644 (file)
@@ -107,25 +107,25 @@ static struct WMInitStruct {
 
 /* XXX this one should correctly check for apple top header...
  * done for Cocoa : returns window contents (and not frame) max size*/
-void wm_get_screensize(int *width_r, int *height_r)
+void wm_get_screensize(int *r_width, int *r_height)
 {
        unsigned int uiwidth;
        unsigned int uiheight;
        
        GHOST_GetMainDisplayDimensions(g_system, &uiwidth, &uiheight);
-       *width_r = uiwidth;
-       *height_r = uiheight;
+       *r_width = uiwidth;
+       *r_height = uiheight;
 }
 
 /* size of all screens (desktop), useful since the mouse is bound by this */
-void wm_get_desktopsize(int *width_r, int *height_r)
+void wm_get_desktopsize(int *r_width, int *r_height)
 {
        unsigned int uiwidth;
        unsigned int uiheight;
 
        GHOST_GetAllDisplayDimensions(g_system, &uiwidth, &uiheight);
-       *width_r = uiwidth;
-       *height_r = uiheight;
+       *r_width = uiwidth;
+       *r_height = uiheight;
 }
 
 /* keeps offset and size within monitor bounds */
@@ -1404,10 +1404,10 @@ void WM_progress_clear(wmWindow *win)
 
 /* ************************************ */
 
-void wm_window_get_position(wmWindow *win, int *posx_r, int *posy_r) 
+void wm_window_get_position(wmWindow *win, int *r_pos_x, int *r_pos_y)
 {
-       *posx_r = win->posx;
-       *posy_r = win->posy;
+       *r_pos_x = win->posx;
+       *r_pos_y = win->posy;
 }
 
 void wm_window_set_size(wmWindow *win, int width, int height) 
index fc7c9e191b052a5916fe78cbfcde473e5a70f0cf..95dc8762ae748e19216af971111676e202faa276 100644 (file)
@@ -38,8 +38,8 @@ struct wmOperator;
 void           wm_ghost_init                   (bContext *C);
 void           wm_ghost_exit(void);
 
-void wm_get_screensize(int *width_r, int *height_r);
-void wm_get_desktopsize(int *width_r, int *height_r);
+void wm_get_screensize(int *r_width, int *r_height);
+void wm_get_desktopsize(int *r_width, int *r_height);
 
 wmWindow       *wm_window_new                  (bContext *C);
 void           wm_window_free                  (bContext *C, wmWindowManager *wm, wmWindow *win);
@@ -55,7 +55,7 @@ void          wm_window_make_drawable(wmWindowManager *wm, wmWindow *win);
 void           wm_window_raise                 (wmWindow *win);
 void           wm_window_lower                 (wmWindow *win);
 void           wm_window_set_size              (wmWindow *win, int width, int height);
-void           wm_window_get_position  (wmWindow *win, int *posx_r, int *posy_r);
+void           wm_window_get_position  (wmWindow *win, int *r_pos_x, int *r_pos_y);
 void           wm_window_swap_buffers  (wmWindow *win);
 void           wm_window_set_swap_interval(wmWindow *win, int interval);
 bool           wm_window_get_swap_interval(wmWindow *win, int *intervalOut);
index 08d01a9c79e6c29f26e7af5bfc7aaa1c6ddf2980..8e26a9e5b7817f4888e98c2fea953e5dea7d9a2d 100644 (file)
@@ -414,7 +414,7 @@ short ANIM_validate_keyingset(struct bContext *C, struct ListBase *dsources, str
 int ANIM_add_driver(struct ReportList *reports, struct ID *id, const char rna_path[], int array_index, short flag, int type) RET_ZERO
 bool ANIM_remove_driver(struct ReportList *reports, struct ID *id, const char rna_path[], int array_index, short flag) RET_ZERO
 void ED_space_image_release_buffer(struct SpaceImage *sima, struct ImBuf *ibuf, void *lock) RET_NONE
-struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **lock_r) RET_NULL
+struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **r_lock) RET_NULL
 void ED_space_image_get_zoom(struct SpaceImage *sima, struct ARegion *ar, float *zoomx, float *zoomy) RET_NONE
 const char *ED_info_stats_string(struct Scene *scene) RET_NULL
 void ED_area_tag_redraw(struct ScrArea *sa) RET_NONE