0032661: Coding - Forward class declaration in ProjLib collides with typeref

Removed redundant forward declarations from ProjLib.hxx.

diff --git a/src/ProjLib/ProjLib.cxx b/src/ProjLib/ProjLib.cxx
index 23ca6495ad9baa2ddc9a35bb1651be462f6fc5f6..5da06356cfe6a5397ec14fe1f1cf18ff20b3ea41 100644 (file)
--- a/src/ProjLib/ProjLib.cxx
+++ b/src/ProjLib/ProjLib.cxx
@@ -14,8 +14,17 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
+#include <ProjLib.hxx>
 
+#include <Adaptor3d_Surface.hxx>
 #include <ElSLib.hxx>
+#include <Geom2d_Line.hxx>
+#include <Geom2d_Circle.hxx>
+#include <Geom2d_Ellipse.hxx>
+#include <Geom2d_Parabola.hxx>
+#include <Geom2d_Hyperbola.hxx>
+#include <Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Circ2d.hxx>
 #include <gp_Cone.hxx>
@@ -33,22 +42,13 @@
 #include <gp_Pnt2d.hxx>
 #include <gp_Sphere.hxx>
 #include <gp_Torus.hxx>
-#include <ProjLib.hxx>
 #include <ProjLib_Cone.hxx>
 #include <ProjLib_Cylinder.hxx>
 #include <ProjLib_Plane.hxx>
 #include <ProjLib_Sphere.hxx>
 #include <ProjLib_Torus.hxx>
 #include <ProjLib_ProjectedCurve.hxx>
-#include <Geom2d_Line.hxx>
-#include <Geom2d_Circle.hxx>
-#include <Geom2d_Ellipse.hxx>
-#include <Geom2d_Parabola.hxx>
-#include <Geom2d_Hyperbola.hxx>
-#include <Geom2d_BSplineCurve.hxx>
-#include <Geom2d_BezierCurve.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <Adaptor3d_Surface.hxx>
 
 //=======================================================================
 //function : Project

diff --git a/src/ProjLib/ProjLib.hxx b/src/ProjLib/ProjLib.hxx
index 3601b5a66beece8ba27d8ae03acc1fdd37b03213..2751ddf93a71d22fb9ff0624a3f938f7afd96441 100644 (file)
--- a/src/ProjLib/ProjLib.hxx
+++ b/src/ProjLib/ProjLib.hxx
@@ -37,141 +37,77 @@ class gp_Cylinder;
 class gp_Cone;
 class gp_Sphere;
 class gp_Torus;
-class ProjLib_ProjectOnPlane;
-class ProjLib_ProjectOnSurface;
-class ProjLib_ComputeApprox;
-class ProjLib_ComputeApproxOnPolarSurface;
 class ProjLib_ProjectedCurve;
-class ProjLib_HProjectedCurve;
-class ProjLib_CompProjectedCurve;
-class ProjLib_HCompProjectedCurve;
-class ProjLib_PrjResolve;
-class ProjLib_PrjFunc;
-class ProjLib_Projector;
-class ProjLib_Plane;
-class ProjLib_Cylinder;
-class ProjLib_Cone;
-class ProjLib_Sphere;
-class ProjLib_Torus;
-
-//! The  projLib package  first provides projection of
-//! curves on a   plane along a  given Direction.  The
-//! result will be a 3D curve.
-//! The ProjLib package  provides projection of curves
-//! on surfaces to compute the curve in the parametric
-//! space.
+
+//! The ProjLib package first provides projection of curves on a plane along a given Direction.
+//! The result will be a 3D curve.
 //!
+//! The ProjLib package provides projection of curves on surfaces to compute the curve in the parametric space.
 //! It is assumed that the curve is on the surface.
 //!
-//! It provides :
-//!
-//! * Package methods to handle the easiest cases :
-//!
-//! - Line, Circle, Ellipse, Parabola, Hyperbola on plane.
-//!
-//! - Line, Circle on cylinder.
-//!
-//! - Line, Circle on cone.
-//!
-//! * Classes to handle the general cases :
-//!
-//! - Plane.
-//!
-//! - Cylinder.
+//! It provides:
 //!
-//! - Cone.
+//! * Package methods to handle the easiest cases:
+//!  - Line, Circle, Ellipse, Parabola, Hyperbola on plane.
+//!  - Line, Circle on cylinder.
+//!  - Line, Circle on cone.
 //!
-//! - Sphere.
+//! * Classes to handle the general cases:
+//!  - Plane.
+//!  - Cylinder.
+//!  - Cone.
+//!  - Sphere.
+//!  - Torus.
 //!
-//! - Torus.
-//!
-//! * A generic  class to handle  a Curve from Adaptor3d
-//! on a Surface from Adaptor3d.
+//! * A generic class to handle a Adaptor3d_Curve on a Adaptor3d_Surface.
 class ProjLib 
 {
 public:
 
   DEFINE_STANDARD_ALLOC
-
   
   Standard_EXPORT static gp_Pnt2d Project (const gp_Pln& Pl, const gp_Pnt& P);
-  
+
   Standard_EXPORT static gp_Lin2d Project (const gp_Pln& Pl, const gp_Lin& L);
-  
+
   Standard_EXPORT static gp_Circ2d Project (const gp_Pln& Pl, const gp_Circ& C);
-  
+
   Standard_EXPORT static gp_Elips2d Project (const gp_Pln& Pl, const gp_Elips& E);
-  
+
   Standard_EXPORT static gp_Parab2d Project (const gp_Pln& Pl, const gp_Parab& P);
-  
+
   Standard_EXPORT static gp_Hypr2d Project (const gp_Pln& Pl, const gp_Hypr& H);
-  
+
   Standard_EXPORT static gp_Pnt2d Project (const gp_Cylinder& Cy, const gp_Pnt& P);
-  
+
   Standard_EXPORT static gp_Lin2d Project (const gp_Cylinder& Cy, const gp_Lin& L);
-  
+
   Standard_EXPORT static gp_Lin2d Project (const gp_Cylinder& Cy, const gp_Circ& Ci);
-  
+
   Standard_EXPORT static gp_Pnt2d Project (const gp_Cone& Co, const gp_Pnt& P);
-  
+
   Standard_EXPORT static gp_Lin2d Project (const gp_Cone& Co, const gp_Lin& L);
-  
+
   Standard_EXPORT static gp_Lin2d Project (const gp_Cone& Co, const gp_Circ& Ci);
-  
+
   Standard_EXPORT static gp_Pnt2d Project (const gp_Sphere& Sp, const gp_Pnt& P);
-  
+
   Standard_EXPORT static gp_Lin2d Project (const gp_Sphere& Sp, const gp_Circ& Ci);
-  
+
   Standard_EXPORT static gp_Pnt2d Project (const gp_Torus& To, const gp_Pnt& P);
-  
+
   Standard_EXPORT static gp_Lin2d Project (const gp_Torus& To, const gp_Circ& Ci);
 
   //! Make empty  P-Curve <aC> of relevant to <PC> type
   Standard_EXPORT static void MakePCurveOfType (const ProjLib_ProjectedCurve& PC,
                                                 Handle(Geom2d_Curve)& aC);
+
   //! Returns "true" if surface is analytical, that is it can be
   //! Plane, Cylinder, Cone, Sphere, Torus.
   //! For all other types of surface method returns "false".
   Standard_EXPORT static Standard_Boolean IsAnaSurf
                                            (const Handle(Adaptor3d_Surface)& theAS);
 
-
-
-
-protected:
-
-
-
-
-
-private:
-
-
-
-
-friend class ProjLib_ProjectOnPlane;
-friend class ProjLib_ProjectOnSurface;
-friend class ProjLib_ComputeApprox;
-friend class ProjLib_ComputeApproxOnPolarSurface;
-friend class ProjLib_ProjectedCurve;
-friend class ProjLib_HProjectedCurve;
-friend class ProjLib_CompProjectedCurve;
-friend class ProjLib_HCompProjectedCurve;
-friend class ProjLib_PrjResolve;
-friend class ProjLib_PrjFunc;
-friend class ProjLib_Projector;
-friend class ProjLib_Plane;
-friend class ProjLib_Cylinder;
-friend class ProjLib_Cone;
-friend class ProjLib_Sphere;
-friend class ProjLib_Torus;
-
 };
 
-
-
-
-
-
-
 #endif // _ProjLib_HeaderFile