0028799: Coding Rules - elimilate confusing Quantity aliases of Standard_Real type

Aliases to Standard_Real within Quantity package have been marked as deprecated.

src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx

@@ -164,7 +164,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
     Handle(Geom_Curve) c = BRep_Tool::Curve(e, f, l);
     Handle(Geom2d_Curve) c2d = GeomAPI::To2d(c, Plane->Pln());
     Geom2dAPI_ExtremaCurveCurve extr(ln2d, c2d, LineFirst, LineLast,f,l);
-    Quantity_Length L = RealLast();
+    Standard_Real L = RealLast();
     if(extr.NbExtrema() >= 1) {
       L = extr.LowerDistance();
     }

src/BRepFill/BRepFill_Filling.cxx

@@ -576,7 +576,7 @@ void BRepFill_Filling::Build()
   for (j = 1; j <= myFreeConstraints.Length(); j++)
     {
       GeomAPI_ProjectPointOnSurf Projector;
-      Quantity_Parameter U1, V1, U2, V2;
+      Standard_Real U1, V1, U2, V2;
 
       CurFace = myFreeConstraints(j).myFace;
       Handle( BRepAdaptor_HSurface ) HSurf = new BRepAdaptor_HSurface();

src/BRepSweep/BRepSweep_Revol.hxx

@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <BRepSweep_Rotation.hxx>
-#include <Quantity_PlaneAngle.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 class Standard_ConstructionError;
@@ -43,7 +42,7 @@ public:
   
   //! Builds the Revol of meridian S axis A  and angle D. If
   //! C is true S is copied.
-  Standard_EXPORT BRepSweep_Revol(const TopoDS_Shape& S, const gp_Ax1& A, const Quantity_PlaneAngle D, const Standard_Boolean C = Standard_False);
+  Standard_EXPORT BRepSweep_Revol(const TopoDS_Shape& S, const gp_Ax1& A, const Standard_Real D, const Standard_Boolean C = Standard_False);
   
   //! Builds the Revol of meridian S  axis A and angle 2*Pi.
   //! If C is true S is copied.
@@ -76,20 +75,10 @@ public:
   Standard_EXPORT gp_Ax1 Axe() const;
   
   //! returns the angle.
-  Standard_EXPORT Quantity_PlaneAngle Angle() const;
+  Standard_EXPORT Standard_Real Angle() const;
-
-
-
-
-protected:
-
-
-
-
 
 private:
 
-  
   //! builds the NumShape.
   Standard_EXPORT Sweep_NumShape NumShape (const Standard_Real D) const;
   
@@ -108,10 +97,4 @@ private:
 
 };
 
-
-
-
-
-
-
 #endif // _BRepSweep_Revol_HeaderFile

src/BRepSweep/BRepSweep_Rotation.hxx

@@ -24,7 +24,6 @@
 #include <Standard_Real.hxx>
 #include <gp_Ax1.hxx>
 #include <BRepSweep_Trsf.hxx>
-#include <Quantity_PlaneAngle.hxx>
 #include <Standard_Boolean.hxx>
 #include <TopAbs_Orientation.hxx>
 class Standard_ConstructionError;
@@ -45,7 +44,7 @@ public:
   
   //! Creates a topology  by rotating <S>  around A with the
   //! angle D.
-  Standard_EXPORT BRepSweep_Rotation(const TopoDS_Shape& S, const Sweep_NumShape& N, const TopLoc_Location& L, const gp_Ax1& A, const Quantity_PlaneAngle D, const Standard_Boolean C);
+  Standard_EXPORT BRepSweep_Rotation(const TopoDS_Shape& S, const Sweep_NumShape& N, const TopLoc_Location& L, const gp_Ax1& A, const Standard_Real D, const Standard_Boolean C);
   
   //! Builds the vertex addressed by [aGenV,aDirV], with its
   //! geometric part, but without subcomponents.
@@ -139,31 +138,13 @@ public:
   Standard_EXPORT gp_Ax1 Axe() const;
   
   //! returns the angle.
-  Standard_EXPORT Quantity_PlaneAngle Angle() const;
+  Standard_EXPORT Standard_Real Angle() const;
-
-
-
-
-protected:
-
-
-
-
 
 private:
 
-
-
   Standard_Real myAng;
   gp_Ax1 myAxe;
 
-
 };
 
-
-
-
-
-
-
 #endif // _BRepSweep_Rotation_HeaderFile

src/Geom2dAPI/Geom2dAPI_ExtremaCurveCurve.hxx

@@ -25,8 +25,6 @@
 #include <Standard_Integer.hxx>
 #include <Extrema_ExtCC2d.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
-#include <Quantity_Parameter.hxx>
-#include <Quantity_Length.hxx>
 class Standard_OutOfRange;
 class StdFail_NotDone;
 class Geom2d_Curve;
@@ -72,7 +70,7 @@ public:
   //! Warning
   //! Use the function NbExtrema to obtain the number
   //! of solutions. If this algorithm fails, NbExtrema returns 0.
-  Standard_EXPORT Geom2dAPI_ExtremaCurveCurve(const Handle(Geom2d_Curve)& C1, const Handle(Geom2d_Curve)& C2, const Quantity_Parameter U1min, const Quantity_Parameter U1max, const Quantity_Parameter U2min, const Quantity_Parameter U2max);
+  Standard_EXPORT Geom2dAPI_ExtremaCurveCurve(const Handle(Geom2d_Curve)& C1, const Handle(Geom2d_Curve)& C2, const Standard_Real U1min, const Standard_Real U1max, const Standard_Real U2min, const Standard_Real U2max);
   
   //! Returns the number of extrema computed by this algorithm.
   //! Note: if this algorithm fails, NbExtrema returns 0.
@@ -96,7 +94,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Standard_OutOfRange if Index is not in the range [
   //! 1,NbExtrema ], where NbExtrema is the
   //! number of extrema computed by this algorithm.
-  Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& U1, Quantity_Parameter& U2) const;
+  Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& U1, Standard_Real& U2) const;
   
   //! Computes the distance between the end points of the
   //! extremum of index Index computed by this algorithm.
@@ -104,7 +102,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Standard_OutOfRange if Index is not in the range [
   //! 1,NbExtrema ], where NbExtrema is the
   //! number of extrema computed by this algorithm.
-  Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const;
+  Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const;
   
   //! Returns the points P1 on the first curve and P2 on
   //! the second curve, which are the ends of the shortest
@@ -117,12 +115,12 @@ Standard_EXPORT operator Standard_Integer() const;
   //! are the ends of the shortest extremum computed by this algorithm.
   //! Exceptions
   //! StdFail_NotDone if this algorithm fails.
-  Standard_EXPORT void LowerDistanceParameters (Quantity_Parameter& U1, Quantity_Parameter& U2) const;
+  Standard_EXPORT void LowerDistanceParameters (Standard_Real& U1, Standard_Real& U2) const;
   
   //! Computes the distance between the end points of the
   //! shortest extremum computed by this algorithm.
   //! Exceptions - StdFail_NotDone if this algorithm fails.
-  Standard_EXPORT Quantity_Length LowerDistance() const;
+  Standard_EXPORT Standard_Real LowerDistance() const;
 Standard_EXPORT operator Standard_Real() const;
   
     const Extrema_ExtCC2d& Extrema() const;

src/Geom2dAPI/Geom2dAPI_ProjectPointOnCurve.hxx

@@ -25,8 +25,6 @@
 #include <Standard_Integer.hxx>
 #include <Extrema_ExtPC2d.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
-#include <Quantity_Parameter.hxx>
-#include <Quantity_Length.hxx>
 class Standard_OutOfRange;
 class StdFail_NotDone;
 class gp_Pnt2d;
@@ -57,7 +55,7 @@ public:
   //! Warning
   //! Use the function NbPoints to obtain the number of solutions. If
   //! projection fails, NbPoints returns 0.
-  Standard_EXPORT Geom2dAPI_ProjectPointOnCurve(const gp_Pnt2d& P, const Handle(Geom2d_Curve)& Curve, const Quantity_Parameter Umin, const Quantity_Parameter Usup);
+  Standard_EXPORT Geom2dAPI_ProjectPointOnCurve(const gp_Pnt2d& P, const Handle(Geom2d_Curve)& Curve, const Standard_Real Umin, const Standard_Real Usup);
   
   //! Initializes this algorithm with the given arguments, and
   //! computes the orthogonal  projections  of a  point  <P> on a curve <Curve>
@@ -66,7 +64,7 @@ public:
   //! Initializes this algorithm with the given arguments, and
   //! computes the orthogonal projections of the point P onto the portion
   //! of the curve Curve limited by the two points of parameter Umin and Usup.
-  Standard_EXPORT void Init (const gp_Pnt2d& P, const Handle(Geom2d_Curve)& Curve, const Quantity_Parameter Umin, const Quantity_Parameter Usup);
+  Standard_EXPORT void Init (const gp_Pnt2d& P, const Handle(Geom2d_Curve)& Curve, const Standard_Real Umin, const Standard_Real Usup);
   
   //! return the number of of computed
   //! orthogonal projectionn points.
@@ -86,7 +84,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Exceptions
   //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where
   //! NbPoints is the number of solution points.
-  Standard_EXPORT Quantity_Parameter Parameter (const Standard_Integer Index) const;
+  Standard_EXPORT Standard_Real Parameter (const Standard_Integer Index) const;
   
   //! Returns the parameter on the curve
   //! of a point which is the orthogonal projection. Index is a number of a
@@ -94,7 +92,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Exceptions
   //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where
   //! NbPoints is the number of solution points
-  Standard_EXPORT void Parameter (const Standard_Integer Index, Quantity_Parameter& U) const;
+  Standard_EXPORT void Parameter (const Standard_Integer Index, Standard_Real& U) const;
   
   //! Computes the distance between the
   //! point and its computed orthogonal projection on the curve. Index is a
@@ -102,7 +100,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Exceptions
   //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where
   //! NbPoints is the number of solution points.
-  Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const;
+  Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const;
   
   //! Returns the nearest orthogonal projection of the point on the curve.
   //! Exceptions
@@ -114,31 +112,20 @@ Standard_EXPORT operator gp_Pnt2d() const;
   //! of the nearest orthogonal projection of the point.
   //! Exceptions
   //! StdFail_NotDone if this algorithm fails.
-  Standard_EXPORT Quantity_Parameter LowerDistanceParameter() const;
+  Standard_EXPORT Standard_Real LowerDistanceParameter() const;
   
   //! Computes the distance between the
   //! point and its nearest orthogonal projection on the curve.
   //! Exceptions
   //! StdFail_NotDone if this algorithm fails.
-  Standard_EXPORT Quantity_Length LowerDistance() const;
+  Standard_EXPORT Standard_Real LowerDistance() const;
 Standard_EXPORT operator Standard_Real() const;
   
   //! return the algorithmic object from Extrema
     const Extrema_ExtPC2d& Extrema() const;
 
-
-
-
-protected:
-
-
-
-
-
 private:
 
-
-
   Standard_Boolean myIsDone;
   Standard_Integer myIndex;
   Extrema_ExtPC2d myExtPC;

src/GeomAPI/GeomAPI_ExtremaCurveCurve.cxx

@@ -303,8 +303,8 @@ Standard_Boolean GeomAPI_ExtremaCurveCurve::TotalNearestPoints(gp_Pnt& P1,gp_Pnt
     
 }
 
-Standard_Boolean GeomAPI_ExtremaCurveCurve::TotalLowerDistanceParameters(Quantity_Parameter& U1, 
+Standard_Boolean GeomAPI_ExtremaCurveCurve::TotalLowerDistanceParameters(Standard_Real& U1, 
-									 Quantity_Parameter& U2) 
+									 Standard_Real& U2) 
 {
   if(!myTotalExt) {
 
@@ -322,7 +322,7 @@ Standard_Boolean GeomAPI_ExtremaCurveCurve::TotalLowerDistanceParameters(Quantit
 
 }
 
-Quantity_Length GeomAPI_ExtremaCurveCurve::TotalLowerDistance() 
+Standard_Real GeomAPI_ExtremaCurveCurve::TotalLowerDistance() 
 {
   if(!myTotalExt) {
 

src/GeomAPI/GeomAPI_ExtremaCurveCurve.hxx

@@ -27,8 +27,6 @@
 #include <GeomAdaptor_Curve.hxx>
 #include <Standard_Real.hxx>
 #include <gp_Pnt.hxx>
-#include <Quantity_Parameter.hxx>
-#include <Quantity_Length.hxx>
 class Standard_OutOfRange;
 class StdFail_NotDone;
 class Geom_Curve;
@@ -80,7 +78,7 @@ public:
   //! Warning
   //! Use the function NbExtrema to obtain the number
   //! of solutions. If this algorithm fails, NbExtrema returns 0.
-  Standard_EXPORT GeomAPI_ExtremaCurveCurve(const Handle(Geom_Curve)& C1, const Handle(Geom_Curve)& C2, const Quantity_Parameter U1min, const Quantity_Parameter U1max, const Quantity_Parameter U2min, const Quantity_Parameter U2max);
+  Standard_EXPORT GeomAPI_ExtremaCurveCurve(const Handle(Geom_Curve)& C1, const Handle(Geom_Curve)& C2, const Standard_Real U1min, const Standard_Real U1max, const Standard_Real U2min, const Standard_Real U2max);
   
   //! Initializes this algorithm with the given arguments
   //! and computes the extrema between the curves C1 and C2
@@ -95,7 +93,7 @@ public:
   //! Warning
   //! Use the function NbExtrema to obtain the number
   //! of solutions. If this algorithm fails, NbExtrema returns 0.
-  Standard_EXPORT void Init (const Handle(Geom_Curve)& C1, const Handle(Geom_Curve)& C2, const Quantity_Parameter U1min, const Quantity_Parameter U1max, const Quantity_Parameter U2min, const Quantity_Parameter U2max);
+  Standard_EXPORT void Init (const Handle(Geom_Curve)& C1, const Handle(Geom_Curve)& C2, const Standard_Real U1min, const Standard_Real U1max, const Standard_Real U2min, const Standard_Real U2max);
   
   //! Returns the number of extrema computed by this algorithm.
   //! Note: if this algorithm fails, NbExtrema returns 0.
@@ -118,7 +116,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Standard_OutOfRange if Index is not in the range [
   //! 1,NbExtrema ], where NbExtrema is the
   //! number of extrema computed by this algorithm.
-  Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& U1, Quantity_Parameter& U2) const;
+  Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& U1, Standard_Real& U2) const;
   
   //! Computes the distance between the end points of the
   //! extremum of index Index computed by this algorithm.
@@ -126,7 +124,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Standard_OutOfRange if Index is not in the range [
   //! 1,NbExtrema ], where NbExtrema is the
   //! number of extrema computed by this algorithm.
-  Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const;
+  Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const;
   
   //! Returns the points P1 on the first curve and P2 on
   //! the second curve, which are the ends of the shortest
@@ -138,12 +136,12 @@ Standard_EXPORT operator Standard_Integer() const;
   //! curve and U2 of the point on the second curve, which
   //! are the ends of the shortest extremum computed by this algorithm.
   //! Exceptions StdFail_NotDone if this algorithm fails.
-  Standard_EXPORT void LowerDistanceParameters (Quantity_Parameter& U1, Quantity_Parameter& U2) const;
+  Standard_EXPORT void LowerDistanceParameters (Standard_Real& U1, Standard_Real& U2) const;
   
   //! Computes the distance between the end points of the
   //! shortest extremum computed by this algorithm.
   //! Exceptions StdFail_NotDone if this algorithm fails.
-  Standard_EXPORT Quantity_Length LowerDistance() const;
+  Standard_EXPORT Standard_Real LowerDistance() const;
 Standard_EXPORT operator Standard_Real() const;
   
   //! return the algorithmic object from Extrema
@@ -157,24 +155,14 @@ Standard_EXPORT operator Standard_Real() const;
   //! set  in <U1> and <U2> the parameters of the couple
   //! solution   points  which  represents  the  total  nearest
   //! solution.
-  Standard_EXPORT Standard_Boolean TotalLowerDistanceParameters (Quantity_Parameter& U1, Quantity_Parameter& U2);
+  Standard_EXPORT Standard_Boolean TotalLowerDistanceParameters (Standard_Real& U1, Standard_Real& U2);
   
   //! return the distance of the total  nearest couple solution
   //! point.
   //! if <myExtCC> is not done
-  Standard_EXPORT Quantity_Length TotalLowerDistance();
+  Standard_EXPORT Standard_Real TotalLowerDistance();
-
-
-
-
-protected:
-
-
-
-
 
 private:
-
   
   Standard_EXPORT void TotalPerform();
 

src/GeomAPI/GeomAPI_ExtremaCurveSurface.hxx

@@ -24,8 +24,6 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <Extrema_ExtCS.hxx>
-#include <Quantity_Parameter.hxx>
-#include <Quantity_Length.hxx>
 class Standard_OutOfRange;
 class StdFail_NotDone;
 class Geom_Curve;
@@ -83,7 +81,7 @@ public:
   //! Warning
   //! Use the function NbExtrema to obtain the number
   //! of solutions. If this algorithm fails, NbExtrema returns 0.
-  Standard_EXPORT GeomAPI_ExtremaCurveSurface(const Handle(Geom_Curve)& Curve, const Handle(Geom_Surface)& Surface, const Quantity_Parameter Wmin, const Quantity_Parameter Wmax, const Quantity_Parameter Umin, const Quantity_Parameter Umax, const Quantity_Parameter Vmin, const Quantity_Parameter Vmax);
+  Standard_EXPORT GeomAPI_ExtremaCurveSurface(const Handle(Geom_Curve)& Curve, const Handle(Geom_Surface)& Surface, const Standard_Real Wmin, const Standard_Real Wmax, const Standard_Real Umin, const Standard_Real Umax, const Standard_Real Vmin, const Standard_Real Vmax);
   
   //! Computes  the  extrema  distances  between  the
   //! curve <C> and the surface  <S>.
@@ -97,7 +95,7 @@ public:
   //! Warning
   //! Use the function NbExtrema to obtain the number
   //! of solutions. If this algorithm fails, NbExtrema returns 0.
-  Standard_EXPORT void Init (const Handle(Geom_Curve)& Curve, const Handle(Geom_Surface)& Surface, const Quantity_Parameter Wmin, const Quantity_Parameter Wmax, const Quantity_Parameter Umin, const Quantity_Parameter Umax, const Quantity_Parameter Vmin, const Quantity_Parameter Vmax);
+  Standard_EXPORT void Init (const Handle(Geom_Curve)& Curve, const Handle(Geom_Surface)& Surface, const Standard_Real Wmin, const Standard_Real Wmax, const Standard_Real Umin, const Standard_Real Umax, const Standard_Real Vmin, const Standard_Real Vmax);
   
   //! Returns the number of extrema computed by this algorithm.
   //! Note: if this algorithm fails, NbExtrema returns 0.
@@ -120,7 +118,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Standard_OutOfRange if Index is not in the range [
   //! 1,NbExtrema ], where NbExtrema is the
   //! number of extrema computed by this algorithm.
-  Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& W, Quantity_Parameter& U, Quantity_Parameter& V) const;
+  Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& W, Standard_Real& U, Standard_Real& V) const;
   
   //! Computes the distance between the end points of the
   //! extremum of index Index computed by this algorithm.
@@ -128,7 +126,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Standard_OutOfRange if index is not in the range [
   //! 1,NbExtrema ], where NbExtrema is the
   //! number of extrema computed by this algorithm.
-  Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const;
+  Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const;
   
   //! Returns the points PC on the curve and PS on the
   //! surface, which are the ends of the shortest extremum computed by this algorithm.
@@ -139,35 +137,23 @@ Standard_EXPORT operator Standard_Integer() const;
   //! and (U,V) of the point on the surface, which are the
   //! ends of the shortest extremum computed by this algorithm.
   //! Exceptions - StdFail_NotDone if this algorithm fails.
-  Standard_EXPORT void LowerDistanceParameters (Quantity_Parameter& W, Quantity_Parameter& U, Quantity_Parameter& V) const;
+  Standard_EXPORT void LowerDistanceParameters (Standard_Real& W, Standard_Real& U, Standard_Real& V) const;
   
   //! Computes the distance between the end points of the
   //! shortest extremum computed by this algorithm.
   //! Exceptions - StdFail_NotDone if this algorithm fails.
-  Standard_EXPORT Quantity_Length LowerDistance() const;
+  Standard_EXPORT Standard_Real LowerDistance() const;
 Standard_EXPORT operator Standard_Real() const;
   
   //! Returns the algorithmic object from Extrema
     const Extrema_ExtCS& Extrema() const;
 
-
-
-
-protected:
-
-
-
-
-
 private:
 
-
-
   Standard_Boolean myIsDone;
   Standard_Integer myIndex;
   Extrema_ExtCS myExtCS;
 
-
 };
 
 

src/GeomAPI/GeomAPI_ExtremaSurfaceSurface.hxx

@@ -24,8 +24,6 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <Extrema_ExtSS.hxx>
-#include <Quantity_Parameter.hxx>
-#include <Quantity_Length.hxx>
 class Standard_OutOfRange;
 class StdFail_NotDone;
 class Geom_Surface;
@@ -80,7 +78,7 @@ public:
   //! the u parametric direction, and by the two
   //! values of parameter (V2min,V2max) in the v
   //! parametric direction.
-  Standard_EXPORT GeomAPI_ExtremaSurfaceSurface(const Handle(Geom_Surface)& S1, const Handle(Geom_Surface)& S2, const Quantity_Parameter U1min, const Quantity_Parameter U1max, const Quantity_Parameter V1min, const Quantity_Parameter V1max, const Quantity_Parameter U2min, const Quantity_Parameter U2max, const Quantity_Parameter V2min, const Quantity_Parameter V2max);
+  Standard_EXPORT GeomAPI_ExtremaSurfaceSurface(const Handle(Geom_Surface)& S1, const Handle(Geom_Surface)& S2, const Standard_Real U1min, const Standard_Real U1max, const Standard_Real V1min, const Standard_Real V1max, const Standard_Real U2min, const Standard_Real U2max, const Standard_Real V2min, const Standard_Real V2max);
   
   //! Initializes this algorithm with the given arguments
   //! and computes  the  extrema  distances  between  the
@@ -97,7 +95,7 @@ public:
   //! values of parameter (U2min,U2max) in the u
   //! parametric direction, and by the two values of
   //! parameter (V2min,V2max) in the v parametric direction.
-  Standard_EXPORT void Init (const Handle(Geom_Surface)& S1, const Handle(Geom_Surface)& S2, const Quantity_Parameter U1min, const Quantity_Parameter U1max, const Quantity_Parameter V1min, const Quantity_Parameter V1max, const Quantity_Parameter U2min, const Quantity_Parameter U2max, const Quantity_Parameter V2min, const Quantity_Parameter V2max);
+  Standard_EXPORT void Init (const Handle(Geom_Surface)& S1, const Handle(Geom_Surface)& S2, const Standard_Real U1min, const Standard_Real U1max, const Standard_Real V1min, const Standard_Real V1max, const Standard_Real U2min, const Standard_Real U2max, const Standard_Real V2min, const Standard_Real V2max);
   
   //! Returns the number of extrema computed by this algorithm.
   //! Note: if this algorithm fails, NbExtrema returns 0.
@@ -121,7 +119,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Standard_OutOfRange if Index is not in the range [
   //! 1,NbExtrema ], where NbExtrema is the
   //! number of extrema computed by this algorithm.
-  Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& U1, Quantity_Parameter& V1, Quantity_Parameter& U2, Quantity_Parameter& V2) const;
+  Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& U1, Standard_Real& V1, Standard_Real& U2, Standard_Real& V2) const;
   
   //! Computes the distance between the end points of the
   //! extremum of index Index computed by this algorithm.
@@ -129,7 +127,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Standard_OutOfRange if Index is not in the range [
   //! 1,NbExtrema ], where NbExtrema is the
   //! number of extrema computed by this algorithm.
-  Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const;
+  Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const;
   
   //! Returns the points P1 on the first surface and P2 on
   //! the second surface, which are the ends of the
@@ -142,35 +140,23 @@ Standard_EXPORT operator Standard_Integer() const;
   //! surface, which are the ends of the shortest extremum
   //! computed by this algorithm.
   //! Exceptions - StdFail_NotDone if this algorithm fails.
-  Standard_EXPORT void LowerDistanceParameters (Quantity_Parameter& U1, Quantity_Parameter& V1, Quantity_Parameter& U2, Quantity_Parameter& V2) const;
+  Standard_EXPORT void LowerDistanceParameters (Standard_Real& U1, Standard_Real& V1, Standard_Real& U2, Standard_Real& V2) const;
   
   //! Computes the distance between the end points of the
   //! shortest extremum computed by this algorithm.
   //! Exceptions StdFail_NotDone if this algorithm fails.
-  Standard_EXPORT Quantity_Length LowerDistance() const;
+  Standard_EXPORT Standard_Real LowerDistance() const;
 Standard_EXPORT operator Standard_Real() const;
   
   //! return the algorithmic object from Extrema
     const Extrema_ExtSS& Extrema() const;
 
-
-
-
-protected:
-
-
-
-
-
 private:
 
-
-
   Standard_Boolean myIsDone;
   Standard_Integer myIndex;
   Extrema_ExtSS myExtSS;
 
-
 };
 
 

src/GeomAPI/GeomAPI_IntCS.cxx

@@ -106,9 +106,9 @@ const gp_Pnt& GeomAPI_IntCS::Point(const Standard_Integer Index) const
 //=======================================================================
 
 void GeomAPI_IntCS::Parameters(const Standard_Integer Index,
-			       Quantity_Parameter& U, 
+			       Standard_Real& U, 
-			       Quantity_Parameter& V, 
+			       Standard_Real& V, 
-			       Quantity_Parameter& W) const 
+			       Standard_Real& W) const 
 {
   const IntCurveSurface_IntersectionPoint& ThePoint = 
     myIntCS.Point(Index);
@@ -156,10 +156,10 @@ Handle(Geom_Curve) GeomAPI_IntCS::Segment(const Standard_Integer Index) const
 //=======================================================================
 
 void GeomAPI_IntCS::Parameters(const Standard_Integer Index,
-			       Quantity_Parameter& U1,
+			       Standard_Real& U1,
-			       Quantity_Parameter& V1,
+			       Standard_Real& V1,
-			       Quantity_Parameter& U2,
+			       Standard_Real& U2,
-			       Quantity_Parameter& V2) const 
+			       Standard_Real& V2) const 
 {
   const IntCurveSurface_IntersectionPoint& FirstPoint = 
     myIntCS.Segment(Index).FirstPoint();

src/GeomAPI/GeomAPI_IntCS.hxx

@@ -24,7 +24,6 @@
 #include <IntCurveSurface_HInter.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Quantity_Parameter.hxx>
 class Geom_Curve;
 class StdFail_NotDone;
 class Standard_OutOfRange;
@@ -79,7 +78,7 @@ public:
   //! StdFail_NotDone if intersection algorithm fails or is not initialized.
   //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where
   //! NbPoints is the number of computed intersection points.
-  Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& U, Quantity_Parameter& V, Quantity_Parameter& W) const;
+  Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& U, Standard_Real& V, Standard_Real& W) const;
   
   //! Returns the number of computed
   //! intersection segments in case of tangential intersection.
@@ -103,7 +102,7 @@ public:
   //! StdFail_NotDone if intersection algorithm fails or is not initialized.
   //! Standard_OutOfRange if Index is not in the range [ 1,NbSegments ],
   //! where NbSegments is the number of computed intersection segments.
-  Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& U1, Quantity_Parameter& V1, Quantity_Parameter& U2, Quantity_Parameter& V2) const;
+  Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& U1, Standard_Real& V1, Standard_Real& U2, Standard_Real& V2) const;
 
 
 

src/GeomAPI/GeomAPI_ProjectPointOnCurve.hxx

@@ -25,8 +25,6 @@
 #include <Standard_Integer.hxx>
 #include <Extrema_ExtPC.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <Quantity_Parameter.hxx>
-#include <Quantity_Length.hxx>
 class Standard_OutOfRange;
 class StdFail_NotDone;
 class gp_Pnt;
@@ -54,7 +52,7 @@ public:
   
   //! Create  the projection  of a point <P>  on a curve
   //! <Curve> limited by the two points of parameter Umin and Usup.
-  Standard_EXPORT GeomAPI_ProjectPointOnCurve(const gp_Pnt& P, const Handle(Geom_Curve)& Curve, const Quantity_Parameter Umin, const Quantity_Parameter Usup);
+  Standard_EXPORT GeomAPI_ProjectPointOnCurve(const gp_Pnt& P, const Handle(Geom_Curve)& Curve, const Standard_Real Umin, const Standard_Real Usup);
   
   //! Init the projection  of a  point  <P> on a curve
   //! <Curve>
@@ -62,11 +60,11 @@ public:
   
   //! Init  the  projection  of a  point <P>  on a curve
   //! <Curve> limited by the two points of parameter Umin and Usup.
-  Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Curve)& Curve, const Quantity_Parameter Umin, const Quantity_Parameter Usup);
+  Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Curve)& Curve, const Standard_Real Umin, const Standard_Real Usup);
   
   //! Init  the  projection  of a  point <P>  on a curve
   //! <Curve> limited by the two points of parameter Umin and Usup.
-  Standard_EXPORT void Init (const Handle(Geom_Curve)& Curve, const Quantity_Parameter Umin, const Quantity_Parameter Usup);
+  Standard_EXPORT void Init (const Handle(Geom_Curve)& Curve, const Standard_Real Umin, const Standard_Real Usup);
   
   //! Performs the projection of a point on the current curve.
   Standard_EXPORT void Perform (const gp_Pnt& P);
@@ -90,7 +88,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Exceptions
   //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where
   //! NbPoints is the number of solution points.
-  Standard_EXPORT Quantity_Parameter Parameter (const Standard_Integer Index) const;
+  Standard_EXPORT Standard_Real Parameter (const Standard_Integer Index) const;
   
   //! Returns the parameter on the curve
   //! of the point, which is the orthogonal projection. Index is a
@@ -98,14 +96,14 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Exceptions
   //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where
   //! NbPoints is the number of solution points.-
-  Standard_EXPORT void Parameter (const Standard_Integer Index, Quantity_Parameter& U) const;
+  Standard_EXPORT void Parameter (const Standard_Integer Index, Standard_Real& U) const;
   
   //! Computes the distance between the
   //! point and its orthogonal projection on the curve. Index is a number of a computed point.
   //! Exceptions
   //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where
   //! NbPoints is the number of solution points.
-  Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const;
+  Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const;
   
   //! Returns the nearest orthogonal
   //! projection of the point on the curve.
@@ -116,36 +114,24 @@ Standard_EXPORT operator gp_Pnt() const;
   //! Returns the parameter on the curve
   //! of the nearest orthogonal projection of the point.
   //! Exceptions: StdFail_NotDone if this algorithm fails.
-  Standard_EXPORT Quantity_Parameter LowerDistanceParameter() const;
+  Standard_EXPORT Standard_Real LowerDistanceParameter() const;
   
   //! Computes the distance between the
   //! point and its nearest orthogonal projection on the curve.
   //! Exceptions: StdFail_NotDone if this algorithm fails.
-  Standard_EXPORT Quantity_Length LowerDistance() const;
+  Standard_EXPORT Standard_Real LowerDistance() const;
 Standard_EXPORT operator Standard_Real() const;
   
   //! return the algorithmic object from Extrema
     const Extrema_ExtPC& Extrema() const;
 
-
-
-
-protected:
-
-
-
-
-
 private:
 
-
-
   Standard_Boolean myIsDone;
   Standard_Integer myIndex;
   Extrema_ExtPC myExtPC;
   GeomAdaptor_Curve myC;
 
-
 };
 
 

src/GeomAPI/GeomAPI_ProjectPointOnSurf.hxx

@@ -28,8 +28,6 @@
 #include <Extrema_ExtAlgo.hxx>
 #include <Extrema_ExtFlag.hxx>
 #include <Standard_Real.hxx>
-#include <Quantity_Parameter.hxx>
-#include <Quantity_Length.hxx>
 class Standard_OutOfRange;
 class StdFail_NotDone;
 class gp_Pnt;
@@ -62,11 +60,11 @@ public:
   //! [Umin,Usup] [Vmin,Vsup] of the surface.
   Standard_EXPORT GeomAPI_ProjectPointOnSurf(const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
   
-  Standard_EXPORT GeomAPI_ProjectPointOnSurf(const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
+  Standard_EXPORT GeomAPI_ProjectPointOnSurf(const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
   
   //! Init the projection  of a point <P> on a surface
   //! <Surface>
-  Standard_EXPORT GeomAPI_ProjectPointOnSurf(const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
+  Standard_EXPORT GeomAPI_ProjectPointOnSurf(const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
   
   Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
   
@@ -75,16 +73,16 @@ public:
   //! [Umin,Usup] [Vmin,Vsup] of the surface.
   Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
   
-  Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
+  Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
   
   //! Init the projection for many points on a surface
   //! <Surface>. The solutions will be computed in the domain
   //! [Umin,Usup] [Vmin,Vsup] of the surface.
-  Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
+  Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
   
-  Standard_EXPORT void Init (const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
+  Standard_EXPORT void Init (const Handle(Geom_Surface)& Surface, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
   
-  Standard_EXPORT void Init (const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
+  Standard_EXPORT void Init (const Handle(Geom_Surface)& Surface, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad);
 
   //! Sets the Extrema search algorithm - Grad or Tree. <br>
   //! By default the Extrema is initialized with Grad algorithm.
@@ -123,7 +121,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Exceptions
   //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where
   //! NbPoints is the number of solution points.
-  Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& U, Quantity_Parameter& V) const;
+  Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& U, Standard_Real& V) const;
   
   //! Computes the distance between the
   //! point and its orthogonal projection on the surface. Index is a number
@@ -131,7 +129,7 @@ Standard_EXPORT operator Standard_Integer() const;
   //! Exceptions
   //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where
   //! NbPoints is the number of solution points.
-  Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const;
+  Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const;
   
   //! Returns the nearest orthogonal projection of the point
   //! on the surface.
@@ -144,27 +142,18 @@ Standard_EXPORT operator gp_Pnt() const;
   //! surface of the nearest computed orthogonal projection of the point.
   //! Exceptions
   //! StdFail_NotDone if projection fails.
-  Standard_EXPORT void LowerDistanceParameters (Quantity_Parameter& U, Quantity_Parameter& V) const;
+  Standard_EXPORT void LowerDistanceParameters (Standard_Real& U, Standard_Real& V) const;
   
   //! Computes the distance between the
   //! point and its nearest orthogonal projection on the surface.
   //! Exceptions
   //! StdFail_NotDone if projection fails.
-  Standard_EXPORT Quantity_Length LowerDistance() const;
+  Standard_EXPORT Standard_Real LowerDistance() const;
 Standard_EXPORT operator Standard_Real() const;
   
   //! return the algorithmic object from Extrema
     const Extrema_ExtPS& Extrema() const;
 
-
-
-
-protected:
-
-
-
-
-
 private:
 
   

src/Quantity/FILES

@@ -6,7 +6,6 @@ Quantity_Admittance.hxx
 Quantity_AmountOfSubstance.hxx
 Quantity_AngularVelocity.hxx
 Quantity_Area.hxx
-Quantity_Array1OfCoefficient.hxx
 Quantity_Array1OfColor.hxx
 Quantity_Array2OfColor.hxx
 Quantity_Capacitance.hxx
@@ -25,10 +24,8 @@ Quantity_Consumption.hxx
 Quantity_Content.hxx
 Quantity_Convert.cxx
 Quantity_Convert.hxx
-Quantity_Convert.lxx
 Quantity_Date.cxx
 Quantity_Date.hxx
-Quantity_Date.lxx
 Quantity_DateDefinitionError.hxx
 Quantity_Density.hxx
 Quantity_DoseEquivalent.hxx
@@ -73,7 +70,6 @@ Quantity_Normality.hxx
 Quantity_Parameter.hxx
 Quantity_Period.cxx
 Quantity_Period.hxx
-Quantity_Period.lxx
 Quantity_PeriodDefinitionError.hxx
 Quantity_PhysicalQuantity.hxx
 Quantity_PlaneAngle.hxx

src/Quantity/Quantity_AbsorbedDose.hxx

@@ -22,7 +22,7 @@
 //! Defined as the energy absorbed per unit mass in an
 //! irradiated medium.
 //! It is measured in grays.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_AbsorbedDose;
 
 #endif // _Quantity_AbsorbedDose_HeaderFile

src/Quantity/Quantity_Acceleration.hxx

@@ -22,6 +22,7 @@
 //! Defined as the change of velocity per unit time.
 //! It is a vector quantity.
 //! It is measured in metres per second per second.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Acceleration;
 
 #endif // _Quantity_Acceleration_HeaderFile

src/Quantity/Quantity_AcousticIntensity.hxx

@@ -23,7 +23,7 @@
 //! levels. The conventional unit, the bel, is the base ten
 //! logarithm of the ratio of the two pressures. In practice
 //! the decibel (one tenth of a bel) is used.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_AcousticIntensity;
 
 #endif // _Quantity_AcousticIntensity_HeaderFile

src/Quantity/Quantity_Activity.hxx

@@ -22,7 +22,7 @@
 //! Defined as the number of atoms of a radioactive
 //! substance which disintegrate per unit time. It is
 //! measured in becquerels (one disintegration per second).
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Activity;
 
 #endif // _Quantity_Activity_HeaderFile

src/Quantity/Quantity_Admittance.hxx

@@ -23,7 +23,7 @@
 //! It is measured in Siemens (reciprocal Ohms).
 //! The square of the admittance is equal to the sum of the
 //! squares of the conductance and the susceptance.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Admittance;
 
 #endif // _Quantity_Admittance_HeaderFile

src/Quantity/Quantity_AmountOfSubstance.hxx

@@ -24,6 +24,7 @@
 //! Amount of substance is measured in moles.
 //! For all substances the number of molecules in a mole
 //! is given by Avogadro's Constant.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_AmountOfSubstance;
 
 #endif // _Quantity_AmountOfSubstance_HeaderFile

src/Quantity/Quantity_AngularVelocity.hxx

@@ -22,6 +22,7 @@
 //! Defined as the rate at which a body moves around an axis.
 //! It is quantified as change in direction per unit time.
 //! It is measured in radians per second.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_AngularVelocity;
 
 #endif // _Quantity_AngularVelocity_HeaderFile

src/Quantity/Quantity_Area.hxx

@@ -21,6 +21,7 @@
 
 //! Defined as superficial extension.
 //! It is measured in square metres.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Area;
 
 #endif // _Quantity_Area_HeaderFile

src/Quantity/Quantity_Array1OfCoefficient.hxx

@@ -1,26 +0,0 @@
-// Created on: 1994-02-08
-// Created by: Gilles DEBARBOUILLE
-// Copyright (c) 1994-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef Quantity_Array1OfCoefficient_HeaderFile
-#define Quantity_Array1OfCoefficient_HeaderFile
-
-#include <Quantity_Coefficient.hxx>
-#include <NCollection_Array1.hxx>
-
-typedef NCollection_Array1<Quantity_Coefficient> Quantity_Array1OfCoefficient;
-
-
-#endif

src/Quantity/Quantity_Capacitance.hxx

@@ -26,7 +26,7 @@
 //! them.
 //! It is measured in farads (coulomb per volt).
 //! In practice micro-, nano-, and pico-farads are used.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Capacitance;
 
 #endif // _Quantity_Capacitance_HeaderFile

src/Quantity/Quantity_Coefficient.hxx

@@ -19,7 +19,7 @@
 
 #include <Standard_Real.hxx>
 
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Coefficient;
 
-
 #endif // _Quantity_Coefficient_HeaderFile

src/Quantity/Quantity_CoefficientOfExpansion.hxx

@@ -26,7 +26,7 @@
 //! For a gas there are coefficients for constant pressure
 //! and constant volume changes.
 //! It is measured in units of reciprocal degree kelvin.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_CoefficientOfExpansion;
 
 #endif // _Quantity_CoefficientOfExpansion_HeaderFile

src/Quantity/Quantity_Color.cxx

@@ -121,7 +121,7 @@ Quantity_Color::Quantity_Color (const NCollection_Vec3<float>& theRgb)
   }
 }
 
-void Quantity_Color::ChangeContrast (const Quantity_Rate ADelta) {
+void Quantity_Color::ChangeContrast (const Standard_Real ADelta) {
 
 Standard_ShortReal MyHue, MyLight, MySaturation;
 
@@ -136,7 +136,7 @@ Standard_ShortReal MyHue, MyLight, MySaturation;
 	}
 }
 
-void Quantity_Color::ChangeIntensity (const Quantity_Rate ADelta) {
+void Quantity_Color::ChangeIntensity (const Standard_Real ADelta) {
 
 Standard_ShortReal MyHue, MyLight, MySaturation;
 

src/Quantity/Quantity_Color.hxx

@@ -23,7 +23,6 @@
 #include <Standard_ShortReal.hxx>
 #include <Quantity_NameOfColor.hxx>
 #include <Quantity_TypeOfColor.hxx>
-#include <Quantity_Rate.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
@@ -84,7 +83,7 @@ public:
   //! The variation is expressed as a percentage of the
   //! current value.
   //! It is a variation of the saturation.
-  Standard_EXPORT void ChangeContrast (const Quantity_Rate ADelta);
+  Standard_EXPORT void ChangeContrast (const Standard_Real ADelta);
   
   //! Increases or decreases the intensity by <ADelta>.
   //! <ADelta> is a percentage. Any value greater than zero
@@ -92,7 +91,7 @@ public:
   //! The variation is expressed as a percentage of the
   //! current value.
   //! It is a variation of the lightness.
-  Standard_EXPORT void ChangeIntensity (const Quantity_Rate ADelta);
+  Standard_EXPORT void ChangeIntensity (const Standard_Real ADelta);
   
   //! Updates the colour <me> from the definition of the
   //! colour <AName>.

src/Quantity/Quantity_Concentration.hxx

@@ -24,7 +24,7 @@
 //! solution. For certain purposes percentage by weight or
 //! volume can be used, and parts per million (ppm) is used
 //! for trace elements.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Concentration;
 
 #endif // _Quantity_Concentration_HeaderFile

src/Quantity/Quantity_Conductivity.hxx

@@ -22,7 +22,7 @@
 //! Defined as the current density divided by the electrical
 //! field strength. It is also the reciprocal of resistivity.
 //! It is measured in Siemens per metre.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Conductivity;
 
 #endif // _Quantity_Conductivity_HeaderFile

src/Quantity/Quantity_Constant.hxx

@@ -19,7 +19,7 @@
 
 #include <Standard_Real.hxx>
 
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Constant;
 
-
 #endif // _Quantity_Constant_HeaderFile

src/Quantity/Quantity_Consumption.hxx

@@ -23,7 +23,7 @@
 //! travelled, or distance travelled per unit of fuel.
 //! It is measured in litres per 100 kilometres or in
 //! miles per gallon (UK or US).
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Consumption;
 
 #endif // _Quantity_Consumption_HeaderFile

src/Quantity/Quantity_Content.hxx

@@ -19,7 +19,7 @@
 
 #include <Standard_Real.hxx>
 
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Content;
 
-
 #endif // _Quantity_Content_HeaderFile

src/Quantity/Quantity_Convert.cxx

@@ -12,12 +12,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-
-#include <Quantity_Array1OfCoefficient.hxx>
 #include <Quantity_Convert.hxx>
 #include <TCollection_AsciiString.hxx>
 
-Standard_EXPORT Quantity_Array1OfCoefficient ConvertTable(1,68);
+Standard_EXPORT NCollection_Array1<Standard_Real> ConvertTable(1,68);
 static Standard_CString theEnums[] = {      // En attendant la methode "Elements" de Standard_Type
 "Quantity_MASS", 
 "Quantity_PLANEANGLE", 
@@ -98,7 +96,6 @@ Quantity_Convert::Quantity_Convert () {
    for (Standard_Integer i = 1 ; i <= 68 ; i++) ConvertTable(i) = 1;
 }
 
-
 //----------------------------------------------------------------------------
 //  IsPhysicalQuantity
 //----------------------------------------------------------------------------
@@ -123,5 +120,3 @@ Standard_Boolean Quantity_Convert::IsPhysicalQuantity
    return Find; 
 
 }
-
-

src/Quantity/Quantity_Convert.hxx

@@ -17,44 +17,71 @@
 #ifndef _Quantity_Convert_HeaderFile
 #define _Quantity_Convert_HeaderFile
 
+#include <NCollection_Array1.hxx>
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
-
-#include <Quantity_PhysicalQuantity.hxx>
-#include <Quantity_Coefficient.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
+#include <Quantity_PhysicalQuantity.hxx>
+
 class TCollection_AsciiString;
 
+#ifndef __Quantity_API
+  #if defined(_WIN32) && !defined(HAVE_NO_DLL)
+    #ifdef __Quantity_DLL
+      #define __Quantity_API __declspec(dllexport)
+    #else
+      #define __Quantity_API __declspec(dllimport)
+    #endif
+  #else
+    #define __Quantity_API
+  #endif
+#endif
+
+extern __Quantity_API NCollection_Array1<Standard_Real> ConvertTable;
 
 //! Services to manage units conversion between Front-ends and Engines.
 //! This conversion is managed by a table of correspondance between the quantities
 //! and their "conversion coefficient".
 //! This table is implemented like an external array (TCollection_Array1) regarding
 //! to the quantities enumeration.
-class Quantity_Convert 
+class Standard_DEPRECATED("This class is deprecated - UnitsAPI should be used instead") Quantity_Convert
 {
 public:
 
   DEFINE_STANDARD_ALLOC
 
-  
   //! Creates an object;
   Standard_EXPORT Quantity_Convert();
   
   //! Updates the conversion table (correspondances between
   //! Quantities and conversion coefficients).
-    static void SetQuantity (const Quantity_PhysicalQuantity aQuantity, const Quantity_Coefficient aCoef);
+  static void SetQuantity (const Quantity_PhysicalQuantity theQuantity,
-  
+                           const Standard_Real theCoef)
-  //! Converts, from the conversion table, the value <aVal>
+  {
-  //! from the user system to the SI system.
+    if (theQuantity > 0 && theQuantity <= 68)
-    static Standard_Real ConvertUserToSI (const Quantity_PhysicalQuantity aQuantity, const Standard_Real aVal);
+    {
-  
+      ConvertTable (theQuantity) = theCoef;
-  //! Converts, from the conversion table, the value <aVal>
+    }
-  //! from the SI system to the user system.
+  }
-    static Standard_Real ConvertSIToUser (const Quantity_PhysicalQuantity aQuantity, const Standard_Real aVal);
+
-  
+  //! Converts, from the conversion table, the value theVal from the user system to the SI system.
+  static Standard_Real ConvertUserToSI (const Quantity_PhysicalQuantity theQuantity,
+                                        const Standard_Real theVal)
+  {
+    return theQuantity > 0 && theQuantity <= 68
+         ? theVal * ConvertTable (theQuantity)
+         : theVal;
+  }
+
+  //! Converts, from the conversion table, the value theVal from the SI system to the user system.
+  static Standard_Real ConvertSIToUser (const Quantity_PhysicalQuantity theQuantity, const Standard_Real theVal)
+  {
+    return theQuantity > 0 && theQuantity <= 68
+         ? (theVal / ConvertTable (theQuantity))
+         : theVal;
+  }
 
   //! if (aType is a physical quantity)
   //! returns True and the name of the associated PhysicalQuantity .
@@ -62,28 +89,6 @@ public:
   //! returns False.
   Standard_EXPORT static Standard_Boolean IsPhysicalQuantity (const TCollection_AsciiString& aTypeName, TCollection_AsciiString& anEnum);
 
-
-
-
-protected:
-
-
-
-
-
-private:
-
-
-
-
-
 };
 
-
-#include <Quantity_Convert.lxx>
-
-
-
-
-
 #endif // _Quantity_Convert_HeaderFile

src/Quantity/Quantity_Convert.lxx

@@ -1,71 +0,0 @@
-// Created by: M. MERCIEN
-// Copyright (c) 1998-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-//-----------------------------------------------------------------------------
-// inline methods for Convert from Quantity
-//-----------------------------------------------------------------------------
-#include <Quantity_Array1OfCoefficient.hxx>
-
-
-#ifndef __Quantity_API
-# if defined(_WIN32) && !defined(HAVE_NO_DLL)
-#  ifdef __Quantity_DLL
-#   define __Quantity_API __declspec( dllexport )
-#  else
-#   define __Quantity_API __declspec( dllimport )
-#  endif  // __Quantity_DLL
-# else
-#   define __Quantity_API
-# endif  // _WIN32
-#endif  // __Quantity_API 
-
-
-extern __Quantity_API Quantity_Array1OfCoefficient ConvertTable;
-
-
-//----------------------------------------------------------------------------
-//  SetQuantity
-//----------------------------------------------------------------------------
-inline void Quantity_Convert::SetQuantity (const Quantity_PhysicalQuantity aQuantity,
-                                const Quantity_Coefficient aCoef) {
-// ...Update du coefficient de conversion
-   if (aQuantity > 0 && aQuantity <= 68) ConvertTable(aQuantity) = aCoef;
-}
-
-//----------------------------------------------------------------------------
-//  ConvertUserToSI
-//----------------------------------------------------------------------------
-inline Quantity_Coefficient Quantity_Convert::ConvertUserToSI 
-        (const Quantity_PhysicalQuantity aQuantity ,
-         const Standard_Real aVal) {
-// ...Conversion de la valeur aVal, du Systeme Utilisateur en Systeme International
-   if (aQuantity > 0 && aQuantity <= 68)   
-      return (aVal*ConvertTable(aQuantity));
-   else
-     return aVal;
-}
-
-//----------------------------------------------------------------------------
-//  ConvertSIToUser
-//----------------------------------------------------------------------------
-inline Quantity_Coefficient Quantity_Convert::ConvertSIToUser 
-        (const Quantity_PhysicalQuantity aQuantity ,
-         const Standard_Real aVal) {
-// ...Conversion de la valeur aVal, du Systeme International au Systeme Utilisateur
-   if (aQuantity > 0 && aQuantity <= 68)   
-      return (aVal/ConvertTable(aQuantity));
-   else
-     return aVal;
-}

src/Quantity/Quantity_Date.hxx

@@ -27,7 +27,6 @@ class Quantity_DateDefinitionError;
 class Standard_OutOfRange;
 class Quantity_Period;
 
-
 //! This class provides services to manage date information.
 //! A date represents the following time intervals:
 //! year, month, day, hour, minute, second,
@@ -43,7 +42,6 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  
   //! Constructs a default date
   //! (00:00 GMT, January 1, 1979 (zero hour)); use the function
   //! SetValues to define the required date; or
@@ -176,32 +174,17 @@ Standard_Boolean operator > (const Quantity_Date& anOther) const
   //! Returns true if a year is a leap year.
   //! The leap years are divisable by 4 and not by 100 except
   //! the years divisable by 400.
-    static Standard_Boolean IsLeap (const Standard_Integer yy);
+  static Standard_Boolean IsLeap (const Standard_Integer yy)
-
+  {
-
+    return ((yy % 4 == 0) && (yy % 100 != 0))
-
+         || (yy % 400) == 0;
-
+  }
-protected:
-
-
-
-
 
 private:
 
-
-
   Standard_Integer mySec;
   Standard_Integer myUSec;
 
-
 };
 
-
-#include <Quantity_Date.lxx>
-
-
-
-
-
 #endif // _Quantity_Date_HeaderFile

src/Quantity/Quantity_Date.lxx

@@ -1,19 +0,0 @@
-// Copyright (c) 1998-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-inline Standard_Boolean Quantity_Date::IsLeap (const Standard_Integer yy){
-
-return (((yy % 4 == 0) && (yy % 100 != 0)) || (yy % 400) == 0) 
-         ? Standard_True : Standard_False;
-}

src/Quantity/Quantity_Density.hxx

@@ -21,6 +21,7 @@
 
 //! Defined as mass per unit volume.
 //! It is measured in kilograms per cubic metre.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Density;
 
 #endif // _Quantity_Density_HeaderFile

src/Quantity/Quantity_DoseEquivalent.hxx

@@ -23,7 +23,7 @@
 //! quality factor related to the effect of a particular
 //! type of radiation on biological tissue.
 //! It is measured in sieverts.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_DoseEquivalent;
 
 #endif // _Quantity_DoseEquivalent_HeaderFile

src/Quantity/Quantity_ElectricCapacitance.hxx

@@ -22,7 +22,7 @@
 //! Defined for a capacitor as the ratio of the charge on
 //! either conductor to the potential between them.
 //! It is measured in farads (coulomb per volt).
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_ElectricCapacitance;
 
 #endif // _Quantity_ElectricCapacitance_HeaderFile

src/Quantity/Quantity_ElectricCharge.hxx

@@ -23,7 +23,7 @@
 //! more commonly viewed as the product of electric current
 //! and time.
 //! It is measured in coulombs (ampere-second).
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_ElectricCharge;
 
 #endif // _Quantity_ElectricCharge_HeaderFile

src/Quantity/Quantity_ElectricCurrent.hxx

@@ -21,7 +21,7 @@
 
 //! Defined as the amount of charge flowing per unit time.
 //! It is measured in amperes (coulombs per second).
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_ElectricCurrent;
 
 #endif // _Quantity_ElectricCurrent_HeaderFile

src/Quantity/Quantity_ElectricFieldStrength.hxx

@@ -22,7 +22,7 @@
 //! Defined as the force exerted on a unit charge at a
 //! given point in space.
 //! It is measured in volts per metre.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_ElectricFieldStrength;
 
 #endif // _Quantity_ElectricFieldStrength_HeaderFile

src/Quantity/Quantity_ElectricPotential.hxx

@@ -25,7 +25,7 @@
 //! Volts are in practice used to measure differences
 //! in potential e.g. the electromotive force generated when
 //! a conductor cuts a magnetic field.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_ElectricPotential;
 
 #endif // _Quantity_ElectricPotential_HeaderFile

src/Quantity/Quantity_Energy.hxx

@@ -37,7 +37,7 @@
 //! the observed mass and the rest mass of a body multiplied
 //! by the square of the speed of light.
 //! It is measured in joules (newton-metres).
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Energy;
 
 #endif // _Quantity_Energy_HeaderFile

src/Quantity/Quantity_Enthalpy.hxx

@@ -24,7 +24,7 @@
 //! process at constant pressure the change in enthalpy is
 //! equal to the quantity of heat absorbed (or lost).
 //! It is measured in joules.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Enthalpy;
 
 #endif // _Quantity_Enthalpy_HeaderFile

src/Quantity/Quantity_Entropy.hxx

@@ -28,7 +28,7 @@
 //! unavailability of its internal energy to do work in a
 //! cyclical process.
 //! A change in entropy is measured in joules per degree kelvin.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Entropy;
 
 #endif // _Quantity_Entropy_HeaderFile

src/Quantity/Quantity_Factor.hxx

@@ -19,7 +19,7 @@
 
 #include <Standard_Real.hxx>
 
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Factor;
 
-
 #endif // _Quantity_Factor_HeaderFile

src/Quantity/Quantity_Force.hxx

@@ -23,7 +23,7 @@
 //! and the acceleration that the force produces.
 //! It is a vector quantity.
 //! It is measured in newtons.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Force;
 
 #endif // _Quantity_Force_HeaderFile

src/Quantity/Quantity_Frequency.hxx

@@ -21,6 +21,7 @@
 
 //! Defined as the number of oscillations per unit time.
 //! It is measured in cycles per second.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Frequency;
 
 #endif // _Quantity_Frequency_HeaderFile

src/Quantity/Quantity_Illuminance.hxx

@@ -21,7 +21,7 @@
 
 //! Defined as the incident luminous flux per unit area.
 //! It is measured in lux (lumen per square metre).
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Illuminance;
 
 #endif // _Quantity_Illuminance_HeaderFile

src/Quantity/Quantity_Impedance.hxx

@@ -23,7 +23,7 @@
 //! in a circuit. Includes the contributions of resistance,
 //! inductance, and capacitance.
 //! It is measured in Ohms.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Impedance;
 
 #endif // _Quantity_Impedance_HeaderFile

src/Quantity/Quantity_Index.hxx

@@ -19,7 +19,7 @@
 
 #include <Standard_Real.hxx>
 
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Index;
 
-
 #endif // _Quantity_Index_HeaderFile

src/Quantity/Quantity_Inductance.hxx

@@ -23,7 +23,7 @@
 //! induced when the current in a circuit changes at
 //! unit rate.
 //! It is measured in henrys (webers per ampere).
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Inductance;
 
 #endif // _Quantity_Inductance_HeaderFile

src/Quantity/Quantity_KinematicViscosity.hxx

@@ -24,7 +24,7 @@
 //! perfect fluid to include terms due to a real fluid.
 //! It is quantified as area per unit time.
 //! It is measured in square metres per second.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_KinematicViscosity;
 
 #endif // _Quantity_KinematicViscosity_HeaderFile

src/Quantity/Quantity_KineticMoment.hxx

@@ -22,7 +22,7 @@
 //! Defined as the product of momentum of a body
 //! and the distance of its centre of gravity from an axis.
 //! It is measured in kilogram-square-metres per second.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_KineticMoment;
 
 #endif // _Quantity_KineticMoment_HeaderFile

src/Quantity/Quantity_Length.hxx

@@ -21,6 +21,7 @@
 
 //! Defined as spatial extension.
 //! It is measured in metres.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Length;
 
 #endif // _Quantity_Length_HeaderFile

src/Quantity/Quantity_Luminance.hxx

@@ -22,7 +22,7 @@
 //! It is defined the luminous flux per unit area per unit
 //! solid angle.
 //! It is measured in candelas per square metre.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Luminance;
 
 #endif // _Quantity_Luminance_HeaderFile

src/Quantity/Quantity_LuminousEfficacity.hxx

@@ -22,7 +22,7 @@
 //! Defined as the ratio of luminous flux emitted by a
 //! source to the power it consumes.
 //! It is measured in lumens per watt.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_LuminousEfficacity;
 
 #endif // _Quantity_LuminousEfficacity_HeaderFile

src/Quantity/Quantity_LuminousExposition.hxx

@@ -21,7 +21,7 @@
 
 //! Defined as the quantity of illuminance with time.
 //! It is measured in lux-seconds.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_LuminousExposition;
 
 #endif // _Quantity_LuminousExposition_HeaderFile

src/Quantity/Quantity_LuminousFlux.hxx

@@ -25,7 +25,7 @@
 //! is related to the radiant flux of the source by the
 //! spectral luminous efficiency.
 //! It is measured in lumens.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_LuminousFlux;
 
 #endif // _Quantity_LuminousFlux_HeaderFile

src/Quantity/Quantity_LuminousIntensity.hxx

@@ -22,7 +22,7 @@
 //! Defined as the luminous flux emitted per unit solid
 //! angle in a given direction by a point source.
 //! It is measured in candelas.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_LuminousIntensity;
 
 #endif // _Quantity_LuminousIntensity_HeaderFile

src/Quantity/Quantity_MagneticFieldStrength.hxx

@@ -24,7 +24,7 @@
 //! Its integral along a closed line is equal to the
 //! magnetomotive force.
 //! It is measured in amperes per metre.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_MagneticFieldStrength;
 
 #endif // _Quantity_MagneticFieldStrength_HeaderFile

src/Quantity/Quantity_MagneticFlux.hxx

@@ -22,7 +22,7 @@
 //! Defined as the product of a given area and the
 //! average magnetic flux density normal to it.
 //! It is measured in webers (tesla-square-metre).
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_MagneticFlux;
 
 #endif // _Quantity_MagneticFlux_HeaderFile

src/Quantity/Quantity_MagneticFluxDensity.hxx

@@ -25,7 +25,7 @@
 //! and the magnetic field strength and with a direction at any
 //! given point the same as that of the magnetic field.
 //! It is measured in teslas (webers per square metre).
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_MagneticFluxDensity;
 
 #endif // _Quantity_MagneticFluxDensity_HeaderFile

src/Quantity/Quantity_Mass.hxx

@@ -22,6 +22,7 @@
 //! Defined as a quantity of matter. Gives rise to the
 //! inertial and gravitational properties of a body.
 //! It is measured in kilograms.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Mass;
 
 #endif // _Quantity_Mass_HeaderFile

src/Quantity/Quantity_MassFlow.hxx

@@ -21,7 +21,7 @@
 
 //! Defined as mass per unit time.
 //! It is measured in kilograms per second.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_MassFlow;
 
 #endif // _Quantity_MassFlow_HeaderFile

src/Quantity/Quantity_MolarConcentration.hxx

@@ -21,7 +21,7 @@
 
 //! Defined as the concentration in moles per litre of
 //! solution. It is also called molarity.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_MolarConcentration;
 
 #endif // _Quantity_MolarConcentration_HeaderFile

src/Quantity/Quantity_MolarMass.hxx

@@ -23,7 +23,7 @@
 //! mole. One mole of any substance contains Avogadro's
 //! Constant of molecules.
 //! It is measured in kilograms per mole.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_MolarMass;
 
 #endif // _Quantity_MolarMass_HeaderFile

src/Quantity/Quantity_MolarVolume.hxx

@@ -23,7 +23,7 @@
 //! One mole of any substance contains Avogadro's
 //! Constant of molecules.
 //! It is measured in cubic metres per mole.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_MolarVolume;
 
 #endif // _Quantity_MolarVolume_HeaderFile

src/Quantity/Quantity_Molarity.hxx

@@ -21,7 +21,7 @@
 
 //! Defined as the concentration in moles per kilogram of
 //! solvent.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Molarity;
 
 #endif // _Quantity_Molarity_HeaderFile

src/Quantity/Quantity_MomentOfAForce.hxx

@@ -22,7 +22,7 @@
 //! Defined as the product of a force and the
 //! perpendicular distance to an axis.
 //! It is measured in newtons x metres.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_MomentOfAForce;
 
 #endif // _Quantity_MomentOfAForce_HeaderFile

src/Quantity/Quantity_MomentOfInertia.hxx

@@ -23,7 +23,7 @@
 //! and the square of the distance of its centre of gravity
 //! from an axis.
 //! It is measured in kilogram-square-metres.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_MomentOfInertia;
 
 #endif // _Quantity_MomentOfInertia_HeaderFile

src/Quantity/Quantity_Momentum.hxx

@@ -22,7 +22,7 @@
 //! Defined as the product of mass and velocity.
 //! It is a vector quantity.
 //! It is measured in kilogram-metres per second.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Momentum;
 
 #endif // _Quantity_Momentum_HeaderFile

src/Quantity/Quantity_Normality.hxx

@@ -19,7 +19,7 @@
 
 #include <Standard_Real.hxx>
 
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Normality;
 
-
 #endif // _Quantity_Normality_HeaderFile

src/Quantity/Quantity_Parameter.hxx

@@ -19,7 +19,7 @@
 
 #include <Standard_Real.hxx>
 
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Parameter;
 
-
 #endif // _Quantity_Parameter_HeaderFile

src/Quantity/Quantity_Period.hxx

@@ -25,7 +25,6 @@
 #include <Standard_Boolean.hxx>
 class Quantity_PeriodDefinitionError;
 
-
 //! Manages date intervals. For example, a Period object
 //! gives the interval between two dates.
 //! A period is expressed in seconds and microseconds.
@@ -35,7 +34,6 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  
   //! Creates a Period
   //! With:      0 <= dd
   //! 0 <= hh
@@ -139,29 +137,11 @@ Standard_Boolean operator > (const Quantity_Period& anOther) const
   //! 0 <= mics
   Standard_EXPORT static Standard_Boolean IsValid (const Standard_Integer ss, const Standard_Integer mics = 0);
 
-
-
-
-protected:
-
-
-
-
-
 private:
 
-
-
   Standard_Integer mySec;
   Standard_Integer myUSec;
 
-
 };
 
-
-
-
-
-
-
 #endif // _Quantity_Period_HeaderFile

src/Quantity/Quantity_Period.lxx

@@ -1,35 +0,0 @@
-// Copyright (c) 1998-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-inline Standard_Real  Quantity_Period::MillisecondPeriod(){
- return (1E+3);
-}
-
-inline Standard_Real  Quantity_Period::SecondPeriod(){
- return (1E+6);
-}
-
-
-inline Standard_Real  Quantity_Period::MinutePeriod(){
- return (60.0E+6);
-}
-
-inline Standard_Real  Quantity_Period::HourPeriod(){
- return (3600.0E+6);
-}
-
-inline Standard_Real  Quantity_Period::DayPeriod(){
- return (86400.0E+6);
-}
-

src/Quantity/Quantity_PlaneAngle.hxx

@@ -21,6 +21,7 @@
 
 //! Defined as a difference in direction.
 //! It is measured in radians.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_PlaneAngle;
 
 #endif // _Quantity_PlaneAngle_HeaderFile

src/Quantity/Quantity_Power.hxx

@@ -26,7 +26,7 @@
 //! and the current. For AC the root-mean-square values
 //! are multiplied by the cosine of the phase angle.
 //! It is measured in watts (joules per second).
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Power;
 
 #endif // _Quantity_Power_HeaderFile

src/Quantity/Quantity_Pressure.hxx

@@ -23,7 +23,7 @@
 //! unit area. In a fluid it is defined as the product
 //! of the depth, density, and free fall acceleration.
 //! It is measured in pascals (newtons per square metre).
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Pressure;
 
 #endif // _Quantity_Pressure_HeaderFile

src/Quantity/Quantity_Quotient.hxx

@@ -19,7 +19,7 @@
 
 #include <Standard_Real.hxx>
 
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Quotient;
 
-
 #endif // _Quantity_Quotient_HeaderFile

src/Quantity/Quantity_Rate.hxx

@@ -19,7 +19,7 @@
 
 #include <Standard_Real.hxx>
 
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Rate;
 
-
 #endif // _Quantity_Rate_HeaderFile

src/Quantity/Quantity_Ratio.hxx

@@ -19,7 +19,7 @@
 
 #include <Standard_Real.hxx>
 
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Ratio;
 
-
 #endif // _Quantity_Ratio_HeaderFile

src/Quantity/Quantity_Reluctance.hxx

@@ -23,7 +23,7 @@
 //! to a magnetic circuit to the magnetic flux in the circuit.
 //! It is measured in reciprocal henrys.
 //! Its reciprocal is permanence.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Reluctance;
 
 #endif // _Quantity_Reluctance_HeaderFile

src/Quantity/Quantity_Resistance.hxx

@@ -22,7 +22,7 @@
 //! Defined as the ratio of the potential difference
 //! across a conductor to the current flowing through it.
 //! It is measured in ohms.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Resistance;
 
 #endif // _Quantity_Resistance_HeaderFile

src/Quantity/Quantity_Resistivity.hxx

@@ -23,7 +23,7 @@
 //! cross-section per unit length.
 //! It is measured in Ohm-metres.
 //! It is the reciprocal of the conductivity.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Resistivity;
 
 #endif // _Quantity_Resistivity_HeaderFile

src/Quantity/Quantity_Scalaire.hxx

@@ -19,6 +19,7 @@
 
 #include <Standard_Real.hxx>
 
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Scalaire;
 
 

src/Quantity/Quantity_SolidAngle.hxx

@@ -21,6 +21,7 @@
 
 //! Defined as an angle formed by three or more planes.
 //! It is measured in steradians.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_SolidAngle;
 
 #endif // _Quantity_SolidAngle_HeaderFile

src/Quantity/Quantity_SoundIntensity.hxx

@@ -24,7 +24,7 @@
 //! square of the root-mean-square sound pressure, divided by
 //! the density of the medium and by the speed of sound.
 //! It is measured in watts per square metre.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_SoundIntensity;
 
 #endif // _Quantity_SoundIntensity_HeaderFile

src/Quantity/Quantity_SpecificHeatCapacity.hxx

@@ -29,7 +29,7 @@
 //! degree of temperature.
 //! It is measured in joules per kilogram per degree
 //! kelvin.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_SpecificHeatCapacity;
 
 #endif // _Quantity_SpecificHeatCapacity_HeaderFile

src/Quantity/Quantity_Speed.hxx

@@ -21,6 +21,7 @@
 
 //! Defined as distance covered per unit time.
 //! It is measured in metres per second.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Speed;
 
 #endif // _Quantity_Speed_HeaderFile

src/Quantity/Quantity_SurfaceTension.hxx

@@ -22,7 +22,7 @@
 //! Defined as the force required to hold unit length
 //! of a plane liquid surface.
 //! It is measured in newtons per metre.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_SurfaceTension;
 
 #endif // _Quantity_SurfaceTension_HeaderFile

src/Quantity/Quantity_Temperature.hxx

@@ -22,6 +22,7 @@
 //! Defined as a measure of the average kinetic energy
 //! of the molecules in a body.
 //! It is measured in degrees kelvin.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Temperature;
 
 #endif // _Quantity_Temperature_HeaderFile

src/Quantity/Quantity_ThermalConductivity.hxx

@@ -23,7 +23,7 @@
 //! area inside a body. Quantified as work per unit time
 //! per unit length per unit of temperature.
 //! It is measured in watts per metre per degee kelvin.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_ThermalConductivity;
 
 #endif // _Quantity_ThermalConductivity_HeaderFile

src/Quantity/Quantity_Torque.hxx

@@ -23,7 +23,7 @@
 //! perpendicular distance to an axis or as the
 //! the product of a force couple.
 //! It is measured in newtons x metres.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Torque;
 
 #endif // _Quantity_Torque_HeaderFile

src/Quantity/Quantity_Velocity.hxx

@@ -22,6 +22,7 @@
 //! Defined as distance covered per unit time in a
 //! given direction. It is a vector quantity.
 //! It is measured in metres per second.
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Velocity;
 
 #endif // _Quantity_Velocity_HeaderFile

src/Quantity/Quantity_Viscosity.hxx

@@ -24,7 +24,7 @@
 //! and time. For a liquid it generally decreases with
 //! temperature; for a gas it increases.
 //! It is measured in pascal-seconds.
-
+Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead")
 typedef Standard_Real Quantity_Viscosity;
 
 #endif // _Quantity_Viscosity_HeaderFile