0024002: Overall code and build procedure refactoring -- automatic

[occt.git] / src / Aspect / Aspect_AspectFillArea.cxx

diff --git a/src/Aspect/Aspect_AspectFillArea.cxx b/src/Aspect/Aspect_AspectFillArea.cxx
index e201f53..5469ef8 100644 (file)
--- a/src/Aspect/Aspect_AspectFillArea.cxx
+++ b/src/Aspect/Aspect_AspectFillArea.cxx
@@ -4,8 +4,8 @@
 //
 // 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 version 2.1 as published
+// 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.
@@ -14,59 +14,42 @@
 // commercial license or contractual agreement.
 
 // Modified:    15/01/98 ; FMN : Ajout Hidden Line
-
-
 //-Version     
-
 //-Design      Declaration of variables specific to the context
 //             of tracing facets
-
 //-Warning     Context of tracing facets id defined by:
 //             - the style of the interior of the facet
 //             - the style of the border of the facet
 //             - the color
-
 //-References  
-
 //-Language    C++ 2.0
-
 //-Declarations
-
 // for the class
-#include <Aspect_AspectFillArea.ixx>
 
-//-Aliases
+#include <Aspect_AspectFillArea.hxx>
+#include <Aspect_AspectFillAreaDefinitionError.hxx>
+#include <Quantity_Color.hxx>
+#include <Standard_Type.hxx>
 
+//-Aliases
 //-Global data definitions
-
 //     -- interior
 //     MyInteriorStyle :       InteriorStyle;
 //     MyInteriorColor :       Color;
-
 //     -- border
 //     MyEdgeColor     :       Color;
 //     MyEdgeType      :       TypeOfLine;
 //     MyEdgeWidth     :       Standard_Real;
-
 //     -- shading
 //     MyHatchStyle    :       HatchStyle;
-
-
-#define OCC1174  // SAV : 08/01/03 Added back face interior color
-
 //-Constructors
-
 //-Destructors
-
 //-Methods, in order
-
 Aspect_AspectFillArea::Aspect_AspectFillArea () {
 
        MyInteriorStyle = Aspect_IS_EMPTY;
        MyInteriorColor = Quantity_NOC_CYAN1;
-#ifdef OCC1174
        MyBackInteriorColor = Quantity_NOC_CYAN1;
-#endif
        MyEdgeColor     = Quantity_NOC_WHITE;
        MyEdgeType      = Aspect_TOL_SOLID;
        MyEdgeWidth     = 1.0;
@@ -103,9 +86,7 @@ void Aspect_AspectFillArea::SetInteriorColor (const Quantity_Color& AColor) {
 
 void Aspect_AspectFillArea::SetBackInteriorColor( const Quantity_Color& color )
 {
-#ifdef OCC1174
   MyBackInteriorColor = color;
-#endif
 }
 
 void Aspect_AspectFillArea::SetEdgeColor (const Quantity_Color& AColor) {
@@ -156,9 +137,7 @@ void Aspect_AspectFillArea::Values (Aspect_InteriorStyle& AStyle, Quantity_Color
 
        AStyle          = MyInteriorStyle;
        AIntColor       = MyInteriorColor;
-#ifdef OCC1174
        BackIntColor    = MyBackInteriorColor;
-#endif
        AEdgeColor      = MyEdgeColor;
        AType           = MyEdgeType;
        AWidth          = MyEdgeWidth;