Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix

No functional changes

6 files changed, 11 insertions, 12 deletions

diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
index c4115ee00c4..2373451f47c 100644
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
@@ -73,17 +73,17 @@ class FEdgeXDetector {
   virtual void processShapes(WingedEdge &);
 
   // GENERAL STUFF
-  virtual void preProcessShape(WXShape *iShape);
+  virtual void preProcessShape(WXShape *iWShape);
   virtual void preProcessFace(WXFace *iFace);
   virtual void computeCurvatures(WXVertex *iVertex);
 
   // SILHOUETTE
-  virtual void processSilhouetteShape(WXShape *iShape);
+  virtual void processSilhouetteShape(WXShape *iWShape);
   virtual void ProcessSilhouetteFace(WXFace *iFace);
   virtual void ProcessSilhouetteEdge(WXEdge *iEdge);
 
   // CREASE
-  virtual void processCreaseShape(WXShape *iShape);
+  virtual void processCreaseShape(WXShape *iWShape);
   virtual void ProcessCreaseEdge(WXEdge *iEdge);
 
   /*! Sets the minimum angle for detecting crease edges
@@ -109,15 +109,15 @@ class FEdgeXDetector {
   }
 
   // BORDER
-  virtual void processBorderShape(WXShape *iShape);
+  virtual void processBorderShape(WXShape *iWShape);
   virtual void ProcessBorderEdge(WXEdge *iEdge);
 
   // RIDGES AND VALLEYS
-  virtual void processRidgesAndValleysShape(WXShape *iShape);
+  virtual void processRidgesAndValleysShape(WXShape *iWShape);
   virtual void ProcessRidgeFace(WXFace *iFace);
 
   // SUGGESTIVE CONTOURS
-  virtual void processSuggestiveContourShape(WXShape *iShape);
+  virtual void processSuggestiveContourShape(WXShape *iWShape);
   virtual void ProcessSuggestiveContourFace(WXFace *iFace);
   virtual void postProcessSuggestiveContourShape(WXShape *iShape);
   virtual void postProcessSuggestiveContourFace(WXFace *iFace);
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
index 7549ebcb258..7790dd64cf5 100644
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
@@ -146,9 +146,8 @@ double *SteerableViewMap::AddFEdge(FEdge *iFEdge)
   return res;
 }
 
-unsigned SteerableViewMap::getSVMNumber(const Vec2f &orient)
+unsigned SteerableViewMap::getSVMNumber(Vec2f dir)
 {
-  Vec2f dir(orient);
   // soc unsigned res = 0;
   real norm = dir.norm();
   if (norm < 1.0e-6) {
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.h b/source/blender/freestyle/intern/view_map/SteerableViewMap.h
index 65633fd85d4..e03400dbbc0 100644
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.h
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.h
@@ -78,7 +78,7 @@ class SteerableViewMap {
    *  \param dir:
    *    The direction
    */
-  unsigned getSVMNumber(const Vec2f &dir);
+  unsigned getSVMNumber(Vec2f dir);
 
   /*! Returns the number of the SVM to which a FEdge belongs most.
    *  \param id:
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
index f6f54a2d87d..1fce4f4a965 100644
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
@@ -264,7 +264,7 @@ class ViewEdgeXBuilder {
 
   // SHARP //
   /*! checks whether a WEdge has already been processed or not */
-  bool stopSharpViewEdge(WXEdge *iFace);
+  bool stopSharpViewEdge(WXEdge *iEdge);
   int retrieveFaceMarks(WXEdge *iEdge);
   OWXEdge FindNextWEdge(const OWXEdge &iEdge);
   OWXEdge FindPreviousWEdge(const OWXEdge &iEdge);
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index e5e49f17ca5..1c959c43481 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -153,7 +153,7 @@ class ViewMap {
     return _VEdges.size();
   }
 
-  ViewShape *viewShape(unsigned index);
+  ViewShape *viewShape(unsigned id);
 
   id_to_index_map &shapeIdToIndexMap()
   {
diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
index 54de3321b80..a1f76c120fb 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
@@ -33,7 +33,7 @@ NodeGroup *ViewMapTesselator::Tesselate(ViewMap *iViewMap)
   return Tesselate(viewedges.begin(), viewedges.end());
 }
 
-NodeGroup *ViewMapTesselator::Tesselate(WShape *UNUSED(shape))
+NodeGroup *ViewMapTesselator::Tesselate(WShape *UNUSED(iWShape))
 {
   return NULL;
 }