Fix problem with partition (merge fix of PKV from BR_QT4_Dev branch)

[modules/geom.git] / src / GEOMAlgo / GEOMAlgo_ShapeSolid.hxx

diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx
index 050c7b552eaf56c6733f915d3d7edb27b91199c2..fa7d823b78bf1391f4961f0d4624606e523dac58 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx
@@ -1,23 +1,21 @@
-// File generated by CPPExt (Value)
+// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-// This software may be distributed and/or modified under the terms and
-// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-// and appearing in the file LICENSE included in the packaging of this file.
-//  
-// This software is distributed on an "AS IS" basis, without warranty of any
-// kind, and Open CASCADE SA hereby disclaims all such warranties,
-// including without limitation, any warranties of merchantability, fitness
-// for a particular purpose or non-infringement. Please see the License for
-// the specific terms and conditions governing rights and limitations under the
-// License.
+// This library is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 
 #ifndef _GEOMAlgo_ShapeSolid_HeaderFile
 #define _GEOMAlgo_ShapeSolid_HeaderFile
@@ -34,8 +32,8 @@
 #ifndef _GEOMAlgo_Algo_HeaderFile
 #include <GEOMAlgo_Algo.hxx>
 #endif
-#ifndef _GEOMAlgo_State_HeaderFile
-#include <GEOMAlgo_State.hxx>
+#ifndef _TopAbs_State_HeaderFile
+#include <TopAbs_State.hxx>
 #endif
 class BOPTools_DSFiller;
 class TopTools_ListOfShape;
@@ -48,6 +46,7 @@ class TopTools_ListOfShape;
 #include <Standard_Macro.hxx>
 #endif
 
+
 class GEOMAlgo_ShapeSolid  : public GEOMAlgo_Algo {
 
 public:
@@ -66,9 +65,13 @@ public:
       }
  // Methods PUBLIC
  // 
+
+
 Standard_EXPORT   void SetFiller(const BOPTools_DSFiller& aDSF) ;
 Standard_EXPORT virtual ~GEOMAlgo_ShapeSolid();
-Standard_EXPORT  const TopTools_ListOfShape& Shapes(const GEOMAlgo_State aState) const;
+
+
+Standard_EXPORT  const TopTools_ListOfShape& Shapes(const TopAbs_State aState) const;
 
 
 
@@ -78,8 +81,14 @@ protected:
 
  // Methods PROTECTED
  // 
+
+
 Standard_EXPORT GEOMAlgo_ShapeSolid();
+
+
 Standard_EXPORT virtual  void BuildResult()  = 0;
+
+
 Standard_EXPORT virtual  void Prepare()  = 0;
 
 
@@ -88,7 +97,6 @@ Standard_EXPORT virtual  void Prepare()  = 0;
 TopTools_ListOfShape myLSIN;
 TopTools_ListOfShape myLSOUT;
 TopTools_ListOfShape myLSON;
-TopTools_ListOfShape myLS;
 Standard_Integer myRank;
 BOPTools_PDSFiller myDSFiller;