mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-29 14:00:49 +03:00
0024750: Replace instantiations of TCollection generic classes by NCollection templates -- automatic
Automatic upgrade of code by command "occt_upgrade . -tcollection"
This commit is contained in:
abv
@@ -1 +1,14 @@
|
||||
TNaming_NCollections.hxx
|
||||
TNaming_NamedShapeHasher.hxx
|
||||
TNaming_MapOfNamedShape.hxx
|
||||
TNaming_MapIteratorOfMapOfNamedShape.hxx
|
||||
TNaming_ListOfNamedShape.hxx
|
||||
TNaming_ListIteratorOfListOfNamedShape.hxx
|
||||
TNaming_DataMapOfShapePtrRefShape.hxx
|
||||
TNaming_DataMapIteratorOfDataMapOfShapePtrRefShape.hxx
|
||||
TNaming_DataMapOfShapeShapesSet.hxx
|
||||
TNaming_DataMapIteratorOfDataMapOfShapeShapesSet.hxx
|
||||
TNaming_ListOfMapOfShape.hxx
|
||||
TNaming_ListIteratorOfListOfMapOfShape.hxx
|
||||
TNaming_ListOfIndexedDataMapOfShapeListOfShape.hxx
|
||||
TNaming_ListIteratorOfListOfIndexedDataMapOfShapeListOfShape.hxx
|
||||
|
||||
@@ -167,12 +167,15 @@ is
|
||||
|
||||
|
||||
|
||||
class NamedShapeHasher instantiates MapHasher from TCollection(NamedShape from TNaming) ;
|
||||
imported NamedShapeHasher;
|
||||
|
||||
class MapOfNamedShape instantiates Map from TCollection(NamedShape from TNaming,
|
||||
NamedShapeHasher from TNaming) ;
|
||||
imported MapOfNamedShape;
|
||||
|
||||
imported MapIteratorOfMapOfNamedShape;
|
||||
|
||||
class ListOfNamedShape instantiates List from TCollection (NamedShape from TNaming);
|
||||
imported ListOfNamedShape;
|
||||
|
||||
imported ListIteratorOfListOfNamedShape;
|
||||
|
||||
|
||||
---Category: classes to store selected shape (involve naming algorithm)
|
||||
@@ -221,10 +224,9 @@ is
|
||||
|
||||
pointer PtrRefShape to RefShape from TNaming;
|
||||
|
||||
private class DataMapOfShapePtrRefShape instantiates
|
||||
DataMap from TCollection (Shape from TopoDS,
|
||||
PtrRefShape from TNaming,
|
||||
ShapeMapHasher from TopTools);
|
||||
imported DataMapOfShapePtrRefShape;
|
||||
|
||||
imported DataMapIteratorOfDataMapOfShapePtrRefShape;
|
||||
|
||||
|
||||
pointer PtrDataMapOfShapePtrRefShape to DataMapOfShapePtrRefShape from TNaming;
|
||||
@@ -244,14 +246,15 @@ is
|
||||
|
||||
private class IteratorOnShapesSet;
|
||||
|
||||
private class DataMapOfShapeShapesSet instantiates DataMap from TCollection
|
||||
(Shape from TopoDS,
|
||||
ShapesSet from TNaming,
|
||||
ShapeMapHasher from TopTools);
|
||||
imported DataMapOfShapeShapesSet;
|
||||
|
||||
imported DataMapIteratorOfDataMapOfShapeShapesSet;
|
||||
|
||||
private class ListOfMapOfShape instantiates List from TCollection (MapOfShape from TopTools);
|
||||
private class ListOfIndexedDataMapOfShapeListOfShape instantiates List from TCollection
|
||||
(IndexedDataMapOfShapeListOfShape from TopTools);
|
||||
imported ListOfMapOfShape;
|
||||
|
||||
imported ListIteratorOfListOfMapOfShape;
|
||||
imported ListOfIndexedDataMapOfShapeListOfShape;
|
||||
imported ListIteratorOfListOfIndexedDataMapOfShapeListOfShape;
|
||||
|
||||
|
||||
private class NamingTool;
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
|
||||
|
||||
#ifndef TNaming_DataMapIteratorOfDataMapOfShapePtrRefShape_HeaderFile
|
||||
#define TNaming_DataMapIteratorOfDataMapOfShapePtrRefShape_HeaderFile
|
||||
|
||||
#include <TNaming_DataMapOfShapePtrRefShape.hxx>
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,8 @@
|
||||
|
||||
|
||||
#ifndef TNaming_DataMapIteratorOfDataMapOfShapeShapesSet_HeaderFile
|
||||
#define TNaming_DataMapIteratorOfDataMapOfShapeShapesSet_HeaderFile
|
||||
|
||||
#include <TNaming_DataMapOfShapeShapesSet.hxx>
|
||||
|
||||
#endif
|
||||
29
src/TNaming/TNaming_DataMapOfShapePtrRefShape.hxx
Normal file
29
src/TNaming/TNaming_DataMapOfShapePtrRefShape.hxx
Normal file
@@ -0,0 +1,29 @@
|
||||
// Created on: 1997-03-17
|
||||
// Created by: Yves FRICAUD
|
||||
// Copyright (c) 1997-1999 Matra Datavision
|
||||
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
||||
//
|
||||
// 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 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.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifndef TNaming_DataMapOfShapePtrRefShape_HeaderFile
|
||||
#define TNaming_DataMapOfShapePtrRefShape_HeaderFile
|
||||
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TNaming_PtrRefShape.hxx>
|
||||
#include <TopTools_ShapeMapHasher.hxx>
|
||||
#include <NCollection_DataMap.hxx>
|
||||
|
||||
typedef NCollection_DataMap<TopoDS_Shape,TNaming_PtrRefShape,TopTools_ShapeMapHasher> TNaming_DataMapOfShapePtrRefShape;
|
||||
typedef NCollection_DataMap<TopoDS_Shape,TNaming_PtrRefShape,TopTools_ShapeMapHasher>::Iterator TNaming_DataMapIteratorOfDataMapOfShapePtrRefShape;
|
||||
|
||||
|
||||
#endif
|
||||
29
src/TNaming/TNaming_DataMapOfShapeShapesSet.hxx
Normal file
29
src/TNaming/TNaming_DataMapOfShapeShapesSet.hxx
Normal file
@@ -0,0 +1,29 @@
|
||||
// Created on: 1997-03-17
|
||||
// Created by: Yves FRICAUD
|
||||
// Copyright (c) 1997-1999 Matra Datavision
|
||||
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
||||
//
|
||||
// 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 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.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifndef TNaming_DataMapOfShapeShapesSet_HeaderFile
|
||||
#define TNaming_DataMapOfShapeShapesSet_HeaderFile
|
||||
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TNaming_ShapesSet.hxx>
|
||||
#include <TopTools_ShapeMapHasher.hxx>
|
||||
#include <NCollection_DataMap.hxx>
|
||||
|
||||
typedef NCollection_DataMap<TopoDS_Shape,TNaming_ShapesSet,TopTools_ShapeMapHasher> TNaming_DataMapOfShapeShapesSet;
|
||||
typedef NCollection_DataMap<TopoDS_Shape,TNaming_ShapesSet,TopTools_ShapeMapHasher>::Iterator TNaming_DataMapIteratorOfDataMapOfShapeShapesSet;
|
||||
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,8 @@
|
||||
|
||||
|
||||
#ifndef TNaming_ListIteratorOfListOfIndexedDataMapOfShapeListOfShape_HeaderFile
|
||||
#define TNaming_ListIteratorOfListOfIndexedDataMapOfShapeListOfShape_HeaderFile
|
||||
|
||||
#include <TNaming_ListOfIndexedDataMapOfShapeListOfShape.hxx>
|
||||
|
||||
#endif
|
||||
8
src/TNaming/TNaming_ListIteratorOfListOfMapOfShape.hxx
Normal file
8
src/TNaming/TNaming_ListIteratorOfListOfMapOfShape.hxx
Normal file
@@ -0,0 +1,8 @@
|
||||
|
||||
|
||||
#ifndef TNaming_ListIteratorOfListOfMapOfShape_HeaderFile
|
||||
#define TNaming_ListIteratorOfListOfMapOfShape_HeaderFile
|
||||
|
||||
#include <TNaming_ListOfMapOfShape.hxx>
|
||||
|
||||
#endif
|
||||
8
src/TNaming/TNaming_ListIteratorOfListOfNamedShape.hxx
Normal file
8
src/TNaming/TNaming_ListIteratorOfListOfNamedShape.hxx
Normal file
@@ -0,0 +1,8 @@
|
||||
|
||||
|
||||
#ifndef TNaming_ListIteratorOfListOfNamedShape_HeaderFile
|
||||
#define TNaming_ListIteratorOfListOfNamedShape_HeaderFile
|
||||
|
||||
#include <TNaming_ListOfNamedShape.hxx>
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,27 @@
|
||||
// Created on: 1997-03-17
|
||||
// Created by: Yves FRICAUD
|
||||
// Copyright (c) 1997-1999 Matra Datavision
|
||||
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
||||
//
|
||||
// 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 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.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifndef TNaming_ListOfIndexedDataMapOfShapeListOfShape_HeaderFile
|
||||
#define TNaming_ListOfIndexedDataMapOfShapeListOfShape_HeaderFile
|
||||
|
||||
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
|
||||
#include <NCollection_List.hxx>
|
||||
|
||||
typedef NCollection_List<TopTools_IndexedDataMapOfShapeListOfShape> TNaming_ListOfIndexedDataMapOfShapeListOfShape;
|
||||
typedef NCollection_List<TopTools_IndexedDataMapOfShapeListOfShape>::Iterator TNaming_ListIteratorOfListOfIndexedDataMapOfShapeListOfShape;
|
||||
|
||||
|
||||
#endif
|
||||
27
src/TNaming/TNaming_ListOfMapOfShape.hxx
Normal file
27
src/TNaming/TNaming_ListOfMapOfShape.hxx
Normal file
@@ -0,0 +1,27 @@
|
||||
// Created on: 1997-03-17
|
||||
// Created by: Yves FRICAUD
|
||||
// Copyright (c) 1997-1999 Matra Datavision
|
||||
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
||||
//
|
||||
// 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 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.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifndef TNaming_ListOfMapOfShape_HeaderFile
|
||||
#define TNaming_ListOfMapOfShape_HeaderFile
|
||||
|
||||
#include <TopTools_MapOfShape.hxx>
|
||||
#include <NCollection_List.hxx>
|
||||
|
||||
typedef NCollection_List<TopTools_MapOfShape> TNaming_ListOfMapOfShape;
|
||||
typedef NCollection_List<TopTools_MapOfShape>::Iterator TNaming_ListIteratorOfListOfMapOfShape;
|
||||
|
||||
|
||||
#endif
|
||||
27
src/TNaming/TNaming_ListOfNamedShape.hxx
Normal file
27
src/TNaming/TNaming_ListOfNamedShape.hxx
Normal file
@@ -0,0 +1,27 @@
|
||||
// Created on: 1997-03-17
|
||||
// Created by: Yves FRICAUD
|
||||
// Copyright (c) 1997-1999 Matra Datavision
|
||||
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
||||
//
|
||||
// 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 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.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifndef TNaming_ListOfNamedShape_HeaderFile
|
||||
#define TNaming_ListOfNamedShape_HeaderFile
|
||||
|
||||
#include <TNaming_NamedShape.hxx>
|
||||
#include <NCollection_List.hxx>
|
||||
|
||||
typedef NCollection_List<Handle(TNaming_NamedShape)> TNaming_ListOfNamedShape;
|
||||
typedef NCollection_List<Handle(TNaming_NamedShape)>::Iterator TNaming_ListIteratorOfListOfNamedShape;
|
||||
|
||||
|
||||
#endif
|
||||
8
src/TNaming/TNaming_MapIteratorOfMapOfNamedShape.hxx
Normal file
8
src/TNaming/TNaming_MapIteratorOfMapOfNamedShape.hxx
Normal file
@@ -0,0 +1,8 @@
|
||||
|
||||
|
||||
#ifndef TNaming_MapIteratorOfMapOfNamedShape_HeaderFile
|
||||
#define TNaming_MapIteratorOfMapOfNamedShape_HeaderFile
|
||||
|
||||
#include <TNaming_MapOfNamedShape.hxx>
|
||||
|
||||
#endif
|
||||
28
src/TNaming/TNaming_MapOfNamedShape.hxx
Normal file
28
src/TNaming/TNaming_MapOfNamedShape.hxx
Normal file
@@ -0,0 +1,28 @@
|
||||
// Created on: 1997-03-17
|
||||
// Created by: Yves FRICAUD
|
||||
// Copyright (c) 1997-1999 Matra Datavision
|
||||
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
||||
//
|
||||
// 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 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.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifndef TNaming_MapOfNamedShape_HeaderFile
|
||||
#define TNaming_MapOfNamedShape_HeaderFile
|
||||
|
||||
#include <TNaming_NamedShape.hxx>
|
||||
#include <TNaming_NamedShapeHasher.hxx>
|
||||
#include <NCollection_Map.hxx>
|
||||
|
||||
typedef NCollection_Map<Handle(TNaming_NamedShape),TNaming_NamedShapeHasher> TNaming_MapOfNamedShape;
|
||||
typedef NCollection_Map<Handle(TNaming_NamedShape),TNaming_NamedShapeHasher>::Iterator TNaming_MapIteratorOfMapOfNamedShape;
|
||||
|
||||
|
||||
#endif
|
||||
26
src/TNaming/TNaming_NamedShapeHasher.hxx
Normal file
26
src/TNaming/TNaming_NamedShapeHasher.hxx
Normal file
@@ -0,0 +1,26 @@
|
||||
// Created on: 1997-03-17
|
||||
// Created by: Yves FRICAUD
|
||||
// Copyright (c) 1997-1999 Matra Datavision
|
||||
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
||||
//
|
||||
// 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 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.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifndef TNaming_NamedShapeHasher_HeaderFile
|
||||
#define TNaming_NamedShapeHasher_HeaderFile
|
||||
|
||||
#include <TNaming_NamedShape.hxx>
|
||||
#include <NCollection_DefaultHasher.hxx>
|
||||
|
||||
typedef NCollection_DefaultHasher<Handle(TNaming_NamedShape)> TNaming_NamedShapeHasher;
|
||||
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user