diff --git a/src/DataExchange/TKDEVRML/VrmlData/VrmlData_Scene.cxx b/src/DataExchange/TKDEVRML/VrmlData/VrmlData_Scene.cxx
index 4dd34a1ee9..830a6b166c 100644
--- a/src/DataExchange/TKDEVRML/VrmlData/VrmlData_Scene.cxx
+++ b/src/DataExchange/TKDEVRML/VrmlData/VrmlData_Scene.cxx
@@ -200,7 +200,7 @@ VrmlData_ErrorStatus VrmlData_Scene::readLine(VrmlData_InBuffer& theBuffer)
     // Clear the error.
     // We will fix it here below.
     theBuffer.Input.clear();
-    size_t anInd = aNbChars - 1;
+    std::streamsize anInd = aNbChars - 1;
     for (; anInd > 0; anInd--)
     {
       char aChar = theBuffer.Line[anInd];
@@ -219,14 +219,14 @@ VrmlData_ErrorStatus VrmlData_Scene::readLine(VrmlData_InBuffer& theBuffer)
 
   // Check the reading status.
   theBuffer.LineCount++;
-  const int stat = theBuffer.Input.rdstate();
-  if (stat & std::ios::badbit)
+  const std::ios::iostate aState = theBuffer.Input.rdstate();
+  if (aState & std::ios::badbit)
   {
     aStatus = VrmlData_UnrecoverableError;
   }
-  else if (stat & std::ios::failbit)
+  else if (aState & std::ios::failbit)
   {
-    if (stat & std::ios::eofbit)
+    if (aState & std::ios::eofbit)
     {
       aStatus = VrmlData_EndOfFile;
     }
diff --git a/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_ElSpine.cxx b/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_ElSpine.cxx
index f657be2454..3ddf2ee0b7 100644
--- a/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_ElSpine.cxx
+++ b/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_ElSpine.cxx
@@ -169,28 +169,28 @@ double ChFiDS_ElSpine::Period() const
 
 //=================================================================================================
 
-gp_Pnt ChFiDS_ElSpine::EvalD0(double theAbsC) const
+gp_Pnt ChFiDS_ElSpine::EvalD0(const double theAbsC) const
 {
   return curve.EvalD0(theAbsC);
 }
 
 //=================================================================================================
 
-Geom_Curve::ResD1 ChFiDS_ElSpine::EvalD1(double theAbsC) const
+Geom_Curve::ResD1 ChFiDS_ElSpine::EvalD1(const double theAbsC) const
 {
   return curve.EvalD1(theAbsC);
 }
 
 //=================================================================================================
 
-Geom_Curve::ResD2 ChFiDS_ElSpine::EvalD2(double theAbsC) const
+Geom_Curve::ResD2 ChFiDS_ElSpine::EvalD2(const double theAbsC) const
 {
   return curve.EvalD2(theAbsC);
 }
 
 //=================================================================================================
 
-Geom_Curve::ResD3 ChFiDS_ElSpine::EvalD3(double theAbsC) const
+Geom_Curve::ResD3 ChFiDS_ElSpine::EvalD3(const double theAbsC) const
 {
   return curve.EvalD3(theAbsC);
 }
diff --git a/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_ElSpine.hxx b/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_ElSpine.hxx
index 58159a266e..6b7625fa89 100644
--- a/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_ElSpine.hxx
+++ b/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_ElSpine.hxx
@@ -85,16 +85,16 @@ public:
   Standard_EXPORT double Period() const override;
 
   //! Computes the point of parameter theAbsC on the curve.
-  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(double theAbsC) const final;
+  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(const double theAbsC) const final;
 
   //! Computes the point and first derivative at parameter theAbsC.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(double theAbsC) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(const double theAbsC) const final;
 
   //! Computes the point and first two derivatives at parameter theAbsC.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(double theAbsC) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(const double theAbsC) const final;
 
   //! Computes the point and first three derivatives at parameter theAbsC.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(double theAbsC) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(const double theAbsC) const final;
 
   Standard_EXPORT void FirstParameter(const double P);
 
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_SnglrFunc.cxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_SnglrFunc.cxx
index f50b7ab1ba..d4e2c7c160 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_SnglrFunc.cxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_SnglrFunc.cxx
@@ -97,20 +97,20 @@ double GeomFill_SnglrFunc::Period() const
   return myHCurve->Period();
 }
 
-gp_Pnt GeomFill_SnglrFunc::EvalD0(double theU) const
+gp_Pnt GeomFill_SnglrFunc::EvalD0(const double theU) const
 {
   const Geom_Curve::ResD2 aRes = myHCurve->EvalD2(theU);
   return gp_Pnt((aRes.D1 * ratio).Crossed(aRes.D2).XYZ());
 }
 
-Geom_Curve::ResD1 GeomFill_SnglrFunc::EvalD1(double theU) const
+Geom_Curve::ResD1 GeomFill_SnglrFunc::EvalD1(const double theU) const
 {
   const Geom_Curve::ResD3 aRes = myHCurve->EvalD3(theU);
   const gp_Vec            aDC  = aRes.D1 * ratio;
   return {gp_Pnt(aDC.Crossed(aRes.D2).XYZ()), aDC.Crossed(aRes.D3)};
 }
 
-Geom_Curve::ResD2 GeomFill_SnglrFunc::EvalD2(double theU) const
+Geom_Curve::ResD2 GeomFill_SnglrFunc::EvalD2(const double theU) const
 {
   const Geom_Curve::ResD3 aRes = myHCurve->EvalD3(theU);
   const gp_Vec            aD4  = myHCurve->EvalDN(theU, 4);
@@ -119,7 +119,7 @@ Geom_Curve::ResD2 GeomFill_SnglrFunc::EvalD2(double theU) const
           (aRes.D2.Crossed(aRes.D3) + aRes.D1.Crossed(aD4)) * ratio};
 }
 
-Geom_Curve::ResD3 GeomFill_SnglrFunc::EvalD3(double theU) const
+Geom_Curve::ResD3 GeomFill_SnglrFunc::EvalD3(const double theU) const
 {
   const Geom_Curve::ResD3 aRes = myHCurve->EvalD3(theU);
   const gp_Vec            aD4  = myHCurve->EvalDN(theU, 4);
@@ -130,7 +130,7 @@ Geom_Curve::ResD3 GeomFill_SnglrFunc::EvalD3(double theU) const
           (aRes.D1.Crossed(aD5) + aRes.D2.Crossed(aD4) * 2) * ratio};
 }
 
-gp_Vec GeomFill_SnglrFunc::EvalDN(double theU, int theN) const
+gp_Vec GeomFill_SnglrFunc::EvalDN(const double theU, const int theN) const
 {
   Standard_RangeError_Raise_if(theN < 1, "Exception: Geom2d_OffsetCurve::DN(). N<1.");
 
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_SnglrFunc.hxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_SnglrFunc.hxx
index d96dc1a16e..d850589cfa 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_SnglrFunc.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_SnglrFunc.hxx
@@ -64,23 +64,23 @@ public:
   Standard_EXPORT double Period() const override;
 
   //! Computes the point of parameter theU on the curve.
-  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(double theU) const final;
+  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(const double theU) const final;
 
   //! Computes the point of parameter theU on the curve with its first derivative.
   //! Raised if the continuity of the current interval is not C1.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(const double theU) const final;
 
   //! Returns the point and the first and second derivatives at parameter theU.
   //! Raised if the continuity of the current interval is not C2.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(const double theU) const final;
 
   //! Returns the point and the first, second and third derivatives at parameter theU.
   //! Raised if the continuity of the current interval is not C3.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(const double theU) const final;
 
   //! Returns the derivative of order theN at parameter theU.
   //! Raised if theN < 1.
-  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(double theU, int theN) const final;
+  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(const double theU, const int theN) const final;
 
   //! Returns the parametric resolution corresponding
   //! to the real space resolution <R3d>.
diff --git a/src/ModelingAlgorithms/TKHelix/HelixGeom/HelixGeom_HelixCurve.cxx b/src/ModelingAlgorithms/TKHelix/HelixGeom/HelixGeom_HelixCurve.cxx
index a2ee65994c..f4bfc646cb 100644
--- a/src/ModelingAlgorithms/TKHelix/HelixGeom/HelixGeom_HelixCurve.cxx
+++ b/src/ModelingAlgorithms/TKHelix/HelixGeom/HelixGeom_HelixCurve.cxx
@@ -161,7 +161,7 @@ double HelixGeom_HelixCurve::Period() const
 
 //=================================================================================================
 
-gp_Pnt HelixGeom_HelixCurve::EvalD0(double theT) const
+gp_Pnt HelixGeom_HelixCurve::EvalD0(const double theT) const
 {
   double aST, aCT, aX, aY, aZ, a1;
   // Calculate trigonometric values and radius
@@ -181,7 +181,7 @@ gp_Pnt HelixGeom_HelixCurve::EvalD0(double theT) const
 
 //=================================================================================================
 
-Geom_Curve::ResD1 HelixGeom_HelixCurve::EvalD1(double theT) const
+Geom_Curve::ResD1 HelixGeom_HelixCurve::EvalD1(const double theT) const
 {
   double aST, aCT, aX, aY, aZ, a1, a2;
   // Calculate point and first derivative
@@ -215,7 +215,7 @@ Geom_Curve::ResD1 HelixGeom_HelixCurve::EvalD1(double theT) const
 
 //=================================================================================================
 
-Geom_Curve::ResD2 HelixGeom_HelixCurve::EvalD2(double theT) const
+Geom_Curve::ResD2 HelixGeom_HelixCurve::EvalD2(const double theT) const
 {
   double aST, aCT, aX, aY, aZ, a1, a2;
   // Calculate point, first and second derivatives
@@ -259,7 +259,7 @@ Geom_Curve::ResD2 HelixGeom_HelixCurve::EvalD2(double theT) const
 
 //=================================================================================================
 
-gp_Vec HelixGeom_HelixCurve::EvalDN(double theT, int theN) const
+gp_Vec HelixGeom_HelixCurve::EvalDN(const double theT, const int theN) const
 {
   // Compute derivative based on order
   switch (theN)
@@ -274,7 +274,5 @@ gp_Vec HelixGeom_HelixCurve::EvalDN(double theT, int theN) const
     }
     default:
       throw Standard_NotImplemented("HelixGeom_HelixCurve::EvalDN");
-      break;
   }
-  return gp_Vec();
 }
diff --git a/src/ModelingAlgorithms/TKHelix/HelixGeom/HelixGeom_HelixCurve.hxx b/src/ModelingAlgorithms/TKHelix/HelixGeom/HelixGeom_HelixCurve.hxx
index 7cac183eba..d9e384da54 100644
--- a/src/ModelingAlgorithms/TKHelix/HelixGeom/HelixGeom_HelixCurve.hxx
+++ b/src/ModelingAlgorithms/TKHelix/HelixGeom/HelixGeom_HelixCurve.hxx
@@ -82,16 +82,16 @@ public:
   Standard_EXPORT double Period() const override;
 
   //! Computes the point of parameter theU on the curve.
-  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(double theU) const final;
+  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(const double theU) const final;
 
   //! Computes the point and first derivative at parameter theU.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(const double theU) const final;
 
   //! Computes the point and first two derivatives at parameter theU.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(const double theU) const final;
 
   //! Returns the derivative of order theN at parameter theU.
-  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(double theU, int theN) const final;
+  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(const double theU, const int theN) const final;
 
 protected:
   double myFirst;
diff --git a/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnEdge.cxx b/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnEdge.cxx
index 488f7e67df..b66402fa6e 100644
--- a/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnEdge.cxx
+++ b/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnEdge.cxx
@@ -168,7 +168,7 @@ double BiTgte_CurveOnEdge::Period() const
 
 //=================================================================================================
 
-gp_Pnt BiTgte_CurveOnEdge::EvalD0(double theU) const
+gp_Pnt BiTgte_CurveOnEdge::EvalD0(const double theU) const
 {
   GeomAPI_ProjectPointOnCurve aProjector;
   gp_Pnt                      aP = myConF->Value(theU);
@@ -178,28 +178,28 @@ gp_Pnt BiTgte_CurveOnEdge::EvalD0(double theU) const
 
 //=================================================================================================
 
-Geom_Curve::ResD1 BiTgte_CurveOnEdge::EvalD1(double) const
+Geom_Curve::ResD1 BiTgte_CurveOnEdge::EvalD1(const double) const
 {
   throw Standard_NotImplemented("BiTgte_CurveOnEdge");
 }
 
 //=================================================================================================
 
-Geom_Curve::ResD2 BiTgte_CurveOnEdge::EvalD2(double) const
+Geom_Curve::ResD2 BiTgte_CurveOnEdge::EvalD2(const double) const
 {
   throw Standard_NotImplemented("BiTgte_CurveOnEdge");
 }
 
 //=================================================================================================
 
-Geom_Curve::ResD3 BiTgte_CurveOnEdge::EvalD3(double) const
+Geom_Curve::ResD3 BiTgte_CurveOnEdge::EvalD3(const double) const
 {
   throw Standard_NotImplemented("BiTgte_CurveOnEdge");
 }
 
 //=================================================================================================
 
-gp_Vec BiTgte_CurveOnEdge::EvalDN(double, int) const
+gp_Vec BiTgte_CurveOnEdge::EvalDN(const double, const int) const
 {
   throw Standard_NotImplemented("BiTgte_CurveOnEdge");
 }
diff --git a/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnEdge.hxx b/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnEdge.hxx
index c50695c78c..6173e3f238 100644
--- a/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnEdge.hxx
+++ b/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnEdge.hxx
@@ -86,19 +86,19 @@ public:
   Standard_EXPORT double Period() const override;
 
   //! Computes the point of parameter theU on the curve.
-  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(double theU) const final;
+  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(const double theU) const final;
 
   //! Computes the point and first derivative at parameter theU.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(const double theU) const final;
 
   //! Computes the point and first two derivatives at parameter theU.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(const double theU) const final;
 
   //! Computes the point and first three derivatives at parameter theU.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(const double theU) const final;
 
   //! Returns the derivative of order theN at parameter theU.
-  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(double theU, int theN) const final;
+  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(const double theU, const int theN) const final;
 
   //! Returns the parametric resolution corresponding
   //! to the real space resolution <R3d>.
diff --git a/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnVertex.cxx b/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnVertex.cxx
index 3d301cc5c9..69eb6b27fb 100644
--- a/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnVertex.cxx
+++ b/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnVertex.cxx
@@ -128,35 +128,35 @@ double BiTgte_CurveOnVertex::Period() const
 
 //=================================================================================================
 
-gp_Pnt BiTgte_CurveOnVertex::EvalD0(double) const
+gp_Pnt BiTgte_CurveOnVertex::EvalD0(const double) const
 {
   return myPnt;
 }
 
 //=================================================================================================
 
-Geom_Curve::ResD1 BiTgte_CurveOnVertex::EvalD1(double) const
+Geom_Curve::ResD1 BiTgte_CurveOnVertex::EvalD1(const double) const
 {
   throw Standard_NotImplemented("BiTgte_CurveOnVertex");
 }
 
 //=================================================================================================
 
-Geom_Curve::ResD2 BiTgte_CurveOnVertex::EvalD2(double) const
+Geom_Curve::ResD2 BiTgte_CurveOnVertex::EvalD2(const double) const
 {
   throw Standard_NotImplemented("BiTgte_CurveOnVertex");
 }
 
 //=================================================================================================
 
-Geom_Curve::ResD3 BiTgte_CurveOnVertex::EvalD3(double) const
+Geom_Curve::ResD3 BiTgte_CurveOnVertex::EvalD3(const double) const
 {
   throw Standard_NotImplemented("BiTgte_CurveOnVertex");
 }
 
 //=================================================================================================
 
-gp_Vec BiTgte_CurveOnVertex::EvalDN(double, int) const
+gp_Vec BiTgte_CurveOnVertex::EvalDN(const double, const int) const
 {
   throw Standard_NotImplemented("BiTgte_CurveOnVertex");
 }
diff --git a/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnVertex.hxx b/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnVertex.hxx
index 94617be9af..92d6ac1580 100644
--- a/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnVertex.hxx
+++ b/src/ModelingAlgorithms/TKOffset/BiTgte/BiTgte_CurveOnVertex.hxx
@@ -84,19 +84,19 @@ public:
   Standard_EXPORT double Period() const override;
 
   //! Computes the point of parameter theU on the curve.
-  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(double theU) const final;
+  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(const double theU) const final;
 
   //! Computes the point and first derivative at parameter theU.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(const double theU) const final;
 
   //! Computes the point and first two derivatives at parameter theU.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(const double theU) const final;
 
   //! Computes the point and first three derivatives at parameter theU.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(const double theU) const final;
 
   //! Returns the derivative of order theN at parameter theU.
-  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(double theU, int theN) const final;
+  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(const double theU, const int theN) const final;
 
   //! Returns the parametric resolution corresponding
   //! to the real space resolution <R3d>.
diff --git a/src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_CompCurve.cxx b/src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_CompCurve.cxx
index bb30db0903..c3f74102d5 100644
--- a/src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_CompCurve.cxx
+++ b/src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_CompCurve.cxx
@@ -320,7 +320,7 @@ double BRepAdaptor_CompCurve::Period() const
   return (TLast - TFirst);
 }
 
-gp_Pnt BRepAdaptor_CompCurve::EvalD0(double theU) const
+gp_Pnt BRepAdaptor_CompCurve::EvalD0(const double theU) const
 {
   double u     = theU, d;
   int    index = CurIndex;
@@ -328,7 +328,7 @@ gp_Pnt BRepAdaptor_CompCurve::EvalD0(double theU) const
   return myCurves->Value(index).EvalD0(u);
 }
 
-Geom_Curve::ResD1 BRepAdaptor_CompCurve::EvalD1(double theU) const
+Geom_Curve::ResD1 BRepAdaptor_CompCurve::EvalD1(const double theU) const
 {
   double u     = theU, d;
   int    index = CurIndex;
@@ -338,7 +338,7 @@ Geom_Curve::ResD1 BRepAdaptor_CompCurve::EvalD1(double theU) const
   return aRes;
 }
 
-Geom_Curve::ResD2 BRepAdaptor_CompCurve::EvalD2(double theU) const
+Geom_Curve::ResD2 BRepAdaptor_CompCurve::EvalD2(const double theU) const
 {
   double u     = theU, d;
   int    index = CurIndex;
@@ -349,7 +349,7 @@ Geom_Curve::ResD2 BRepAdaptor_CompCurve::EvalD2(double theU) const
   return aRes;
 }
 
-Geom_Curve::ResD3 BRepAdaptor_CompCurve::EvalD3(double theU) const
+Geom_Curve::ResD3 BRepAdaptor_CompCurve::EvalD3(const double theU) const
 {
   double u     = theU, d;
   int    index = CurIndex;
@@ -361,7 +361,7 @@ Geom_Curve::ResD3 BRepAdaptor_CompCurve::EvalD3(double theU) const
   return aRes;
 }
 
-gp_Vec BRepAdaptor_CompCurve::EvalDN(double theU, int theN) const
+gp_Vec BRepAdaptor_CompCurve::EvalDN(const double theU, const int theN) const
 {
   double u     = theU, d;
   int    index = CurIndex;
diff --git a/src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_CompCurve.hxx b/src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_CompCurve.hxx
index 0dbd8d5c2b..d2b78f1eef 100644
--- a/src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_CompCurve.hxx
+++ b/src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_CompCurve.hxx
@@ -123,24 +123,24 @@ public:
   Standard_EXPORT double Period() const override;
 
   //! Computes the point of parameter theU on the curve.
-  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(double theU) const final;
+  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(const double theU) const final;
 
   //! Computes the point of parameter theU on the curve with its first derivative.
   //! Raised if the continuity of the current interval is not C1.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(const double theU) const final;
 
   //! Returns the point and the first and second derivatives at parameter theU.
   //! Raised if the continuity of the current interval is not C2.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(const double theU) const final;
 
   //! Returns the point and the first, second and third derivatives at parameter theU.
   //! Raised if the continuity of the current interval is not C3.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(const double theU) const final;
 
   //! Returns the derivative of order theN at parameter theU.
   //! Raised if the continuity of the current interval is not CN.
   //! Raised if theN < 1.
-  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(double theU, int theN) const final;
+  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(const double theU, const int theN) const final;
 
   //! returns the parametric resolution
   Standard_EXPORT double Resolution(const double R3d) const override;
diff --git a/src/ModelingData/TKG2d/Adaptor2d/Adaptor2d_Curve2d.cxx b/src/ModelingData/TKG2d/Adaptor2d/Adaptor2d_Curve2d.cxx
index 920b52eec3..84c548c206 100644
--- a/src/ModelingData/TKG2d/Adaptor2d/Adaptor2d_Curve2d.cxx
+++ b/src/ModelingData/TKG2d/Adaptor2d/Adaptor2d_Curve2d.cxx
@@ -262,7 +262,7 @@ int Adaptor2d_Curve2d::NbSamples() const
 
 //=================================================================================================
 
-gp_Pnt2d Adaptor2d_Curve2d::EvalD0(double theU) const
+gp_Pnt2d Adaptor2d_Curve2d::EvalD0(const double theU) const
 {
   gp_Pnt2d aP;
   D0(theU, aP);
@@ -271,7 +271,7 @@ gp_Pnt2d Adaptor2d_Curve2d::EvalD0(double theU) const
 
 //=================================================================================================
 
-Geom2d_Curve::ResD1 Adaptor2d_Curve2d::EvalD1(double theU) const
+Geom2d_Curve::ResD1 Adaptor2d_Curve2d::EvalD1(const double theU) const
 {
   Geom2d_Curve::ResD1 aResult;
   D1(theU, aResult.Point, aResult.D1);
@@ -280,7 +280,7 @@ Geom2d_Curve::ResD1 Adaptor2d_Curve2d::EvalD1(double theU) const
 
 //=================================================================================================
 
-Geom2d_Curve::ResD2 Adaptor2d_Curve2d::EvalD2(double theU) const
+Geom2d_Curve::ResD2 Adaptor2d_Curve2d::EvalD2(const double theU) const
 {
   Geom2d_Curve::ResD2 aResult;
   D2(theU, aResult.Point, aResult.D1, aResult.D2);
@@ -289,7 +289,7 @@ Geom2d_Curve::ResD2 Adaptor2d_Curve2d::EvalD2(double theU) const
 
 //=================================================================================================
 
-Geom2d_Curve::ResD3 Adaptor2d_Curve2d::EvalD3(double theU) const
+Geom2d_Curve::ResD3 Adaptor2d_Curve2d::EvalD3(const double theU) const
 {
   Geom2d_Curve::ResD3 aResult;
   D3(theU, aResult.Point, aResult.D1, aResult.D2, aResult.D3);
@@ -298,7 +298,7 @@ Geom2d_Curve::ResD3 Adaptor2d_Curve2d::EvalD3(double theU) const
 
 //=================================================================================================
 
-gp_Vec2d Adaptor2d_Curve2d::EvalDN(double theU, int theN) const
+gp_Vec2d Adaptor2d_Curve2d::EvalDN(const double theU, const int theN) const
 {
   return DN(theU, theN);
 }
diff --git a/src/ModelingData/TKG2d/Adaptor2d/Adaptor2d_Curve2d.hxx b/src/ModelingData/TKG2d/Adaptor2d/Adaptor2d_Curve2d.hxx
index 5ea62d82a7..66c62c1f74 100644
--- a/src/ModelingData/TKG2d/Adaptor2d/Adaptor2d_Curve2d.hxx
+++ b/src/ModelingData/TKG2d/Adaptor2d/Adaptor2d_Curve2d.hxx
@@ -154,23 +154,23 @@ public:
 
   //! Computes the point of parameter U on the curve.
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual gp_Pnt2d EvalD0(double U) const;
+  [[nodiscard]] Standard_EXPORT virtual gp_Pnt2d EvalD0(const double theU) const;
 
   //! Computes the point and first derivative at parameter U.
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual Geom2d_Curve::ResD1 EvalD1(double U) const;
+  [[nodiscard]] Standard_EXPORT virtual Geom2d_Curve::ResD1 EvalD1(const double theU) const;
 
   //! Computes the point and first two derivatives at parameter U.
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual Geom2d_Curve::ResD2 EvalD2(double U) const;
+  [[nodiscard]] Standard_EXPORT virtual Geom2d_Curve::ResD2 EvalD2(const double theU) const;
 
   //! Computes the point and first three derivatives at parameter U.
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual Geom2d_Curve::ResD3 EvalD3(double U) const;
+  [[nodiscard]] Standard_EXPORT virtual Geom2d_Curve::ResD3 EvalD3(const double theU) const;
 
   //! Computes the Nth derivative at parameter U.
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual gp_Vec2d EvalDN(double U, int N) const;
+  [[nodiscard]] Standard_EXPORT virtual gp_Vec2d EvalDN(const double theU, const int theN) const;
 
   Standard_EXPORT ~Adaptor2d_Curve2d() override;
 };
diff --git a/src/ModelingData/TKG2d/Geom2dAdaptor/Geom2dAdaptor_Curve.cxx b/src/ModelingData/TKG2d/Geom2dAdaptor/Geom2dAdaptor_Curve.cxx
index 4a99b7940a..7752af51ae 100644
--- a/src/ModelingData/TKG2d/Geom2dAdaptor/Geom2dAdaptor_Curve.cxx
+++ b/src/ModelingData/TKG2d/Geom2dAdaptor/Geom2dAdaptor_Curve.cxx
@@ -688,9 +688,10 @@ void Geom2dAdaptor_Curve::D0(const double U, gp_Pnt2d& P) const
 
 //=================================================================================================
 
-gp_Pnt2d Geom2dAdaptor_Curve::EvalD0(double U) const
+gp_Pnt2d Geom2dAdaptor_Curve::EvalD0(const double theU) const
 {
-  gp_Pnt2d P;
+  const double U = theU;
+  gp_Pnt2d     P;
   switch (myTypeCurve)
   {
     case GeomAbs_Line:
@@ -777,8 +778,9 @@ void Geom2dAdaptor_Curve::D1(const double U, gp_Pnt2d& P, gp_Vec2d& V) const
 
 //=================================================================================================
 
-Geom2d_Curve::ResD1 Geom2dAdaptor_Curve::EvalD1(double U) const
+Geom2d_Curve::ResD1 Geom2dAdaptor_Curve::EvalD1(const double theU) const
 {
+  const double        U = theU;
   Geom2d_Curve::ResD1 aResult;
   switch (myTypeCurve)
   {
@@ -868,8 +870,9 @@ void Geom2dAdaptor_Curve::D2(const double U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d
 
 //=================================================================================================
 
-Geom2d_Curve::ResD2 Geom2dAdaptor_Curve::EvalD2(double U) const
+Geom2d_Curve::ResD2 Geom2dAdaptor_Curve::EvalD2(const double theU) const
 {
+  const double        U = theU;
   Geom2d_Curve::ResD2 aResult;
   switch (myTypeCurve)
   {
@@ -966,8 +969,9 @@ void Geom2dAdaptor_Curve::D3(const double U,
 
 //=================================================================================================
 
-Geom2d_Curve::ResD3 Geom2dAdaptor_Curve::EvalD3(double U) const
+Geom2d_Curve::ResD3 Geom2dAdaptor_Curve::EvalD3(const double theU) const
 {
+  const double        U = theU;
   Geom2d_Curve::ResD3 aResult;
   switch (myTypeCurve)
   {
@@ -1075,8 +1079,10 @@ gp_Vec2d Geom2dAdaptor_Curve::DN(const double U, const int N) const
 
 //=================================================================================================
 
-gp_Vec2d Geom2dAdaptor_Curve::EvalDN(double U, int N) const
+gp_Vec2d Geom2dAdaptor_Curve::EvalDN(const double theU, const int theN) const
 {
+  const double U = theU;
+  const int    N = theN;
   switch (myTypeCurve)
   {
     case GeomAbs_Line:
diff --git a/src/ModelingData/TKG2d/Geom2dAdaptor/Geom2dAdaptor_Curve.hxx b/src/ModelingData/TKG2d/Geom2dAdaptor/Geom2dAdaptor_Curve.hxx
index 3f43a8c25a..adb43359df 100644
--- a/src/ModelingData/TKG2d/Geom2dAdaptor/Geom2dAdaptor_Curve.hxx
+++ b/src/ModelingData/TKG2d/Geom2dAdaptor/Geom2dAdaptor_Curve.hxx
@@ -230,19 +230,19 @@ public:
   Standard_EXPORT occ::handle<Geom2d_BSplineCurve> BSpline() const override;
 
   //! Point evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT gp_Pnt2d EvalD0(double U) const final;
+  [[nodiscard]] Standard_EXPORT gp_Pnt2d EvalD0(const double theU) const final;
 
   //! D1 evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT Geom2d_Curve::ResD1 EvalD1(double U) const final;
+  [[nodiscard]] Standard_EXPORT Geom2d_Curve::ResD1 EvalD1(const double theU) const final;
 
   //! D2 evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT Geom2d_Curve::ResD2 EvalD2(double U) const final;
+  [[nodiscard]] Standard_EXPORT Geom2d_Curve::ResD2 EvalD2(const double theU) const final;
 
   //! D3 evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT Geom2d_Curve::ResD3 EvalD3(double U) const final;
+  [[nodiscard]] Standard_EXPORT Geom2d_Curve::ResD3 EvalD3(const double theU) const final;
 
   //! DN evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT gp_Vec2d EvalDN(double U, int N) const final;
+  [[nodiscard]] Standard_EXPORT gp_Vec2d EvalDN(const double theU, const int theN) const final;
 
 private:
   Standard_EXPORT GeomAbs_Shape LocalContinuity(const double U1, const double U2) const;
diff --git a/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Curve.cxx b/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Curve.cxx
index 09a5a33cf2..df5c3d19ad 100644
--- a/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Curve.cxx
+++ b/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Curve.cxx
@@ -206,35 +206,41 @@ occ::handle<Geom_OffsetCurve> Adaptor3d_Curve::OffsetCurve() const
 
 //=================================================================================================
 
-gp_Pnt Adaptor3d_Curve::EvalD0(double) const
+gp_Pnt Adaptor3d_Curve::EvalD0(const double theU) const
 {
+  (void)theU;
   throw Standard_NotImplemented("Adaptor3d_Curve::EvalD0");
 }
 
 //=================================================================================================
 
-Geom_Curve::ResD1 Adaptor3d_Curve::EvalD1(double) const
+Geom_Curve::ResD1 Adaptor3d_Curve::EvalD1(const double theU) const
 {
+  (void)theU;
   throw Standard_NotImplemented("Adaptor3d_Curve::EvalD1");
 }
 
 //=================================================================================================
 
-Geom_Curve::ResD2 Adaptor3d_Curve::EvalD2(double) const
+Geom_Curve::ResD2 Adaptor3d_Curve::EvalD2(const double theU) const
 {
+  (void)theU;
   throw Standard_NotImplemented("Adaptor3d_Curve::EvalD2");
 }
 
 //=================================================================================================
 
-Geom_Curve::ResD3 Adaptor3d_Curve::EvalD3(double) const
+Geom_Curve::ResD3 Adaptor3d_Curve::EvalD3(const double theU) const
 {
+  (void)theU;
   throw Standard_NotImplemented("Adaptor3d_Curve::EvalD3");
 }
 
 //=================================================================================================
 
-gp_Vec Adaptor3d_Curve::EvalDN(double, int) const
+gp_Vec Adaptor3d_Curve::EvalDN(const double theU, const int theN) const
 {
+  (void)theU;
+  (void)theN;
   throw Standard_NotImplemented("Adaptor3d_Curve::EvalDN");
 }
diff --git a/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Curve.hxx b/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Curve.hxx
index 714e7791a5..22c30846de 100644
--- a/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Curve.hxx
+++ b/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Curve.hxx
@@ -169,23 +169,23 @@ public:
 
   //! Computes the point of parameter U on the curve.
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual gp_Pnt EvalD0(double U) const;
+  [[nodiscard]] Standard_EXPORT virtual gp_Pnt EvalD0(const double theU) const;
 
   //! Computes the point and first derivative at parameter U.
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual Geom_Curve::ResD1 EvalD1(double U) const;
+  [[nodiscard]] Standard_EXPORT virtual Geom_Curve::ResD1 EvalD1(const double theU) const;
 
   //! Computes the point and first two derivatives at parameter U.
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual Geom_Curve::ResD2 EvalD2(double U) const;
+  [[nodiscard]] Standard_EXPORT virtual Geom_Curve::ResD2 EvalD2(const double theU) const;
 
   //! Computes the point and first three derivatives at parameter U.
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual Geom_Curve::ResD3 EvalD3(double U) const;
+  [[nodiscard]] Standard_EXPORT virtual Geom_Curve::ResD3 EvalD3(const double theU) const;
 
   //! Computes the Nth derivative at parameter U.
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual gp_Vec EvalDN(double U, int N) const;
+  [[nodiscard]] Standard_EXPORT virtual gp_Vec EvalDN(const double theU, const int theN) const;
 
   Standard_EXPORT ~Adaptor3d_Curve() override;
 };
diff --git a/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_IsoCurve.cxx b/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_IsoCurve.cxx
index a6e3b54015..f35cf46dce 100644
--- a/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_IsoCurve.cxx
+++ b/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_IsoCurve.cxx
@@ -360,14 +360,14 @@ double Adaptor3d_IsoCurve::Period() const
 
 //=================================================================================================
 
-gp_Pnt Adaptor3d_IsoCurve::EvalD0(double theT) const
+gp_Pnt Adaptor3d_IsoCurve::EvalD0(const double theU) const
 {
   switch (myIso)
   {
     case GeomAbs_IsoU:
-      return mySurface->EvalD0(myParameter, theT);
+      return mySurface->EvalD0(myParameter, theU);
     case GeomAbs_IsoV:
-      return mySurface->EvalD0(theT, myParameter);
+      return mySurface->EvalD0(theU, myParameter);
     case GeomAbs_NoneIso:
       throw Standard_NoSuchObject("Adaptor3d_IsoCurve:NoneIso");
   }
@@ -376,16 +376,16 @@ gp_Pnt Adaptor3d_IsoCurve::EvalD0(double theT) const
 
 //=================================================================================================
 
-Geom_Curve::ResD1 Adaptor3d_IsoCurve::EvalD1(double theT) const
+Geom_Curve::ResD1 Adaptor3d_IsoCurve::EvalD1(const double theU) const
 {
   switch (myIso)
   {
     case GeomAbs_IsoU: {
-      const Geom_Surface::ResD1 aRes = mySurface->EvalD1(myParameter, theT);
+      const Geom_Surface::ResD1 aRes = mySurface->EvalD1(myParameter, theU);
       return {aRes.Point, aRes.D1V};
     }
     case GeomAbs_IsoV: {
-      const Geom_Surface::ResD1 aRes = mySurface->EvalD1(theT, myParameter);
+      const Geom_Surface::ResD1 aRes = mySurface->EvalD1(theU, myParameter);
       return {aRes.Point, aRes.D1U};
     }
     case GeomAbs_NoneIso:
@@ -396,16 +396,16 @@ Geom_Curve::ResD1 Adaptor3d_IsoCurve::EvalD1(double theT) const
 
 //=================================================================================================
 
-Geom_Curve::ResD2 Adaptor3d_IsoCurve::EvalD2(double theT) const
+Geom_Curve::ResD2 Adaptor3d_IsoCurve::EvalD2(const double theU) const
 {
   switch (myIso)
   {
     case GeomAbs_IsoU: {
-      const Geom_Surface::ResD2 aRes = mySurface->EvalD2(myParameter, theT);
+      const Geom_Surface::ResD2 aRes = mySurface->EvalD2(myParameter, theU);
       return {aRes.Point, aRes.D1V, aRes.D2V};
     }
     case GeomAbs_IsoV: {
-      const Geom_Surface::ResD2 aRes = mySurface->EvalD2(theT, myParameter);
+      const Geom_Surface::ResD2 aRes = mySurface->EvalD2(theU, myParameter);
       return {aRes.Point, aRes.D1U, aRes.D2U};
     }
     case GeomAbs_NoneIso:
@@ -416,16 +416,16 @@ Geom_Curve::ResD2 Adaptor3d_IsoCurve::EvalD2(double theT) const
 
 //=================================================================================================
 
-Geom_Curve::ResD3 Adaptor3d_IsoCurve::EvalD3(double theT) const
+Geom_Curve::ResD3 Adaptor3d_IsoCurve::EvalD3(const double theU) const
 {
   switch (myIso)
   {
     case GeomAbs_IsoU: {
-      const Geom_Surface::ResD3 aRes = mySurface->EvalD3(myParameter, theT);
+      const Geom_Surface::ResD3 aRes = mySurface->EvalD3(myParameter, theU);
       return {aRes.Point, aRes.D1V, aRes.D2V, aRes.D3V};
     }
     case GeomAbs_IsoV: {
-      const Geom_Surface::ResD3 aRes = mySurface->EvalD3(theT, myParameter);
+      const Geom_Surface::ResD3 aRes = mySurface->EvalD3(theU, myParameter);
       return {aRes.Point, aRes.D1U, aRes.D2U, aRes.D3U};
     }
     case GeomAbs_NoneIso:
@@ -436,14 +436,14 @@ Geom_Curve::ResD3 Adaptor3d_IsoCurve::EvalD3(double theT) const
 
 //=================================================================================================
 
-gp_Vec Adaptor3d_IsoCurve::EvalDN(double theT, int theN) const
+gp_Vec Adaptor3d_IsoCurve::EvalDN(const double theU, const int theN) const
 {
   switch (myIso)
   {
     case GeomAbs_IsoU:
-      return mySurface->EvalDN(myParameter, theT, 0, theN);
+      return mySurface->EvalDN(myParameter, theU, 0, theN);
     case GeomAbs_IsoV:
-      return mySurface->EvalDN(theT, myParameter, theN, 0);
+      return mySurface->EvalDN(theU, myParameter, theN, 0);
     case GeomAbs_NoneIso:
       throw Standard_NoSuchObject("Adaptor3d_IsoCurve:NoneIso");
   }
diff --git a/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_IsoCurve.hxx b/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_IsoCurve.hxx
index 471ed958f2..e9d82c63cf 100644
--- a/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_IsoCurve.hxx
+++ b/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_IsoCurve.hxx
@@ -106,24 +106,24 @@ public:
   Standard_EXPORT double Period() const override;
 
   //! Computes the point of parameter theU on the curve.
-  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(double theU) const final;
+  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(const double theU) const final;
 
   //! Computes the point of parameter theU on the curve with its first derivative.
   //! Raised if the continuity of the current interval is not C1.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(const double theU) const final;
 
   //! Returns the point and the first and second derivatives at parameter theU.
   //! Raised if the continuity of the current interval is not C2.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(const double theU) const final;
 
   //! Returns the point and the first, second and third derivatives at parameter theU.
   //! Raised if the continuity of the current interval is not C3.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(const double theU) const final;
 
   //! Returns the derivative of order theN at parameter theU.
   //! Raised if the continuity of the current interval is not CN.
   //! Raised if theN < 1.
-  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(double theU, int theN) const final;
+  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(const double theU, const int theN) const final;
 
   //! Returns the parametric resolution corresponding
   //! to the real space resolution <R3d>.
diff --git a/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Surface.cxx b/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Surface.cxx
index caec36d042..c4146e446b 100644
--- a/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Surface.cxx
+++ b/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Surface.cxx
@@ -347,35 +347,50 @@ double Adaptor3d_Surface::OffsetValue() const
 
 //=================================================================================================
 
-gp_Pnt Adaptor3d_Surface::EvalD0(double, double) const
+gp_Pnt Adaptor3d_Surface::EvalD0(const double theU, const double theV) const
 {
+  (void)theU;
+  (void)theV;
   throw Standard_NotImplemented("Adaptor3d_Surface::EvalD0");
 }
 
 //=================================================================================================
 
-Geom_Surface::ResD1 Adaptor3d_Surface::EvalD1(double, double) const
+Geom_Surface::ResD1 Adaptor3d_Surface::EvalD1(const double theU, const double theV) const
 {
+  (void)theU;
+  (void)theV;
   throw Standard_NotImplemented("Adaptor3d_Surface::EvalD1");
 }
 
 //=================================================================================================
 
-Geom_Surface::ResD2 Adaptor3d_Surface::EvalD2(double, double) const
+Geom_Surface::ResD2 Adaptor3d_Surface::EvalD2(const double theU, const double theV) const
 {
+  (void)theU;
+  (void)theV;
   throw Standard_NotImplemented("Adaptor3d_Surface::EvalD2");
 }
 
 //=================================================================================================
 
-Geom_Surface::ResD3 Adaptor3d_Surface::EvalD3(double, double) const
+Geom_Surface::ResD3 Adaptor3d_Surface::EvalD3(const double theU, const double theV) const
 {
+  (void)theU;
+  (void)theV;
   throw Standard_NotImplemented("Adaptor3d_Surface::EvalD3");
 }
 
 //=================================================================================================
 
-gp_Vec Adaptor3d_Surface::EvalDN(double, double, int, int) const
+gp_Vec Adaptor3d_Surface::EvalDN(const double theU,
+                                 const double theV,
+                                 const int    theNu,
+                                 const int    theNv) const
 {
+  (void)theU;
+  (void)theV;
+  (void)theNu;
+  (void)theNv;
   throw Standard_NotImplemented("Adaptor3d_Surface::EvalDN");
 }
diff --git a/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Surface.hxx b/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Surface.hxx
index 8eac2f13cf..db863e67ce 100644
--- a/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Surface.hxx
+++ b/src/ModelingData/TKG3d/Adaptor3d/Adaptor3d_Surface.hxx
@@ -257,23 +257,29 @@ public:
 
   //! Computes the point of parameters (U, V) on the surface.
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual gp_Pnt EvalD0(double U, double V) const;
+  [[nodiscard]] Standard_EXPORT virtual gp_Pnt EvalD0(const double theU, const double theV) const;
 
   //! Computes the point and first partial derivatives at (U, V).
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual Geom_Surface::ResD1 EvalD1(double U, double V) const;
+  [[nodiscard]] Standard_EXPORT virtual Geom_Surface::ResD1 EvalD1(const double theU,
+                                                                   const double theV) const;
 
   //! Computes the point and partial derivatives up to 2nd order at (U, V).
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual Geom_Surface::ResD2 EvalD2(double U, double V) const;
+  [[nodiscard]] Standard_EXPORT virtual Geom_Surface::ResD2 EvalD2(const double theU,
+                                                                   const double theV) const;
 
   //! Computes the point and partial derivatives up to 3rd order at (U, V).
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual Geom_Surface::ResD3 EvalD3(double U, double V) const;
+  [[nodiscard]] Standard_EXPORT virtual Geom_Surface::ResD3 EvalD3(const double theU,
+                                                                   const double theV) const;
 
   //! Computes the derivative of order Nu in U and Nv in V at (U, V).
   //! Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT virtual gp_Vec EvalDN(double U, double V, int Nu, int Nv) const;
+  [[nodiscard]] Standard_EXPORT virtual gp_Vec EvalDN(const double theU,
+                                                      const double theV,
+                                                      const int    theNu,
+                                                      const int    theNv) const;
 
   Standard_EXPORT ~Adaptor3d_Surface() override;
 };
diff --git a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Curve.cxx b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Curve.cxx
index cfdbe817a8..d7e804f798 100644
--- a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Curve.cxx
+++ b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Curve.cxx
@@ -646,9 +646,10 @@ bool GeomAdaptor_Curve::IsBoundary(const double theU, int& theSpanStart, int& th
 
 //=================================================================================================
 
-gp_Pnt GeomAdaptor_Curve::EvalD0(double U) const
+gp_Pnt GeomAdaptor_Curve::EvalD0(const double theU) const
 {
-  gp_Pnt P;
+  const double U = theU;
+  gp_Pnt       P;
   switch (myTypeCurve)
   {
     case GeomAbs_Line:
@@ -727,8 +728,9 @@ gp_Pnt GeomAdaptor_Curve::EvalD0(double U) const
 
 //=================================================================================================
 
-Geom_Curve::ResD1 GeomAdaptor_Curve::EvalD1(double U) const
+Geom_Curve::ResD1 GeomAdaptor_Curve::EvalD1(const double theU) const
 {
+  const double      U = theU;
   Geom_Curve::ResD1 aResult;
   switch (myTypeCurve)
   {
@@ -809,8 +811,9 @@ Geom_Curve::ResD1 GeomAdaptor_Curve::EvalD1(double U) const
 
 //=================================================================================================
 
-Geom_Curve::ResD2 GeomAdaptor_Curve::EvalD2(double U) const
+Geom_Curve::ResD2 GeomAdaptor_Curve::EvalD2(const double theU) const
 {
+  const double      U = theU;
   Geom_Curve::ResD2 aResult;
   switch (myTypeCurve)
   {
@@ -893,8 +896,9 @@ Geom_Curve::ResD2 GeomAdaptor_Curve::EvalD2(double U) const
 
 //=================================================================================================
 
-Geom_Curve::ResD3 GeomAdaptor_Curve::EvalD3(double U) const
+Geom_Curve::ResD3 GeomAdaptor_Curve::EvalD3(const double theU) const
 {
+  const double      U = theU;
   Geom_Curve::ResD3 aResult;
   switch (myTypeCurve)
   {
@@ -996,8 +1000,10 @@ Geom_Curve::ResD3 GeomAdaptor_Curve::EvalD3(double U) const
 
 //=================================================================================================
 
-gp_Vec GeomAdaptor_Curve::EvalDN(double U, int N) const
+gp_Vec GeomAdaptor_Curve::EvalDN(const double theU, const int theN) const
 {
+  const double U = theU;
+  const int    N = theN;
   switch (myTypeCurve)
   {
     case GeomAbs_Line:
diff --git a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Curve.hxx b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Curve.hxx
index e0fe82fd2b..a76c5eb3c2 100644
--- a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Curve.hxx
+++ b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Curve.hxx
@@ -225,19 +225,19 @@ public:
   Standard_EXPORT occ::handle<Geom_OffsetCurve> OffsetCurve() const override;
 
   //! Point evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(double U) const final;
+  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(const double theU) const final;
 
   //! D1 evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(double U) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(const double theU) const final;
 
   //! D2 evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(double U) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(const double theU) const final;
 
   //! D3 evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(double U) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(const double theU) const final;
 
   //! DN evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(double U, int N) const final;
+  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(const double theU, const int theN) const final;
 
   friend class GeomAdaptor_Surface;
 
diff --git a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Surface.cxx b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Surface.cxx
index 0d222df3f6..5159a653b5 100644
--- a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Surface.cxx
+++ b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Surface.cxx
@@ -995,9 +995,11 @@ void GeomAdaptor_Surface::RebuildCache(const double theU, const double theV) con
 
 //=================================================================================================
 
-gp_Pnt GeomAdaptor_Surface::EvalD0(double U, double V) const
+gp_Pnt GeomAdaptor_Surface::EvalD0(const double theU, const double theV) const
 {
-  gp_Pnt P;
+  const double U = theU;
+  const double V = theV;
+  gp_Pnt       P;
   switch (mySurfaceType)
   {
     case GeomAbs_Plane:
@@ -1079,8 +1081,10 @@ gp_Pnt GeomAdaptor_Surface::EvalD0(double U, double V) const
 
 //=================================================================================================
 
-Geom_Surface::ResD1 GeomAdaptor_Surface::EvalD1(double U, double V) const
+Geom_Surface::ResD1 GeomAdaptor_Surface::EvalD1(const double theU, const double theV) const
 {
+  const double        U = theU;
+  const double        V = theV;
   Geom_Surface::ResD1 aResult;
   int                 Ideb, Ifin, IVdeb, IVfin, USide = 0, VSide = 0;
   double              u = U, v = V;
@@ -1209,8 +1213,10 @@ Geom_Surface::ResD1 GeomAdaptor_Surface::EvalD1(double U, double V) const
 
 //=================================================================================================
 
-Geom_Surface::ResD2 GeomAdaptor_Surface::EvalD2(double U, double V) const
+Geom_Surface::ResD2 GeomAdaptor_Surface::EvalD2(const double theU, const double theV) const
 {
+  const double        U = theU;
+  const double        V = theV;
   Geom_Surface::ResD2 aResult;
   int                 Ideb, Ifin, IVdeb, IVfin, USide = 0, VSide = 0;
   double              u = U, v = V;
@@ -1402,8 +1408,10 @@ Geom_Surface::ResD2 GeomAdaptor_Surface::EvalD2(double U, double V) const
 
 //=================================================================================================
 
-Geom_Surface::ResD3 GeomAdaptor_Surface::EvalD3(double U, double V) const
+Geom_Surface::ResD3 GeomAdaptor_Surface::EvalD3(const double theU, const double theV) const
 {
+  const double        U = theU;
+  const double        V = theV;
   Geom_Surface::ResD3 aResult;
   int                 Ideb, Ifin, IVdeb, IVfin, USide = 0, VSide = 0;
   double              u = U, v = V;
@@ -1616,10 +1624,17 @@ Geom_Surface::ResD3 GeomAdaptor_Surface::EvalD3(double U, double V) const
 
 //=================================================================================================
 
-gp_Vec GeomAdaptor_Surface::EvalDN(double U, double V, int Nu, int Nv) const
+gp_Vec GeomAdaptor_Surface::EvalDN(const double theU,
+                                   const double theV,
+                                   const int    theNu,
+                                   const int    theNv) const
 {
-  int    Ideb, Ifin, IVdeb, IVfin, USide = 0, VSide = 0;
-  double u = U, v = V;
+  const double U  = theU;
+  const double V  = theV;
+  const int    Nu = theNu;
+  const int    Nv = theNv;
+  int          Ideb, Ifin, IVdeb, IVfin, USide = 0, VSide = 0;
+  double       u = U, v = V;
   if (std::abs(U - myUFirst) <= myTolU)
   {
     USide = 1;
diff --git a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Surface.hxx b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Surface.hxx
index 7a4b102481..29a936111d 100644
--- a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Surface.hxx
+++ b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_Surface.hxx
@@ -261,19 +261,25 @@ public:
   Standard_EXPORT double VPeriod() const override;
 
   //! Point evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(double U, double V) const final;
+  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(const double theU, const double theV) const final;
 
   //! D1 evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT Geom_Surface::ResD1 EvalD1(double U, double V) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Surface::ResD1 EvalD1(const double theU,
+                                                           const double theV) const final;
 
   //! D2 evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT Geom_Surface::ResD2 EvalD2(double U, double V) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Surface::ResD2 EvalD2(const double theU,
+                                                           const double theV) const final;
 
   //! D3 evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT Geom_Surface::ResD3 EvalD3(double U, double V) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Surface::ResD3 EvalD3(const double theU,
+                                                           const double theV) const final;
 
   //! DN evaluation. Raises an exception on failure.
-  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(double U, double V, int Nu, int Nv) const final;
+  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(const double theU,
+                                              const double theV,
+                                              const int    theNu,
+                                              const int    theNv) const final;
 
   //! Returns the parametric U resolution corresponding
   //! to the real space resolution <R3d>.
diff --git a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_TransformedCurve.cxx b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_TransformedCurve.cxx
index 3ef1c9480d..26da21a773 100644
--- a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_TransformedCurve.cxx
+++ b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_TransformedCurve.cxx
@@ -200,7 +200,7 @@ occ::handle<Geom_OffsetCurve> GeomAdaptor_TransformedCurve::OffsetCurve() const
 
 //==================================================================================================
 
-gp_Pnt GeomAdaptor_TransformedCurve::EvalD0(double theU) const
+gp_Pnt GeomAdaptor_TransformedCurve::EvalD0(const double theU) const
 {
   gp_Pnt aP;
   if (myConSurf.IsNull())
@@ -213,7 +213,7 @@ gp_Pnt GeomAdaptor_TransformedCurve::EvalD0(double theU) const
 
 //==================================================================================================
 
-Geom_Curve::ResD1 GeomAdaptor_TransformedCurve::EvalD1(double theU) const
+Geom_Curve::ResD1 GeomAdaptor_TransformedCurve::EvalD1(const double theU) const
 {
   Geom_Curve::ResD1 aRes;
   if (myConSurf.IsNull())
@@ -227,7 +227,7 @@ Geom_Curve::ResD1 GeomAdaptor_TransformedCurve::EvalD1(double theU) const
 
 //==================================================================================================
 
-Geom_Curve::ResD2 GeomAdaptor_TransformedCurve::EvalD2(double theU) const
+Geom_Curve::ResD2 GeomAdaptor_TransformedCurve::EvalD2(const double theU) const
 {
   Geom_Curve::ResD2 aRes;
   if (myConSurf.IsNull())
@@ -242,7 +242,7 @@ Geom_Curve::ResD2 GeomAdaptor_TransformedCurve::EvalD2(double theU) const
 
 //==================================================================================================
 
-Geom_Curve::ResD3 GeomAdaptor_TransformedCurve::EvalD3(double theU) const
+Geom_Curve::ResD3 GeomAdaptor_TransformedCurve::EvalD3(const double theU) const
 {
   Geom_Curve::ResD3 aRes;
   if (myConSurf.IsNull())
@@ -258,7 +258,7 @@ Geom_Curve::ResD3 GeomAdaptor_TransformedCurve::EvalD3(double theU) const
 
 //==================================================================================================
 
-gp_Vec GeomAdaptor_TransformedCurve::EvalDN(double theU, int theN) const
+gp_Vec GeomAdaptor_TransformedCurve::EvalDN(const double theU, const int theN) const
 {
   gp_Vec aV;
   if (myConSurf.IsNull())
diff --git a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_TransformedSurface.cxx b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_TransformedSurface.cxx
index f2746cd223..a04a334ddd 100644
--- a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_TransformedSurface.cxx
+++ b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_TransformedSurface.cxx
@@ -234,7 +234,7 @@ occ::handle<Adaptor3d_Surface> GeomAdaptor_TransformedSurface::VTrim(const doubl
 
 //=================================================================================================
 
-gp_Pnt GeomAdaptor_TransformedSurface::EvalD0(double theU, double theV) const
+gp_Pnt GeomAdaptor_TransformedSurface::EvalD0(const double theU, const double theV) const
 {
   if (myTrsf.Form() == gp_Identity)
   {
@@ -245,7 +245,8 @@ gp_Pnt GeomAdaptor_TransformedSurface::EvalD0(double theU, double theV) const
 
 //=================================================================================================
 
-Geom_Surface::ResD1 GeomAdaptor_TransformedSurface::EvalD1(double theU, double theV) const
+Geom_Surface::ResD1 GeomAdaptor_TransformedSurface::EvalD1(const double theU,
+                                                           const double theV) const
 {
   if (myTrsf.Form() == gp_Identity)
   {
@@ -260,7 +261,8 @@ Geom_Surface::ResD1 GeomAdaptor_TransformedSurface::EvalD1(double theU, double t
 
 //=================================================================================================
 
-Geom_Surface::ResD2 GeomAdaptor_TransformedSurface::EvalD2(double theU, double theV) const
+Geom_Surface::ResD2 GeomAdaptor_TransformedSurface::EvalD2(const double theU,
+                                                           const double theV) const
 {
   if (myTrsf.Form() == gp_Identity)
   {
@@ -278,7 +280,8 @@ Geom_Surface::ResD2 GeomAdaptor_TransformedSurface::EvalD2(double theU, double t
 
 //=================================================================================================
 
-Geom_Surface::ResD3 GeomAdaptor_TransformedSurface::EvalD3(double theU, double theV) const
+Geom_Surface::ResD3 GeomAdaptor_TransformedSurface::EvalD3(const double theU,
+                                                           const double theV) const
 {
   if (myTrsf.Form() == gp_Identity)
   {
@@ -300,7 +303,10 @@ Geom_Surface::ResD3 GeomAdaptor_TransformedSurface::EvalD3(double theU, double t
 
 //=================================================================================================
 
-gp_Vec GeomAdaptor_TransformedSurface::EvalDN(double theU, double theV, int theNu, int theNv) const
+gp_Vec GeomAdaptor_TransformedSurface::EvalDN(const double theU,
+                                              const double theV,
+                                              const int    theNu,
+                                              const int    theNv) const
 {
   if (myTrsf.Form() == gp_Identity)
   {
diff --git a/src/ModelingData/TKGeomBase/ProjLib/ProjLib_ProjectOnPlane.cxx b/src/ModelingData/TKGeomBase/ProjLib/ProjLib_ProjectOnPlane.cxx
index 3fd03a4bb4..a14f6e860b 100644
--- a/src/ModelingData/TKGeomBase/ProjLib/ProjLib_ProjectOnPlane.cxx
+++ b/src/ModelingData/TKGeomBase/ProjLib/ProjLib_ProjectOnPlane.cxx
@@ -1082,7 +1082,7 @@ double ProjLib_ProjectOnPlane::Period() const
 
 //=================================================================================================
 
-gp_Pnt ProjLib_ProjectOnPlane::EvalD0(double theU) const
+gp_Pnt ProjLib_ProjectOnPlane::EvalD0(const double theU) const
 {
   if (myType != GeomAbs_OtherCurve)
   {
@@ -1096,7 +1096,7 @@ gp_Pnt ProjLib_ProjectOnPlane::EvalD0(double theU) const
 
 //=================================================================================================
 
-Geom_Curve::ResD1 ProjLib_ProjectOnPlane::EvalD1(double theU) const
+Geom_Curve::ResD1 ProjLib_ProjectOnPlane::EvalD1(const double theU) const
 {
   if (myType != GeomAbs_OtherCurve)
   {
@@ -1113,7 +1113,7 @@ Geom_Curve::ResD1 ProjLib_ProjectOnPlane::EvalD1(double theU) const
 
 //=================================================================================================
 
-Geom_Curve::ResD2 ProjLib_ProjectOnPlane::EvalD2(double theU) const
+Geom_Curve::ResD2 ProjLib_ProjectOnPlane::EvalD2(const double theU) const
 {
   if (myType != GeomAbs_OtherCurve)
   {
@@ -1130,7 +1130,7 @@ Geom_Curve::ResD2 ProjLib_ProjectOnPlane::EvalD2(double theU) const
 
 //=================================================================================================
 
-Geom_Curve::ResD3 ProjLib_ProjectOnPlane::EvalD3(double theU) const
+Geom_Curve::ResD3 ProjLib_ProjectOnPlane::EvalD3(const double theU) const
 {
   if (myType != GeomAbs_OtherCurve)
   {
@@ -1147,7 +1147,7 @@ Geom_Curve::ResD3 ProjLib_ProjectOnPlane::EvalD3(double theU) const
 
 //=================================================================================================
 
-gp_Vec ProjLib_ProjectOnPlane::EvalDN(double theU, int theN) const
+gp_Vec ProjLib_ProjectOnPlane::EvalDN(const double theU, const int theN) const
 {
   if (myType != GeomAbs_OtherCurve)
   {
diff --git a/src/ModelingData/TKGeomBase/ProjLib/ProjLib_ProjectOnPlane.hxx b/src/ModelingData/TKGeomBase/ProjLib/ProjLib_ProjectOnPlane.hxx
index 474634487e..9e426e9080 100644
--- a/src/ModelingData/TKGeomBase/ProjLib/ProjLib_ProjectOnPlane.hxx
+++ b/src/ModelingData/TKGeomBase/ProjLib/ProjLib_ProjectOnPlane.hxx
@@ -115,24 +115,24 @@ public:
   Standard_EXPORT double Period() const override;
 
   //! Computes the point of parameter theU on the curve.
-  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(double theU) const final;
+  [[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(const double theU) const final;
 
   //! Computes the point of parameter theU on the curve with its first derivative.
   //! Raised if the continuity of the current interval is not C1.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(const double theU) const final;
 
   //! Returns the point and the first and second derivatives at parameter theU.
   //! Raised if the continuity of the current interval is not C2.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(const double theU) const final;
 
   //! Returns the point and the first, second and third derivatives at parameter theU.
   //! Raised if the continuity of the current interval is not C3.
-  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(double theU) const final;
+  [[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(const double theU) const final;
 
   //! Returns the derivative of order theN at parameter theU.
   //! Raised if the continuity of the current interval is not CN.
   //! Raised if theN < 1.
-  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(double theU, int theN) const final;
+  [[nodiscard]] Standard_EXPORT gp_Vec EvalDN(const double theU, const int theN) const final;
 
   //! Returns the parametric resolution corresponding
   //! to the real space resolution <R3d>.