mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-19 13:40: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
@@ -413,29 +413,32 @@ is
|
||||
---Category: The Collections
|
||||
|
||||
|
||||
class ListOfInteractive instantiates List from TCollection
|
||||
(InteractiveObject from AIS);
|
||||
imported ListOfInteractive;
|
||||
|
||||
class SequenceOfInteractive instantiates Sequence from TCollection
|
||||
(InteractiveObject from AIS);
|
||||
|
||||
imported ListIteratorOfListOfInteractive;
|
||||
|
||||
imported SequenceOfInteractive;
|
||||
|
||||
class SequenceOfDimension instantiates Sequence from TCollection
|
||||
(Relation from AIS);
|
||||
imported SequenceOfDimension;
|
||||
|
||||
class MapOfInteractive instantiates Map from TCollection
|
||||
(InteractiveObject from AIS,MapTransientHasher from TColStd);
|
||||
imported MapOfInteractive;
|
||||
|
||||
imported MapIteratorOfMapOfInteractive;
|
||||
|
||||
|
||||
class DataMapofIntegerListOfinteractive instantiates DataMap from
|
||||
TCollection(Integer from Standard, ListOfInteractive from AIS,MapIntegerHasher from TColStd);
|
||||
imported DataMapofIntegerListOfinteractive;
|
||||
|
||||
|
||||
imported DataMapIteratorOfDataMapofIntegerListOfinteractive;
|
||||
-- for further management of layers
|
||||
|
||||
private class DataMapOfIOStatus instantiates DataMap from
|
||||
TCollection(InteractiveObject from AIS,GlobalStatus from AIS,MapTransientHasher from TColStd);
|
||||
imported DataMapOfIOStatus;
|
||||
|
||||
imported DataMapIteratorOfDataMapOfIOStatus;
|
||||
-- Management of interactiveObjects Status...
|
||||
|
||||
class IndexedDataMapOfOwnerPrs instantiates IndexedDataMap from TCollection
|
||||
(EntityOwner from SelectMgr,Presentation from Prs3d ,MapTransientHasher from TColStd);
|
||||
imported IndexedDataMapOfOwnerPrs;
|
||||
-- for dynamic selection management in local context...
|
||||
|
||||
-- san: 18/04/2003 AIS_Selection class optimization
|
||||
@@ -445,11 +448,13 @@ is
|
||||
imported NDataMapOfTransientIteratorOfListTransient;
|
||||
-- service map for AIS_Selection class optimized logic
|
||||
|
||||
private class DataMapOfILC instantiates DataMap from TCollection
|
||||
(Integer from Standard, LocalContext from AIS, MapIntegerHasher from TColStd);
|
||||
imported DataMapOfILC;
|
||||
|
||||
private class DataMapOfSelStat instantiates DataMap from TCollection
|
||||
(SelectableObject from SelectMgr,LocalStatus from AIS,MapTransientHasher from TColStd);
|
||||
imported DataMapIteratorOfDataMapOfILC;
|
||||
|
||||
imported DataMapOfSelStat;
|
||||
|
||||
imported DataMapIteratorOfDataMapOfSelStat;
|
||||
-- to tell if an object is sensitive to Standard Modes Of Selection....
|
||||
|
||||
-- Methods for dimensions
|
||||
|
||||
8
src/AIS/AIS_DataMapIteratorOfDataMapOfILC.hxx
Normal file
8
src/AIS/AIS_DataMapIteratorOfDataMapOfILC.hxx
Normal file
@@ -0,0 +1,8 @@
|
||||
|
||||
|
||||
#ifndef AIS_DataMapIteratorOfDataMapOfILC_HeaderFile
|
||||
#define AIS_DataMapIteratorOfDataMapOfILC_HeaderFile
|
||||
|
||||
#include <AIS_DataMapOfILC.hxx>
|
||||
|
||||
#endif
|
||||
8
src/AIS/AIS_DataMapIteratorOfDataMapOfIOStatus.hxx
Normal file
8
src/AIS/AIS_DataMapIteratorOfDataMapOfIOStatus.hxx
Normal file
@@ -0,0 +1,8 @@
|
||||
|
||||
|
||||
#ifndef AIS_DataMapIteratorOfDataMapOfIOStatus_HeaderFile
|
||||
#define AIS_DataMapIteratorOfDataMapOfIOStatus_HeaderFile
|
||||
|
||||
#include <AIS_DataMapOfIOStatus.hxx>
|
||||
|
||||
#endif
|
||||
8
src/AIS/AIS_DataMapIteratorOfDataMapOfSelStat.hxx
Normal file
8
src/AIS/AIS_DataMapIteratorOfDataMapOfSelStat.hxx
Normal file
@@ -0,0 +1,8 @@
|
||||
|
||||
|
||||
#ifndef AIS_DataMapIteratorOfDataMapOfSelStat_HeaderFile
|
||||
#define AIS_DataMapIteratorOfDataMapOfSelStat_HeaderFile
|
||||
|
||||
#include <AIS_DataMapOfSelStat.hxx>
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,8 @@
|
||||
|
||||
|
||||
#ifndef AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive_HeaderFile
|
||||
#define AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive_HeaderFile
|
||||
|
||||
#include <AIS_DataMapofIntegerListOfinteractive.hxx>
|
||||
|
||||
#endif
|
||||
29
src/AIS/AIS_DataMapOfILC.hxx
Normal file
29
src/AIS/AIS_DataMapOfILC.hxx
Normal file
@@ -0,0 +1,29 @@
|
||||
// Created on: 1996-12-11
|
||||
// Created by: Robert COUBLANC
|
||||
// Copyright (c) 1996-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 AIS_DataMapOfILC_HeaderFile
|
||||
#define AIS_DataMapOfILC_HeaderFile
|
||||
|
||||
#include <Standard_Integer.hxx>
|
||||
#include <AIS_LocalContext.hxx>
|
||||
#include <TColStd_MapIntegerHasher.hxx>
|
||||
#include <NCollection_DataMap.hxx>
|
||||
|
||||
typedef NCollection_DataMap<Standard_Integer,Handle(AIS_LocalContext),TColStd_MapIntegerHasher> AIS_DataMapOfILC;
|
||||
typedef NCollection_DataMap<Standard_Integer,Handle(AIS_LocalContext),TColStd_MapIntegerHasher>::Iterator AIS_DataMapIteratorOfDataMapOfILC;
|
||||
|
||||
|
||||
#endif
|
||||
29
src/AIS/AIS_DataMapOfIOStatus.hxx
Normal file
29
src/AIS/AIS_DataMapOfIOStatus.hxx
Normal file
@@ -0,0 +1,29 @@
|
||||
// Created on: 1996-12-11
|
||||
// Created by: Robert COUBLANC
|
||||
// Copyright (c) 1996-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 AIS_DataMapOfIOStatus_HeaderFile
|
||||
#define AIS_DataMapOfIOStatus_HeaderFile
|
||||
|
||||
#include <AIS_InteractiveObject.hxx>
|
||||
#include <AIS_GlobalStatus.hxx>
|
||||
#include <TColStd_MapTransientHasher.hxx>
|
||||
#include <NCollection_DataMap.hxx>
|
||||
|
||||
typedef NCollection_DataMap<Handle(AIS_InteractiveObject),Handle(AIS_GlobalStatus),TColStd_MapTransientHasher> AIS_DataMapOfIOStatus;
|
||||
typedef NCollection_DataMap<Handle(AIS_InteractiveObject),Handle(AIS_GlobalStatus),TColStd_MapTransientHasher>::Iterator AIS_DataMapIteratorOfDataMapOfIOStatus;
|
||||
|
||||
|
||||
#endif
|
||||
29
src/AIS/AIS_DataMapOfSelStat.hxx
Normal file
29
src/AIS/AIS_DataMapOfSelStat.hxx
Normal file
@@ -0,0 +1,29 @@
|
||||
// Created on: 1996-12-11
|
||||
// Created by: Robert COUBLANC
|
||||
// Copyright (c) 1996-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 AIS_DataMapOfSelStat_HeaderFile
|
||||
#define AIS_DataMapOfSelStat_HeaderFile
|
||||
|
||||
#include <SelectMgr_SelectableObject.hxx>
|
||||
#include <AIS_LocalStatus.hxx>
|
||||
#include <TColStd_MapTransientHasher.hxx>
|
||||
#include <NCollection_DataMap.hxx>
|
||||
|
||||
typedef NCollection_DataMap<Handle(SelectMgr_SelectableObject),Handle(AIS_LocalStatus),TColStd_MapTransientHasher> AIS_DataMapOfSelStat;
|
||||
typedef NCollection_DataMap<Handle(SelectMgr_SelectableObject),Handle(AIS_LocalStatus),TColStd_MapTransientHasher>::Iterator AIS_DataMapIteratorOfDataMapOfSelStat;
|
||||
|
||||
|
||||
#endif
|
||||
29
src/AIS/AIS_DataMapofIntegerListOfinteractive.hxx
Normal file
29
src/AIS/AIS_DataMapofIntegerListOfinteractive.hxx
Normal file
@@ -0,0 +1,29 @@
|
||||
// Created on: 1996-12-11
|
||||
// Created by: Robert COUBLANC
|
||||
// Copyright (c) 1996-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 AIS_DataMapofIntegerListOfinteractive_HeaderFile
|
||||
#define AIS_DataMapofIntegerListOfinteractive_HeaderFile
|
||||
|
||||
#include <Standard_Integer.hxx>
|
||||
#include <AIS_ListOfInteractive.hxx>
|
||||
#include <TColStd_MapIntegerHasher.hxx>
|
||||
#include <NCollection_DataMap.hxx>
|
||||
|
||||
typedef NCollection_DataMap<Standard_Integer,AIS_ListOfInteractive,TColStd_MapIntegerHasher> AIS_DataMapofIntegerListOfinteractive;
|
||||
typedef NCollection_DataMap<Standard_Integer,AIS_ListOfInteractive,TColStd_MapIntegerHasher>::Iterator AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive;
|
||||
|
||||
|
||||
#endif
|
||||
28
src/AIS/AIS_IndexedDataMapOfOwnerPrs.hxx
Normal file
28
src/AIS/AIS_IndexedDataMapOfOwnerPrs.hxx
Normal file
@@ -0,0 +1,28 @@
|
||||
// Created on: 1996-12-11
|
||||
// Created by: Robert COUBLANC
|
||||
// Copyright (c) 1996-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 AIS_IndexedDataMapOfOwnerPrs_HeaderFile
|
||||
#define AIS_IndexedDataMapOfOwnerPrs_HeaderFile
|
||||
|
||||
#include <SelectMgr_EntityOwner.hxx>
|
||||
#include <Prs3d_Presentation.hxx>
|
||||
#include <TColStd_MapTransientHasher.hxx>
|
||||
#include <NCollection_IndexedDataMap.hxx>
|
||||
|
||||
typedef NCollection_IndexedDataMap<Handle(SelectMgr_EntityOwner),Handle(Prs3d_Presentation),TColStd_MapTransientHasher> AIS_IndexedDataMapOfOwnerPrs;
|
||||
|
||||
|
||||
#endif
|
||||
8
src/AIS/AIS_ListIteratorOfListOfInteractive.hxx
Normal file
8
src/AIS/AIS_ListIteratorOfListOfInteractive.hxx
Normal file
@@ -0,0 +1,8 @@
|
||||
|
||||
|
||||
#ifndef AIS_ListIteratorOfListOfInteractive_HeaderFile
|
||||
#define AIS_ListIteratorOfListOfInteractive_HeaderFile
|
||||
|
||||
#include <AIS_ListOfInteractive.hxx>
|
||||
|
||||
#endif
|
||||
27
src/AIS/AIS_ListOfInteractive.hxx
Normal file
27
src/AIS/AIS_ListOfInteractive.hxx
Normal file
@@ -0,0 +1,27 @@
|
||||
// Created on: 1996-12-11
|
||||
// Created by: Robert COUBLANC
|
||||
// Copyright (c) 1996-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 AIS_ListOfInteractive_HeaderFile
|
||||
#define AIS_ListOfInteractive_HeaderFile
|
||||
|
||||
#include <AIS_InteractiveObject.hxx>
|
||||
#include <NCollection_List.hxx>
|
||||
|
||||
typedef NCollection_List<Handle(AIS_InteractiveObject)> AIS_ListOfInteractive;
|
||||
typedef NCollection_List<Handle(AIS_InteractiveObject)>::Iterator AIS_ListIteratorOfListOfInteractive;
|
||||
|
||||
|
||||
#endif
|
||||
8
src/AIS/AIS_MapIteratorOfMapOfInteractive.hxx
Normal file
8
src/AIS/AIS_MapIteratorOfMapOfInteractive.hxx
Normal file
@@ -0,0 +1,8 @@
|
||||
|
||||
|
||||
#ifndef AIS_MapIteratorOfMapOfInteractive_HeaderFile
|
||||
#define AIS_MapIteratorOfMapOfInteractive_HeaderFile
|
||||
|
||||
#include <AIS_MapOfInteractive.hxx>
|
||||
|
||||
#endif
|
||||
28
src/AIS/AIS_MapOfInteractive.hxx
Normal file
28
src/AIS/AIS_MapOfInteractive.hxx
Normal file
@@ -0,0 +1,28 @@
|
||||
// Created on: 1996-12-11
|
||||
// Created by: Robert COUBLANC
|
||||
// Copyright (c) 1996-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 AIS_MapOfInteractive_HeaderFile
|
||||
#define AIS_MapOfInteractive_HeaderFile
|
||||
|
||||
#include <AIS_InteractiveObject.hxx>
|
||||
#include <TColStd_MapTransientHasher.hxx>
|
||||
#include <NCollection_Map.hxx>
|
||||
|
||||
typedef NCollection_Map<Handle(AIS_InteractiveObject),TColStd_MapTransientHasher> AIS_MapOfInteractive;
|
||||
typedef NCollection_Map<Handle(AIS_InteractiveObject),TColStd_MapTransientHasher>::Iterator AIS_MapIteratorOfMapOfInteractive;
|
||||
|
||||
|
||||
#endif
|
||||
26
src/AIS/AIS_SequenceOfDimension.hxx
Normal file
26
src/AIS/AIS_SequenceOfDimension.hxx
Normal file
@@ -0,0 +1,26 @@
|
||||
// Created on: 1996-12-11
|
||||
// Created by: Robert COUBLANC
|
||||
// Copyright (c) 1996-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 AIS_SequenceOfDimension_HeaderFile
|
||||
#define AIS_SequenceOfDimension_HeaderFile
|
||||
|
||||
#include <AIS_Relation.hxx>
|
||||
#include <NCollection_Sequence.hxx>
|
||||
|
||||
typedef NCollection_Sequence<Handle(AIS_Relation)> AIS_SequenceOfDimension;
|
||||
|
||||
|
||||
#endif
|
||||
26
src/AIS/AIS_SequenceOfInteractive.hxx
Normal file
26
src/AIS/AIS_SequenceOfInteractive.hxx
Normal file
@@ -0,0 +1,26 @@
|
||||
// Created on: 1996-12-11
|
||||
// Created by: Robert COUBLANC
|
||||
// Copyright (c) 1996-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 AIS_SequenceOfInteractive_HeaderFile
|
||||
#define AIS_SequenceOfInteractive_HeaderFile
|
||||
|
||||
#include <AIS_InteractiveObject.hxx>
|
||||
#include <NCollection_Sequence.hxx>
|
||||
|
||||
typedef NCollection_Sequence<Handle(AIS_InteractiveObject)> AIS_SequenceOfInteractive;
|
||||
|
||||
|
||||
#endif
|
||||
@@ -25,3 +25,18 @@ AIS_PointCloud.hxx
|
||||
AIS_PointCloud.cxx
|
||||
AIS_TextLabel.hxx
|
||||
AIS_TextLabel.cxx
|
||||
AIS_ListOfInteractive.hxx
|
||||
AIS_ListIteratorOfListOfInteractive.hxx
|
||||
AIS_SequenceOfInteractive.hxx
|
||||
AIS_SequenceOfDimension.hxx
|
||||
AIS_MapOfInteractive.hxx
|
||||
AIS_MapIteratorOfMapOfInteractive.hxx
|
||||
AIS_DataMapofIntegerListOfinteractive.hxx
|
||||
AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive.hxx
|
||||
AIS_DataMapOfIOStatus.hxx
|
||||
AIS_DataMapIteratorOfDataMapOfIOStatus.hxx
|
||||
AIS_IndexedDataMapOfOwnerPrs.hxx
|
||||
AIS_DataMapOfILC.hxx
|
||||
AIS_DataMapIteratorOfDataMapOfILC.hxx
|
||||
AIS_DataMapOfSelStat.hxx
|
||||
AIS_DataMapIteratorOfDataMapOfSelStat.hxx
|
||||
|
||||
Reference in New Issue
Block a user