X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FNMTDS%2FNMTDS_Iterator.hxx;h=d1d0ebd9216f99da572ba7ee3d5941ff2f901dd4;hb=15e78623e92030e26c218fab844b77f2c4d09d89;hp=5f4d3f034873ec8c2a9872b31202c3681eabba58;hpb=7f46e5fa52cfe13e206ab10e628556e7e393aaf5;p=modules%2Fgeom.git

diff --git a/src/NMTDS/NMTDS_Iterator.hxx b/src/NMTDS/NMTDS_Iterator.hxx
index 5f4d3f034..d1d0ebd92 100644
--- a/src/NMTDS/NMTDS_Iterator.hxx
+++ b/src/NMTDS/NMTDS_Iterator.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,139 +20,84 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+// File:        NMTDS_Iterator.hxx
+// Author:      Peter KURNEV
+
 #ifndef _NMTDS_Iterator_HeaderFile
 #define _NMTDS_Iterator_HeaderFile
 
-#ifndef _NMTDS_PShapesDataStructure_HeaderFile
-#include <NMTDS_PShapesDataStructure.hxx>
-#endif
-#ifndef _NMTDS_ListOfPassKeyBoolean_HeaderFile
-#include <NMTDS_ListOfPassKeyBoolean.hxx>
-#endif
-#ifndef _NMTDS_ListIteratorOfListOfPassKeyBoolean_HeaderFile
-#include <NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx>
-#endif
-#ifndef _Standard_Integer_HeaderFile
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+
 #include <Standard_Integer.hxx>
-#endif
-#ifndef _TColStd_DataMapOfIntegerListOfInteger_HeaderFile
 #include <TColStd_DataMapOfIntegerListOfInteger.hxx>
-#endif
-#ifndef _TopAbs_ShapeEnum_HeaderFile
 #include <TopAbs_ShapeEnum.hxx>
-#endif
-#ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
-#endif
-class NMTDS_ShapesDataStructure;
-class TColStd_DataMapOfIntegerListOfInteger;
-
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-
-
+#include <NMTDS_PShapesDataStructure.hxx>
+#include <NMTDS_ListOfPairBoolean.hxx>
+#include <NMTDS_ListIteratorOfListOfPairBoolean.hxx>
+#include <NMTDS_ShapesDataStructure.hxx>
+
+//=======================================================================
+//class : NMTDS_Iterator
+//purpose  : 
+//=======================================================================
 class NMTDS_Iterator  {
-
-public:
-
-    void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
- // Methods PUBLIC
- // 
-
-
-Standard_EXPORT NMTDS_Iterator();
-Standard_EXPORT virtual ~NMTDS_Iterator();
-
-
-Standard_EXPORT   void SetDS(const NMTDS_PShapesDataStructure& pDS) ;
-
-
-Standard_EXPORT  const NMTDS_ShapesDataStructure& DS() const;
-
-
-Standard_EXPORT   void Initialize(const TopAbs_ShapeEnum aType1,const TopAbs_ShapeEnum aType2) ;
-
-
-Standard_EXPORT   Standard_Boolean More() const;
-
-
-Standard_EXPORT   void Next() ;
-
-
-Standard_EXPORT   void Current(Standard_Integer& aIndex1,Standard_Integer& aIndex2,Standard_Boolean& aWithSubShape) const;
-
-
-Standard_EXPORT virtual  void Prepare() ;
-
-
-Standard_EXPORT   Standard_Integer ExpectedLength() const;
-
-
-Standard_EXPORT   Standard_Integer BlockLength() const;
-
-
-Standard_EXPORT  const TColStd_DataMapOfIntegerListOfInteger& SDVertices() const;
-
-
-Standard_EXPORT static  void FillMVSD(const TColStd_DataMapOfIntegerListOfInteger& aMVSD1,TColStd_DataMapOfIntegerListOfInteger& aMVSD2) ;
-
-
-
-
+ public:
+  Standard_EXPORT   
+    NMTDS_Iterator();
+
+  Standard_EXPORT 
+    virtual ~NMTDS_Iterator();
+  
+  Standard_EXPORT
+    void SetDS(const NMTDS_PShapesDataStructure& pDS) ;
+  
+  Standard_EXPORT 
+    const NMTDS_ShapesDataStructure& DS() const;
+  
+  Standard_EXPORT 
+    void Initialize(const TopAbs_ShapeEnum aType1,
+		    const TopAbs_ShapeEnum aType2) ;
+  
+  Standard_EXPORT 
+    Standard_Boolean More() const;
+  
+  Standard_EXPORT
+    void Next() ;
+  
+  Standard_EXPORT
+    void Current(Standard_Integer& aIndex1,
+		 Standard_Integer& aIndex2,
+		 Standard_Boolean& aWithSubShape) const;
+  
+  Standard_EXPORT
+    virtual  void Prepare() ;
+  
+  Standard_EXPORT
+    Standard_Integer ExpectedLength() const;
+  
+  Standard_EXPORT 
+    Standard_Integer BlockLength() const;
+  
+  Standard_EXPORT 
+    const TColStd_DataMapOfIntegerListOfInteger& SDVertices() const;
+  
+  Standard_EXPORT 
+    static  void FillMVSD(const TColStd_DataMapOfIntegerListOfInteger& aMVSD1,
+			  TColStd_DataMapOfIntegerListOfInteger& aMVSD2) ;
 
 protected:
-
- // Methods PROTECTED
- // 
-
-
-Standard_EXPORT virtual  void Intersect() ;
-
-
- // Fields PROTECTED
- //
-NMTDS_PShapesDataStructure myDS;
-NMTDS_ListOfPassKeyBoolean myLists[6];
-NMTDS_ListIteratorOfListOfPassKeyBoolean myIterator;
-NMTDS_ListOfPassKeyBoolean myEmptyList;
-Standard_Integer myLength;
-TColStd_DataMapOfIntegerListOfInteger myMVSD;
-
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-
-
+  Standard_EXPORT  
+    virtual  void Intersect() ;
+  //
+  
+  NMTDS_PShapesDataStructure myDS;
+  NMTDS_ListOfPairBoolean myLists[6];
+  NMTDS_ListIteratorOfListOfPairBoolean myIterator;
+  NMTDS_ListOfPairBoolean myEmptyList;
+  Standard_Integer myLength;
+  TColStd_DataMapOfIntegerListOfInteger myMVSD;
 };
 
-
-
-
-
-// other Inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif