From 2115232a16d81d28dbdb8042ed8e9316858514c6 Mon Sep 17 00:00:00 2001
From: Sebastian Parborg <darkdefende@gmail.com>
Date: Fri, 4 Sep 2020 20:59:13 +0200
Subject: Cleanup: Clang-Tidy
 readability-inconsistent-declaration-parameter-name fix

No functional changes
---
 source/blender/editors/space_outliner/outliner_intern.h |  2 +-
 source/blender/editors/space_outliner/outliner_tools.c  |  8 ++++----
 source/blender/editors/space_outliner/outliner_utils.c  | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'source/blender/editors/space_outliner')

diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index bd283777397..7e7fdf4bab2 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -495,7 +495,7 @@ TreeElement *outliner_find_item_at_y(const SpaceOutliner *space_outliner,
 TreeElement *outliner_find_item_at_x_in_row(const SpaceOutliner *space_outliner,
                                             const TreeElement *parent_te,
                                             float view_co_x,
-                                            bool *multiple_objects);
+                                            bool *row_merged);
 TreeElement *outliner_find_tse(struct SpaceOutliner *space_outliner, const TreeStoreElem *tse);
 TreeElement *outliner_find_tree_element(ListBase *lb, const TreeStoreElem *store_elem);
 TreeElement *outliner_find_parent_element(ListBase *lb,
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 2a13f9d6a66..01b6e636ded 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -981,7 +981,7 @@ static void singleuser_world_fn(bContext *C,
 }
 
 /**
- * \param select_recurse: Set to false for operations which are already
+ * \param recurse_selected: Set to false for operations which are already
  * recursively operating on their children.
  */
 void outliner_do_object_operation_ex(bContext *C,
@@ -991,7 +991,7 @@ void outliner_do_object_operation_ex(bContext *C,
                                      ListBase *lb,
                                      outliner_operation_fn operation_fn,
                                      void *user_data,
-                                     bool select_recurse)
+                                     bool recurse_selected)
 {
   TreeElement *te;
   for (te = lb->first; te; te = te->next) {
@@ -1013,7 +1013,7 @@ void outliner_do_object_operation_ex(bContext *C,
       }
     }
     if (TSELEM_OPEN(tselem, space_outliner)) {
-      if ((select_handled == false) || select_recurse) {
+      if ((select_handled == false) || recurse_selected) {
         outliner_do_object_operation_ex(C,
                                         reports,
                                         scene_act,
@@ -1021,7 +1021,7 @@ void outliner_do_object_operation_ex(bContext *C,
                                         &te->subtree,
                                         operation_fn,
                                         NULL,
-                                        select_recurse);
+                                        recurse_selected);
       }
     }
   }
diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c
index 25dc7bc271e..8ec1db9a928 100644
--- a/source/blender/editors/space_outliner/outliner_utils.c
+++ b/source/blender/editors/space_outliner/outliner_utils.c
@@ -113,7 +113,7 @@ TreeElement *outliner_find_item_at_y(const SpaceOutliner *space_outliner,
 
 static TreeElement *outliner_find_item_at_x_in_row_recursive(const TreeElement *parent_te,
                                                              float view_co_x,
-                                                             bool *r_merged)
+                                                             bool *row_merged)
 {
   TreeElement *child_te = parent_te->subtree.first;
 
@@ -125,13 +125,13 @@ static TreeElement *outliner_find_item_at_x_in_row_recursive(const TreeElement *
       return child_te;
     }
     if ((child_te->flag & TE_ICONROW_MERGED) && over_element) {
-      if (r_merged) {
-        *r_merged = true;
+      if (row_merged) {
+        *row_merged = true;
       }
       return child_te;
     }
 
-    TreeElement *te = outliner_find_item_at_x_in_row_recursive(child_te, view_co_x, r_merged);
+    TreeElement *te = outliner_find_item_at_x_in_row_recursive(child_te, view_co_x, row_merged);
     if (te != child_te) {
       return te;
     }
@@ -152,11 +152,11 @@ static TreeElement *outliner_find_item_at_x_in_row_recursive(const TreeElement *
 TreeElement *outliner_find_item_at_x_in_row(const SpaceOutliner *space_outliner,
                                             const TreeElement *parent_te,
                                             float view_co_x,
-                                            bool *r_merged)
+                                            bool *row_merged)
 {
   /* if parent_te is opened, it doesn't show children in row */
   if (!TSELEM_OPEN(TREESTORE(parent_te), space_outliner)) {
-    return outliner_find_item_at_x_in_row_recursive(parent_te, view_co_x, r_merged);
+    return outliner_find_item_at_x_in_row_recursive(parent_te, view_co_x, row_merged);
   }
 
   return (TreeElement *)parent_te;
-- 
cgit v1.2.3