0024023: Revamp the OCCT Handle -- GC

Implementation of operator of type casting to resulting object simplified in classes of GC and GCE2d packages

src/GC/GC_MakeArcOfCircle.cdl

@@ -95,11 +95,7 @@ Value(me) returns TrimmedCurve from Geom
     ---Purpose: Returns the constructed arc of circle.
     -- Exceptions StdFail_NotDone if no arc of circle is constructed.
     ---C++: return const&
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+    ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeArcOfCircle.cxx

@@ -161,20 +161,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeArcOfCircle::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-//=======================================================================
-//function : Operator
-//purpose  : 
-//=======================================================================
-const Handle(Geom_TrimmedCurve)& GC_MakeArcOfCircle::Operator() const 
-{
-  return Value();
-}
-//=======================================================================
-//function : operator
-//purpose  : 
-//=======================================================================
-GC_MakeArcOfCircle::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-

src/GC/GC_MakeArcOfEllipse.cdl

@@ -67,11 +67,7 @@ Value(me) returns TrimmedCurve from Geom
     is static;
     	---C++: return const&
     	---Purpose: Returns the constructed arc of ellipse.
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeArcOfEllipse.cxx

@@ -57,17 +57,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeArcOfEllipse::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom_TrimmedCurve)& GC_MakeArcOfEllipse::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeArcOfEllipse::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-
-
-
-

src/GC/GC_MakeArcOfHyperbola.cdl

@@ -64,11 +64,7 @@ Value(me) returns TrimmedCurve from Geom
     is static;
     	--- Purpose: Returns the constructed arc of hyperbola.
     	---C++: return const&
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeArcOfHyperbola.cxx

@@ -58,14 +58,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeArcOfHyperbola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom_TrimmedCurve)& GC_MakeArcOfHyperbola::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeArcOfHyperbola::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-

src/GC/GC_MakeArcOfParabola.cdl

@@ -60,11 +60,7 @@ Value(me) returns TrimmedCurve from Geom
     is static;
     	---Purpose: Returns the constructed arc of parabola.
     	---C++: return const&
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeArcOfParabola.cxx

@@ -57,14 +57,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeArcOfParabola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom_TrimmedCurve)& GC_MakeArcOfParabola::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeArcOfParabola::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-

src/GC/GC_MakeCircle.cdl

@@ -100,11 +100,7 @@ Value(me) returns Circle from Geom
     -- Exceptions
     -- StdFail_NotDone if no circle is constructed.
     ---C++: return const&
-
-Operator(me) returns Circle from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Circle() const;"
+    ---C++: alias "operator const Handle(Geom_Circle)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeCircle.cxx

@@ -100,14 +100,3 @@ const Handle(Geom_Circle)& GC_MakeCircle::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCircle;
 }
-
-const Handle(Geom_Circle)& GC_MakeCircle::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeCircle::operator Handle(Geom_Circle) () const
-{
-  return Value();
-}
-

src/GC/GC_MakeConicalSurface.cdl

@@ -128,11 +128,7 @@ Value(me) returns ConicalSurface from Geom
     	-- Exceptions
     	-- StdFail_NotDone if no cone is constructed.
     	---C++: return const&
-
-Operator(me) returns ConicalSurface from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_ConicalSurface() const;"
+        ---C++: alias "operator const Handle(Geom_ConicalSurface)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeConicalSurface.cxx

@@ -108,14 +108,3 @@ const Handle(Geom_ConicalSurface)& GC_MakeConicalSurface::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCone;
 }
-
-const Handle(Geom_ConicalSurface)& GC_MakeConicalSurface::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeConicalSurface::operator Handle(Geom_ConicalSurface) () const
-{
-  return Value();
-}
-

src/GC/GC_MakeCylindricalSurface.cdl

@@ -109,11 +109,7 @@ Value(me) returns CylindricalSurface from Geom
     ---Purpose: Returns the constructed cylinder.
     -- Exceptions StdFail_NotDone if no cylinder is constructed.
     ---C++: return const&
-
-Operator(me) returns CylindricalSurface from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_CylindricalSurface() const;"
+    ---C++: alias "operator const Handle(Geom_CylindricalSurface)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeCylindricalSurface.cxx

@@ -101,13 +101,3 @@ const Handle(Geom_CylindricalSurface)&
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCylinder;
 }
-
-const Handle(Geom_CylindricalSurface)& GC_MakeCylindricalSurface::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeCylindricalSurface::operator Handle(Geom_CylindricalSurface) () const
-{
-  return Value();
-}

src/GC/GC_MakeEllipse.cdl

@@ -72,11 +72,7 @@ Value(me) returns Ellipse from Geom
     	---Purpose: Returns the constructed ellipse.
     	-- Exceptions StdFail_NotDone if no ellipse is constructed.
         ---C++: return const&
-
-Operator(me) returns Ellipse from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_Ellipse() const;"
+        ---C++: alias "operator const Handle(Geom_Ellipse)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeEllipse.cxx

@@ -51,14 +51,3 @@ const Handle(Geom_Ellipse)& GC_MakeEllipse::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheEllipse;
 }
-
-const Handle(Geom_Ellipse)& GC_MakeEllipse::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeEllipse::operator Handle(Geom_Ellipse) () const
-{
-  return Value();
-}
-

src/GC/GC_MakeHyperbola.cdl

@@ -81,11 +81,7 @@ Value(me) returns Hyperbola from Geom
     ---Purpose: Returns the constructed hyperbola.
     -- Exceptions StdFail_NotDone if no hyperbola is constructed.
     ---C++: return const&
-
-Operator(me) returns Hyperbola from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Hyperbola() const;"
+    ---C++: alias "operator const Handle(Geom_Hyperbola)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeHyperbola.cxx

@@ -50,14 +50,3 @@ const Handle(Geom_Hyperbola)& GC_MakeHyperbola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheHyperbola;
 }
-
-const Handle(Geom_Hyperbola)& GC_MakeHyperbola::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeHyperbola::operator Handle(Geom_Hyperbola) () const
-{
-  return Value();
-}
-

src/GC/GC_MakeLine.cdl

@@ -72,11 +72,7 @@ Value(me) returns Line from Geom
     ---Purpose:  Returns the constructed line.
     -- Exceptions StdFail_NotDone if no line is constructed.
     ---C++: return const&
-
-Operator(me) returns Line from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Line() const;"
+    ---C++: alias "operator const Handle(Geom_Line)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeLine.cxx

@@ -66,14 +66,3 @@ const Handle(Geom_Line)& GC_MakeLine::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheLine;
 }
-
-const Handle(Geom_Line)& GC_MakeLine::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeLine::operator Handle(Geom_Line) () const
-{
-  return Value();
-}
-

src/GC/GC_MakeMirror.cdl

@@ -61,11 +61,7 @@ Value(me) returns Transformation from Geom
     is static;
     ---Purpose: Returns the constructed transformation.
     ---C++: return const&
-
-Operator(me) returns Transformation from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Transformation() const;"
+    ---C++: alias "operator const Handle(Geom_Transformation)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeMirror.cxx

@@ -80,14 +80,3 @@ const Handle(Geom_Transformation)& GC_MakeMirror::Value() const
 { 
   return TheMirror;
 }
-
-const Handle(Geom_Transformation)& GC_MakeMirror::Operator() const 
-{
-  return TheMirror;
-}
-
-GC_MakeMirror::operator Handle(Geom_Transformation) () const
-{
-  return TheMirror;
-}
-

src/GC/GC_MakePlane.cdl

@@ -98,11 +98,7 @@ Value(me) returns Plane from Geom
     ---Purpose: Returns the constructed plane.
     -- Exceptions StdFail_NotDone if no plane is constructed.
     ---C++: return const&
-
-Operator(me) returns Plane from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Plane() const;"
+    ---C++: alias "operator const Handle(Geom_Plane)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakePlane.cxx

@@ -122,14 +122,3 @@ const Handle(Geom_Plane)& GC_MakePlane::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return ThePlane;
 }
-
-const Handle(Geom_Plane)& GC_MakePlane::Operator() const 
-{
-  return Value();
-}
-
-GC_MakePlane::operator Handle(Geom_Plane) () const
-{
-  return Value();
-}
-

src/GC/GC_MakeRotation.cdl

@@ -51,11 +51,7 @@ Value(me) returns Transformation from Geom
     is static;
     ---Purpose: Returns the constructed transformation.
     ---C++: return const&
-  
-Operator(me) returns Transformation from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Transformation() const;"
+    ---C++: alias "operator const Handle(Geom_Transformation)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeRotation.cxx

@@ -56,17 +56,3 @@ const Handle(Geom_Transformation)& GC_MakeRotation::Value() const
 { 
   return TheRotation;
 }
-
-const Handle(Geom_Transformation)& GC_MakeRotation::Operator() const 
-{
-  return TheRotation;
-}
-
-GC_MakeRotation::operator Handle(Geom_Transformation) () const
-{
-  return TheRotation;
-}
-
-
-
-

src/GC/GC_MakeScale.cdl

@@ -43,11 +43,7 @@ Value(me) returns Transformation from Geom
     is static;
     ---Purpose: Returns the constructed transformation.
     ---C++: return const&
-
-Operator(me) returns Transformation from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Transformation() const;"
+    ---C++: alias "operator const Handle(Geom_Transformation)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeScale.cxx

@@ -32,14 +32,3 @@ const Handle(Geom_Transformation)& GC_MakeScale::Value() const
 { 
   return TheScale;
 }
-
-const Handle(Geom_Transformation)& GC_MakeScale::Operator() const 
-{
-  return TheScale;
-}
-
-GC_MakeScale::operator Handle(Geom_Transformation) () const
-{
-  return TheScale;
-}
-

src/GC/GC_MakeSegment.cdl

@@ -64,11 +64,7 @@ Value(me) returns TrimmedCurve from Geom
     is static;
     	---Purpose: Returns the constructed line segment.
     	---C++: return const&
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeSegment.cxx

@@ -64,14 +64,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeSegment::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheSegment;
 }
-
-const Handle(Geom_TrimmedCurve)& GC_MakeSegment::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeSegment::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-

src/GC/GC_MakeTranslation.cdl

@@ -44,11 +44,7 @@ Value(me) returns Transformation from Geom
     is static;
     	---Purpose:  Returns the constructed transformation.
     	---C++: return const&
-
-Operator(me) returns Transformation from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_Transformation() const;"
+        ---C++: alias "operator const Handle(Geom_Transformation)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeTranslation.cxx

@@ -42,14 +42,3 @@ const Handle(Geom_Transformation)& GC_MakeTranslation::Value() const
 { 
   return TheTranslation;
 }
-
-const Handle(Geom_Transformation)& GC_MakeTranslation::Operator() const 
-{
-  return TheTranslation;
-}
-
-GC_MakeTranslation::operator Handle(Geom_Transformation) () const
-{
-  return TheTranslation;
-}
-

src/GC/GC_MakeTrimmedCone.cdl

@@ -71,11 +71,7 @@ Value(me) returns RectangularTrimmedSurface from Geom
     ---Purpose: Returns the constructed trimmed cone.
     -- StdFail_NotDone if no trimmed cone is constructed.
     ---C++: return const&
-
-Operator(me) returns RectangularTrimmedSurface from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_RectangularTrimmedSurface() const;"
+    ---C++: alias "operator const Handle(Geom_RectangularTrimmedSurface)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeTrimmedCone.cxx

@@ -76,16 +76,3 @@ const Handle(Geom_RectangularTrimmedSurface)& GC_MakeTrimmedCone::
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCone;
 }
-
-const Handle(Geom_RectangularTrimmedSurface)& GC_MakeTrimmedCone::
-       Operator() const 
-{
-  return Value();
-}
-
-GC_MakeTrimmedCone::
-  operator Handle(Geom_RectangularTrimmedSurface) () const
-{
-  return Value();
-}
-

src/GC/GC_MakeTrimmedCylinder.cdl

@@ -93,11 +93,7 @@ Value(me) returns RectangularTrimmedSurface from Geom
     -- Exceptions
     -- StdFail_NotDone if no trimmed cylinder is constructed.
     ---C++: return const&
-
-Operator(me) returns RectangularTrimmedSurface from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_RectangularTrimmedSurface() const;"
+    ---C++: alias "operator const Handle(Geom_RectangularTrimmedSurface)& () const { return Value(); }"
 
 fields
 

src/GC/GC_MakeTrimmedCylinder.cxx

@@ -18,6 +18,7 @@
 #include <GC_MakeCylindricalSurface.hxx>
 #include <StdFail_NotDone.hxx>
 #include <Standard_NotImplemented.hxx>
+#include <Geom_CylindricalSurface.hxx>
 
 //=========================================================================
 //   Creation of a cylinder limited by three points <P1>, <P2> and <P3>.         +
@@ -85,16 +86,3 @@ const Handle(Geom_RectangularTrimmedSurface)& GC_MakeTrimmedCylinder::
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCyl;
 }
-
-const Handle(Geom_RectangularTrimmedSurface)& GC_MakeTrimmedCylinder::
-       Operator() const 
-{
-  return Value();
-}
-
-GC_MakeTrimmedCylinder::
-  operator Handle(Geom_RectangularTrimmedSurface) () const
-{
-  return Value();
-}
-

src/GCE2d/GCE2d_MakeArcOfCircle.cdl

@@ -82,11 +82,7 @@ Value(me) returns TrimmedCurve from Geom2d
     	---C++: return const&
     	---Purpose: Returns the constructed arc of circle.
     	-- Exceptions StdFail_NotDone if no arc of circle is constructed.
-
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeArcOfCircle.cxx

@@ -114,14 +114,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfCircle::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfCircle::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeArcOfCircle::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-

src/GCE2d/GCE2d_MakeArcOfEllipse.cdl

@@ -68,11 +68,7 @@ Value(me) returns TrimmedCurve from Geom2d
     is static;
      	---C++: return const&
      	---Purpose: Returns the constructed arc of ellipse.
-
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeArcOfEllipse.cxx

@@ -57,17 +57,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfEllipse::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfEllipse::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeArcOfEllipse::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-
-
-
-

src/GCE2d/GCE2d_MakeArcOfHyperbola.cdl

@@ -67,11 +67,7 @@ Value(me) returns TrimmedCurve from Geom2d
     is static;
     	---C++: return const&
     	---Purpose: Returns the constructed arc of hyperbola.
-
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeArcOfHyperbola.cxx

@@ -59,14 +59,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfHyperbola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfHyperbola::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeArcOfHyperbola::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-

src/GCE2d/GCE2d_MakeArcOfParabola.cdl

@@ -67,11 +67,7 @@ Value(me) returns TrimmedCurve from Geom2d
     is static;
     	---C++: return const&
     	---Purpose: Returns the constructed arc of parabola.
-    
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeArcOfParabola.cxx

@@ -58,14 +58,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfParabola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfParabola::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeArcOfParabola::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-

src/GCE2d/GCE2d_MakeCircle.cdl

@@ -104,11 +104,7 @@ Value(me) returns Circle from Geom2d
     ---C++: return const&
     ---Purpose: Returns the constructed circle.
     -- Exceptions StdFail_NotDone if no circle is constructed.
-
-Operator(me) returns Circle from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Circle() const;"
+    ---C++: alias "operator const Handle(Geom2d_Circle)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeCircle.cxx

@@ -103,14 +103,3 @@ const Handle(Geom2d_Circle)& GCE2d_MakeCircle::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCircle;
 }
-
-const Handle(Geom2d_Circle)& GCE2d_MakeCircle::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeCircle::operator Handle(Geom2d_Circle) () const
-{
-  return Value();
-}
-

src/GCE2d/GCE2d_MakeEllipse.cdl

@@ -86,11 +86,7 @@ Value(me) returns Ellipse from Geom2d
     ---C++: return const&
     ---Purpose: Returns the constructed ellipse.
     -- Exceptions StdFail_NotDone if no ellipse is constructed.
-    
-Operator(me) returns Ellipse from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Ellipse() const;"
+    ---C++: alias "operator const Handle(Geom2d_Ellipse)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeEllipse.cxx

@@ -62,14 +62,3 @@ const Handle(Geom2d_Ellipse)& GCE2d_MakeEllipse::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheEllipse;
 }
-
-const Handle(Geom2d_Ellipse)& GCE2d_MakeEllipse::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeEllipse::operator Handle(Geom2d_Ellipse) () const
-{
-  return Value();
-}
-

src/GCE2d/GCE2d_MakeHyperbola.cdl

@@ -106,11 +106,7 @@ Value(me) returns Hyperbola from Geom2d
     ---C++: return const&
     ---Purpose: Returns the constructed hyperbola.
     -- Exceptions: StdFail_NotDone if no hyperbola is constructed.
-    
-Operator(me) returns Hyperbola from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Hyperbola() const;"
+    ---C++: alias "operator const Handle(Geom2d_Hyperbola)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeHyperbola.cxx

@@ -62,14 +62,3 @@ const Handle(Geom2d_Hyperbola)& GCE2d_MakeHyperbola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheHyperbola;
 }
-
-const Handle(Geom2d_Hyperbola)& GCE2d_MakeHyperbola::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeHyperbola::operator Handle(Geom2d_Hyperbola) () const
-{
-  return Value();
-}
-

src/GCE2d/GCE2d_MakeLine.cdl

@@ -72,11 +72,7 @@ Value(me) returns Line from Geom2d
     ---C++: return const&
     ---Purpose: Returns the constructed line.
     -- Exceptions StdFail_NotDone if no line is constructed.
-
-Operator(me) returns Line from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Line() const;"
+    ---C++: alias "operator const Handle(Geom2d_Line)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeLine.cxx

@@ -76,14 +76,3 @@ const Handle(Geom2d_Line)& GCE2d_MakeLine::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheLine;
 }
-
-const Handle(Geom2d_Line) & GCE2d_MakeLine::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeLine::operator Handle(Geom2d_Line) () const
-{
-  return Value();
-}
-

src/GCE2d/GCE2d_MakeMirror.cdl

@@ -53,11 +53,7 @@ Value(me) returns Transformation from Geom2d
     is static;
     ---C++: return const&
     ---Purpose: Returns the constructed transformation.
-
-Operator(me) returns Transformation from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Transformation() const;"
+    ---C++: alias "operator const Handle(Geom2d_Transformation)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeMirror.cxx

@@ -58,14 +58,3 @@ const Handle(Geom2d_Transformation)& GCE2d_MakeMirror::Value() const
 { 
   return TheMirror;
 }
-
-const Handle(Geom2d_Transformation)& GCE2d_MakeMirror::Operator() const 
-{
-  return TheMirror;
-}
-
-GCE2d_MakeMirror::operator Handle(Geom2d_Transformation) () const
-{
-  return TheMirror;
-}
-

src/GCE2d/GCE2d_MakeParabola.cdl

@@ -102,11 +102,7 @@ Value(me) returns Parabola from Geom2d
     	---C++: return const&
     	---Purpose: Returns the constructed parabola.
     	-- Exceptions StdFail_NotDone if no parabola is constructed.
-    
-Operator(me) returns Parabola from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_Parabola() const;"
+        ---C++: alias "operator const Handle(Geom2d_Parabola)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeParabola.cxx

@@ -77,14 +77,3 @@ const Handle(Geom2d_Parabola)& GCE2d_MakeParabola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheParabola;
 }
-
-const Handle(Geom2d_Parabola)& GCE2d_MakeParabola::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeParabola::operator Handle(Geom2d_Parabola) () const
-{
-  return Value();
-}
-

src/GCE2d/GCE2d_MakeRotation.cdl

@@ -39,11 +39,7 @@ Value(me) returns Transformation from Geom2d
     is static;
       	---C++: return const&
       	---Purpose:  Returns the constructed transformation.
-
-Operator(me) returns Transformation from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_Transformation() const;"
+        ---C++: alias "operator const Handle(Geom2d_Transformation)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeRotation.cxx

@@ -31,17 +31,3 @@ const Handle(Geom2d_Transformation)& GCE2d_MakeRotation::Value() const
 { 
   return TheRotation;
 }
-
-const Handle(Geom2d_Transformation)& GCE2d_MakeRotation::Operator() const 
-{
-  return TheRotation;
-}
-
-GCE2d_MakeRotation::operator Handle(Geom2d_Transformation) () const
-{
-  return TheRotation;
-}
-
-
-
-

src/GCE2d/GCE2d_MakeScale.cdl

@@ -42,11 +42,7 @@ Value(me) returns Transformation from Geom2d
     is static;
      	---C++: return const&
      	---Purpose: Returns the constructed transformation.
-
-Operator(me) returns Transformation from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_Transformation() const;"
+        ---C++: alias "operator const Handle(Geom2d_Transformation)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeScale.cxx

@@ -30,14 +30,3 @@ const Handle(Geom2d_Transformation)& GCE2d_MakeScale::Value() const
 { 
   return TheScale;
 }
-
-const Handle(Geom2d_Transformation)& GCE2d_MakeScale::Operator() const 
-{
-  return TheScale;
-}
-
-GCE2d_MakeScale::operator Handle(Geom2d_Transformation) () const
-{
-  return TheScale;
-}
-

src/GCE2d/GCE2d_MakeSegment.cdl

@@ -80,11 +80,7 @@ Value(me) returns TrimmedCurve from Geom2d
       	---C++: return const&
       	---Purpose: Returns the constructed line segment.
       	-- Exceptions StdFail_NotDone if no line segment is constructed.
-
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeSegment.cxx

@@ -80,14 +80,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeSegment::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheSegment;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeSegment::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeSegment::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-

src/GCE2d/GCE2d_MakeTranslation.cdl

@@ -45,11 +45,7 @@ Value(me) returns Transformation from Geom2d
     is static;
        ---C++: return const&
        ---Purpose: Returns the constructed transformation.
-    
-Operator(me) returns Transformation from Geom2d
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Transformation() const;"
+        ---C++: alias "operator const Handle(Geom2d_Transformation)& () const { return Value(); }"
 
 fields
 

src/GCE2d/GCE2d_MakeTranslation.cxx

@@ -40,14 +40,3 @@ const Handle(Geom2d_Transformation)& GCE2d_MakeTranslation::Value() const
 { 
   return TheTranslation;
 }
-
-const Handle(Geom2d_Transformation)& GCE2d_MakeTranslation::Operator() const 
-{
-  return TheTranslation;
-}
-
-GCE2d_MakeTranslation::operator Handle(Geom2d_Transformation) () const
-{
-  return TheTranslation;
-}
-