Cleanup: 'return' parameters to the end of functions, and use 'r_' prefix for them.

1 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h
index 987cbb4234c..d8787c9ef79 100644
--- a/source/blender/windowmanager/WM_keymap.h
+++ b/source/blender/windowmanager/WM_keymap.h
@@ -68,7 +68,7 @@ wmKeyMapItem *WM_keymap_add_menu_pie(struct wmKeyMap *keymap, const char *idname
                                      int val, int modifier, int keymodifier);
 
 bool        WM_keymap_remove_item(struct wmKeyMap *keymap, struct wmKeyMapItem *kmi);
-int         WM_keymap_item_to_string(wmKeyMapItem *kmi, char *str, const int len, const bool compact);
+int         WM_keymap_item_to_string(wmKeyMapItem *kmi, const bool compact, const int len, char *r_str);
 
 wmKeyMap	*WM_keymap_list_find(ListBase *lb, const char *idname, int spaceid, int regionid);
 wmKeyMap	*WM_keymap_find(struct wmKeyConfig *keyconf, const char *idname, int spaceid, int regionid);
@@ -82,11 +82,11 @@ int			WM_keymap_item_compare(struct wmKeyMapItem *k1, struct wmKeyMapItem *k2);
 
 /* Modal Keymap */
 
-int WM_modalkeymap_operator_items_to_string(struct wmOperatorType *ot, const int propvalue,
-                                            char *str, const int len, const bool compact);
+int WM_modalkeymap_operator_items_to_string(
+        struct wmOperatorType *ot, const int propvalue, const bool compact, const int len, char *r_str);
 char *WM_modalkeymap_operator_items_to_string_buf(
-        struct wmOperatorType *ot, const int propvalue,
-        char **str, int *available_len, const int max_len, const bool compact);
+        struct wmOperatorType *ot, const int propvalue, const bool compact,
+        const int max_len, int *r_available_len, char **r_str);
 
 wmKeyMap	*WM_modalkeymap_add(struct wmKeyConfig *keyconf, const char *idname, struct EnumPropertyItem *items);
 wmKeyMap	*WM_modalkeymap_get(struct wmKeyConfig *keyconf, const char *idname);
@@ -107,14 +107,14 @@ int			WM_keymap_map_type_get(struct wmKeyMapItem *kmi);
 const char *WM_key_event_string(const short type, const bool compact);
 int WM_keymap_item_raw_to_string(
         const short shift, const short ctrl, const short alt, const short oskey, const short keymodifier,
-        const short type, char *str, const int len, const bool compact);
+        const short type, const bool compact, const int len, char *r_str);
 int         WM_key_event_operator_id(
         const struct bContext *C, const char *opname, int opcontext,
         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);
+        struct IDProperty *properties, const bool is_strict, int len, char *r_str);
 
 const char *WM_bool_as_string(bool test);