0032230: Coding Rules - remove class headers Graphic3d_HighlightStyle.hxx deprecated...

Removed unused Graphic3d_HighlightStyle, Graphic3d_CTexture, Graphic3d_MapOfZLayerSettings,
Graphic3d_TypeOfComposition, Graphic3d_TypeOfComposition, V3d_Parameter, V3d_ViewPointer, SelectMgr_SequenceOfFilter.

Added missing deprecation statements to SelectBasics_SensitiveEntity, SelectMgr_EntityOwner and PrsMgr_Presentation3d.

diff --git a/src/Graphic3d/FILES b/src/Graphic3d/FILES
index 3102afae0eae63ea49af3e6f9563b98c6c316c8d..10358b343566413ad51f93c134c9ec19a2cfcbff 100755 (executable)
--- a/src/Graphic3d/FILES
+++ b/src/Graphic3d/FILES
@@ -48,7 +48,6 @@ Graphic3d_ClipPlane.cxx
 Graphic3d_ClipPlane.hxx
 Graphic3d_CStructure.cxx
 Graphic3d_CStructure.hxx
-Graphic3d_CTexture.hxx
 Graphic3d_CubeMap.cxx
 Graphic3d_CubeMap.hxx
 Graphic3d_CubeMapOrder.cxx
@@ -82,7 +81,6 @@ Graphic3d_GroupAspect.hxx
 Graphic3d_GroupDefinitionError.hxx
 Graphic3d_HatchStyle.hxx
 Graphic3d_HatchStyle.cxx
-Graphic3d_HighlightStyle.hxx
 Graphic3d_PresentationAttributes.hxx
 Graphic3d_PresentationAttributes.cxx
 Graphic3d_HorizontalTextAlignment.hxx
@@ -95,7 +93,6 @@ Graphic3d_MapOfAspectsToAspects.hxx
 Graphic3d_MapIteratorOfMapOfStructure.hxx
 Graphic3d_MapOfObject.hxx
 Graphic3d_MapOfStructure.hxx
-Graphic3d_MapOfZLayerSettings.hxx
 Graphic3d_MarkerImage.cxx
 Graphic3d_MarkerImage.hxx
 Graphic3d_MarkerImage.pxx
@@ -174,7 +171,6 @@ Graphic3d_TextureSet.cxx
 Graphic3d_TextureSet.hxx
 Graphic3d_TextureSetBits.hxx
 Graphic3d_ToneMappingMethod.hxx
-Graphic3d_TransformError.hxx
 Graphic3d_TransformPers.hxx
 Graphic3d_TransformPers.cxx
 Graphic3d_TransformUtils.hxx
@@ -182,7 +178,6 @@ Graphic3d_TransModeFlags.hxx
 Graphic3d_TypeOfAnswer.hxx
 Graphic3d_TypeOfBackfacingModel.hxx
 Graphic3d_TypeOfBackground.hxx
-Graphic3d_TypeOfComposition.hxx
 Graphic3d_TypeOfConnection.hxx
 Graphic3d_TypeOfLightSource.hxx
 Graphic3d_TypeOfLimit.hxx

diff --git a/src/Graphic3d/Graphic3d_CStructure.hxx b/src/Graphic3d/Graphic3d_CStructure.hxx
index 6ce259927722ecfc2c7c12696ef3a313a59fae24..3cbd249a66727cb52da8797a2d3680937b85193d 100644 (file)
--- a/src/Graphic3d/Graphic3d_CStructure.hxx
+++ b/src/Graphic3d/Graphic3d_CStructure.hxx
@@ -20,7 +20,6 @@
 #include <Graphic3d_PresentationAttributes.hxx>
 #include <Graphic3d_SequenceOfGroup.hxx>
 #include <Graphic3d_SequenceOfHClipPlane.hxx>
-#include <Graphic3d_TypeOfComposition.hxx>
 #include <Graphic3d_ViewAffinity.hxx>
 #include <Graphic3d_TransformPers.hxx>
 #include <Graphic3d_Vec3.hxx>

diff --git a/src/Graphic3d/Graphic3d_CTexture.hxx b/src/Graphic3d/Graphic3d_CTexture.hxx
deleted file mode 100644 (file)
index edea7f6..0000000
--- a/src/Graphic3d/Graphic3d_CTexture.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-// 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 _Graphic3d_CTexture_HeaderFile
-#define _Graphic3d_CTexture_HeaderFile
-
-#include <Graphic3d_TextureMap.hxx>
-
-class Graphic3d_CTexture
-{
-
-public:
-
-  Graphic3d_CTexture()
-  : doTextureMap (0)
-  {
-    //
-  }
-
-public:
-
-  Handle(Graphic3d_TextureMap) TextureMap;   //!< handle to texture
-  int                          doTextureMap; //!< flag indicates to use texture or not
-
-};
-
-#endif // Graphic3d_CTexture_HeaderFile

diff --git a/src/Graphic3d/Graphic3d_GraphicDriver.hxx b/src/Graphic3d/Graphic3d_GraphicDriver.hxx
index ca6fbfb4bd51ce47016af1e52e7c7da0fc42ac80..2d3aa21bdeebb6e32d37798d1b20e4ac59eead24 100644 (file)
--- a/src/Graphic3d/Graphic3d_GraphicDriver.hxx
+++ b/src/Graphic3d/Graphic3d_GraphicDriver.hxx
@@ -17,47 +17,21 @@
 #ifndef _Graphic3d_GraphicDriver_HeaderFile
 #define _Graphic3d_GraphicDriver_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Transient.hxx>
-#include <Graphic3d_CView.hxx>
-#include <Graphic3d_CStructure.hxx>
-#include <Aspect_GradientFillMethod.hxx>
-#include <Standard_CString.hxx>
-#include <Aspect_FillMethod.hxx>
-#include <Standard_Size.hxx>
-#include <Quantity_NameOfColor.hxx>
-#include <Standard_Real.hxx>
-#include <Aspect_TypeOfTriedronPosition.hxx>
-#include <Graphic3d_GraduatedTrihedron.hxx>
-#include <Graphic3d_Vec3.hxx>
-#include <Standard_ShortReal.hxx>
-#include <Standard_Address.hxx>
-#include <Image_PixMap.hxx>
-#include <Graphic3d_BufferType.hxx>
 #include <Aspect_GenId.hxx>
-#include <Aspect_Handle.hxx>
+#include <Graphic3d_Vec3.hxx>
+#include <Graphic3d_CStructure.hxx>
 #include <Graphic3d_ZLayerId.hxx>
 #include <Graphic3d_ZLayerSettings.hxx>
-#include <Graphic3d_MapOfZLayerSettings.hxx>
-#include <Graphic3d_CLight.hxx>
 #include <Graphic3d_TypeOfLimit.hxx>
-#include <TColStd_Array2OfReal.hxx>
-#include <TColStd_MapOfInteger.hxx>
+#include <Standard_CString.hxx>
+#include <Standard_Size.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 
 class Aspect_DisplayConnection;
+class Aspect_Window;
 class Graphic3d_CView;
-class Graphic3d_GraphicDriver;
 class Graphic3d_Layer;
-class Graphic3d_TransformError;
-class Graphic3d_Structure;
 class Graphic3d_StructureManager;
-class Graphic3d_ViewManager;
-class Quantity_Color;
 class TCollection_AsciiString;
 
 DEFINE_STANDARD_HANDLE(Graphic3d_GraphicDriver, Standard_Transient)

diff --git a/src/Graphic3d/Graphic3d_Group.hxx b/src/Graphic3d/Graphic3d_Group.hxx
index a49c6d4d187b3503f284e8265746c4d2bd4a36a9..e13fc5b674dfacb35423e4f570a9fe4570fec642 100644 (file)
--- a/src/Graphic3d/Graphic3d_Group.hxx
+++ b/src/Graphic3d/Graphic3d_Group.hxx
@@ -125,9 +125,6 @@ public:
   //! Adds an array of primitives for display
   Standard_EXPORT void AddPrimitiveArray (const Handle(Graphic3d_ArrayOfPrimitives)& thePrim, const Standard_Boolean theToEvalMinMax = Standard_True);
 
-  //! Creates a primitive array with single marker using AddPrimitiveArray().
-  Standard_EXPORT void Marker (const Graphic3d_Vertex& thePoint, const Standard_Boolean theToEvalMinMax = Standard_True);
-
 public:
 
   //! sets the stencil test to theIsEnabled state;
@@ -173,6 +170,9 @@ public:
 //! @name obsolete methods
 public:
 
+  Standard_DEPRECATED("Deprecated method Marker(), pass Graphic3d_ArrayOfPoints to AddPrimitiveArray() instead")
+  Standard_EXPORT void Marker (const Graphic3d_Vertex& thePoint, const Standard_Boolean theToEvalMinMax = Standard_True);
+
   //! Creates the string <AText> at position <APoint>.
   //! The 3D point of attachment is projected. The text is
   //! written in the plane of projection.

diff --git a/src/Graphic3d/Graphic3d_HighlightStyle.hxx b/src/Graphic3d/Graphic3d_HighlightStyle.hxx
deleted file mode 100644 (file)
index e3329a2..0000000
--- a/src/Graphic3d/Graphic3d_HighlightStyle.hxx
+++ /dev/null
@@ -1,22 +0,0 @@
-// Created on: 2016-08-24
-// Created by: Varvara POSKONINA
-// Copyright (c) 2016 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 _Graphic3d_HighlightStyle_HeaderFile
-#define _Graphic3d_HighlightStyle_HeaderFile
-
-// header file for deprecated type Graphic3d_HighlightStyle
-#include <Prs3d_Drawer.hxx>
-
-#endif // _Graphic3d_HighlightStyle_HeaderFile

diff --git a/src/Graphic3d/Graphic3d_MapOfZLayerSettings.hxx b/src/Graphic3d/Graphic3d_MapOfZLayerSettings.hxx
deleted file mode 100644 (file)
index 944d14a..0000000
--- a/src/Graphic3d/Graphic3d_MapOfZLayerSettings.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2019 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 _Vulkan_MapOfZLayerSettings_HeaderFile
-#define _Vulkan_MapOfZLayerSettings_HeaderFile
-
-#include <Standard_TypeDef.hxx>
-#include <NCollection_Map.hxx>
-#include <Graphic3d_ZLayerId.hxx>
-#include <Graphic3d_ZLayerSettings.hxx>
-
-typedef NCollection_DataMap<Graphic3d_ZLayerId, Graphic3d_ZLayerSettings> Graphic3d_MapOfZLayerSettings;
-
-#endif // _Vulkan_MapOfZLayerSettings_HeaderFile

diff --git a/src/Graphic3d/Graphic3d_Structure.cxx b/src/Graphic3d/Graphic3d_Structure.cxx
index 3aa4780fdb3630b27c926008207dc792a76bf2c8..a3f1e4e4d4f5719182680758d3e79604430573bb 100644 (file)
--- a/src/Graphic3d/Graphic3d_Structure.cxx
+++ b/src/Graphic3d/Graphic3d_Structure.cxx
@@ -25,7 +25,6 @@
 #include <Graphic3d_PriorityDefinitionError.hxx>
 #include <Graphic3d_StructureDefinitionError.hxx>
 #include <Graphic3d_StructureManager.hxx>
-#include <Graphic3d_TransformError.hxx>
 #include <Quantity_Color.hxx>
 
 #include "Graphic3d_Structure.pxx"

diff --git a/src/Graphic3d/Graphic3d_Structure.hxx b/src/Graphic3d/Graphic3d_Structure.hxx
index eccb2309d47fe0f12b13aedeb9d464893fea79db..148bb21d69dc1799575dee55e4cbbf69e1671062 100644 (file)
--- a/src/Graphic3d/Graphic3d_Structure.hxx
+++ b/src/Graphic3d/Graphic3d_Structure.hxx
@@ -23,12 +23,10 @@
 #include <Graphic3d_MapOfStructure.hxx>
 #include <Graphic3d_SequenceOfGroup.hxx>
 #include <Graphic3d_SequenceOfHClipPlane.hxx>
-#include <Graphic3d_TypeOfComposition.hxx>
 #include <Graphic3d_TypeOfConnection.hxx>
 #include <Graphic3d_TypeOfStructure.hxx>
 #include <Graphic3d_TransformPers.hxx>
 #include <Graphic3d_TransModeFlags.hxx>
-#include <Graphic3d_Vertex.hxx>
 #include <Graphic3d_ZLayerId.hxx>
 #include <NCollection_IndexedMap.hxx>
 

diff --git a/src/Graphic3d/Graphic3d_Text.hxx b/src/Graphic3d/Graphic3d_Text.hxx
index 76e2dd47b7e4070d0561cc23b2d699b36b90c2e9..9d312cb132a22392ee25a843d1878a0424ff9ffa 100644 (file)
--- a/src/Graphic3d/Graphic3d_Text.hxx
+++ b/src/Graphic3d/Graphic3d_Text.hxx
@@ -16,7 +16,6 @@
 
 #include <gp_Ax2.hxx>
 
-#include <Graphic3d_Vertex.hxx>
 #include <Font_TextFormatter.hxx>
 #include <Graphic3d_HorizontalTextAlignment.hxx>
 #include <Graphic3d_VerticalTextAlignment.hxx>

diff --git a/src/Graphic3d/Graphic3d_TransformError.hxx b/src/Graphic3d/Graphic3d_TransformError.hxx
deleted file mode 100644 (file)
index cb32af6..0000000
--- a/src/Graphic3d/Graphic3d_TransformError.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-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 _Graphic3d_TransformError_HeaderFile
-#define _Graphic3d_TransformError_HeaderFile
-
-#include <Standard_Type.hxx>
-#include <Standard_DefineException.hxx>
-#include <Standard_SStream.hxx>
-#include <Standard_OutOfRange.hxx>
-
-class Graphic3d_TransformError;
-DEFINE_STANDARD_HANDLE(Graphic3d_TransformError, Standard_OutOfRange)
-
-#if !defined No_Exception && !defined No_Graphic3d_TransformError
-  #define Graphic3d_TransformError_Raise_if(CONDITION, MESSAGE) \
-  if (CONDITION) throw Graphic3d_TransformError(MESSAGE);
-#else
-  #define Graphic3d_TransformError_Raise_if(CONDITION, MESSAGE)
-#endif
-
-DEFINE_STANDARD_EXCEPTION(Graphic3d_TransformError, Standard_OutOfRange)
-
-#endif // _Graphic3d_TransformError_HeaderFile

diff --git a/src/Graphic3d/Graphic3d_TypeOfComposition.hxx b/src/Graphic3d/Graphic3d_TypeOfComposition.hxx
deleted file mode 100644 (file)
index 3ccc97c..0000000
--- a/src/Graphic3d/Graphic3d_TypeOfComposition.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-// Created on: 1993-03-31
-// Created by: NW,JPB,CAL
-// Copyright (c) 1993-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 _Graphic3d_TypeOfComposition_HeaderFile
-#define _Graphic3d_TypeOfComposition_HeaderFile
-
-//! To manage the transformation matrices of structures.
-enum Graphic3d_TypeOfComposition
-{
-Graphic3d_TOC_REPLACE,
-Graphic3d_TOC_POSTCONCATENATE
-};
-
-#endif // _Graphic3d_TypeOfComposition_HeaderFile

diff --git a/src/MeshVS/MeshVS_TextPrsBuilder.cxx b/src/MeshVS/MeshVS_TextPrsBuilder.cxx
index 02213e1cfffb83cd958fa63775fd9d87f25235f2..ed7dcebdf374c640e406c37c9231f8f32a129bef 100644 (file)
--- a/src/MeshVS/MeshVS_TextPrsBuilder.cxx
+++ b/src/MeshVS/MeshVS_TextPrsBuilder.cxx
@@ -20,7 +20,6 @@
 #include <Graphic3d_AspectText3d.hxx>
 #include <Graphic3d_Text.hxx>
 #include <Graphic3d_Group.hxx>
-#include <Graphic3d_Vertex.hxx>
 #include <MeshVS_Buffer.hxx>
 #include <MeshVS_DataSource.hxx>
 #include <MeshVS_DisplayModeFlags.hxx>

diff --git a/src/OpenGl/OpenGl_Text.hxx b/src/OpenGl/OpenGl_Text.hxx
index 5d8ac6f7d5f798e1122d396a79373f35447a97cf..a42a7360587ed864d4da54dfdb7f6af88e214c7f 100755 (executable)
--- a/src/OpenGl/OpenGl_Text.hxx
+++ b/src/OpenGl/OpenGl_Text.hxx
@@ -22,7 +22,6 @@
 #include <OpenGl_TextBuilder.hxx>
 
 #include <TCollection_ExtendedString.hxx>
-#include <Graphic3d_Vertex.hxx>
 #include <Graphic3d_HorizontalTextAlignment.hxx>
 #include <Graphic3d_RenderingParams.hxx>
 #include <Graphic3d_Text.hxx>

diff --git a/src/Prs3d/Prs3d_Point.hxx b/src/Prs3d/Prs3d_Point.hxx
index 1c5ce9ea9ebfc83b305c52d89089e8acc9098f05..c324f27f0cc892111e8fefcb901888d38648d5b0 100755 (executable)
--- a/src/Prs3d/Prs3d_Point.hxx
+++ b/src/Prs3d/Prs3d_Point.hxx
@@ -15,7 +15,6 @@
 #define _Prs3d_Point_H__
 
 #include <Graphic3d_ArrayOfPoints.hxx>
-#include <Graphic3d_Vertex.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_PointAspect.hxx>

diff --git a/src/Prs3d/Prs3d_Text.cxx b/src/Prs3d/Prs3d_Text.cxx
index 35b9d3531a708a6e4567c6b4b1a257e0c94ed54b..2fa7ccf1067dfc315a480ad4d41c97da7622e91f 100644 (file)
--- a/src/Prs3d/Prs3d_Text.cxx
+++ b/src/Prs3d/Prs3d_Text.cxx
@@ -19,7 +19,6 @@
 #include <gp_Pnt.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Graphic3d_Text.hxx>
-#include <Graphic3d_Vertex.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_TextAspect.hxx>
 #include <TCollection_AsciiString.hxx>

diff --git a/src/PrsMgr/PrsMgr_Presentation3d.hxx b/src/PrsMgr/PrsMgr_Presentation3d.hxx
index aee9032b019cc4ed7313a92b08bf9c34f9472fa4..7b82a80a9bf174efbee5eeabd2614317d97bc767 100644 (file)
--- a/src/PrsMgr/PrsMgr_Presentation3d.hxx
+++ b/src/PrsMgr/PrsMgr_Presentation3d.hxx
@@ -19,6 +19,7 @@
 
 #include <PrsMgr_Presentation.hxx>
 
+Standard_DEPRECATED("Deprecated alias to PrsMgr_Presentation3d")
 typedef PrsMgr_Presentation PrsMgr_Presentation3d;
 typedef Handle_PrsMgr_Presentation Handle_PrsMgr_Presentation3d;
 

diff --git a/src/Select3D/Select3D_SensitiveEntity.hxx b/src/Select3D/Select3D_SensitiveEntity.hxx
index f99df8fcdb5db9d08063d0df08d6e7ff39fb6d07..3015a14d5b52e4970a7dd5f5a904201ac78fb554 100644 (file)
--- a/src/Select3D/Select3D_SensitiveEntity.hxx
+++ b/src/Select3D/Select3D_SensitiveEntity.hxx
@@ -24,7 +24,6 @@
 #include <Select3D_BndBox3d.hxx>
 #include <SelectBasics_SelectingVolumeManager.hxx>
 #include <SelectBasics_PickResult.hxx>
-#include <SelectBasics_SensitiveEntity.hxx>
 #include <SelectMgr_SelectingVolumeManager.hxx>
 #include <TopLoc_Location.hxx>
 
@@ -110,7 +109,7 @@ protected:
 
 DEFINE_STANDARD_HANDLE(Select3D_SensitiveEntity, Standard_Transient)
 
-// for porting old code
+Standard_DEPRECATED("Deprecated alias - Select3D_SensitiveEntity should be used instead")
 typedef Select3D_SensitiveEntity SelectBasics_SensitiveEntity;
 
 #endif // _Select3D_SensitiveEntity_HeaderFile

diff --git a/src/Select3D/Select3D_SensitiveWire.cxx b/src/Select3D/Select3D_SensitiveWire.cxx
index 4a1101f532c3e523d95d7e410ac72a2f38ee7a57..ff6479dd72f034ad8f5e67d7c05c625bd0a2aa68 100644 (file)
--- a/src/Select3D/Select3D_SensitiveWire.cxx
+++ b/src/Select3D/Select3D_SensitiveWire.cxx
@@ -118,7 +118,7 @@ Standard_Boolean Select3D_SensitiveWire::overlapsElement (SelectBasics_PickResul
                                                           Standard_Boolean )
 {
   const Standard_Integer aSensitiveIdx = myEntityIndexes.Value (theElemIdx);
-  const Handle(SelectBasics_SensitiveEntity)& aSeg = myEntities.Value (aSensitiveIdx);
+  const Handle(Select3D_SensitiveEntity)& aSeg = myEntities.Value (aSensitiveIdx);
   return aSeg->Matches (theMgr, thePickResult);
 }
 

diff --git a/src/SelectMgr/FILES b/src/SelectMgr/FILES
index 1d0c16f887a3e76ed8bb8a90ce184395ee5f86c4..315af35eef05f3d513e9a8cc0319265dd1cd06af 100755 (executable)
--- a/src/SelectMgr/FILES
+++ b/src/SelectMgr/FILES
@@ -10,7 +10,6 @@ SelectMgr_BVHThreadPool.cxx
 SelectMgr_BVHThreadPool.hxx
 SelectMgr_CompositionFilter.cxx
 SelectMgr_CompositionFilter.hxx
-SelectMgr_CompositionFilter.lxx
 SelectMgr_EntityOwner.cxx
 SelectMgr_EntityOwner.hxx
 SelectMgr_Filter.cxx
@@ -45,7 +44,6 @@ SelectMgr_SensitiveEntity.cxx
 SelectMgr_SensitiveEntity.hxx
 SelectMgr_SensitiveEntitySet.cxx
 SelectMgr_SensitiveEntitySet.hxx
-SelectMgr_SequenceOfFilter.hxx
 SelectMgr_SequenceOfOwner.hxx
 SelectMgr_SequenceOfSelection.hxx
 SelectMgr_SortCriterion.hxx

diff --git a/src/SelectMgr/SelectMgr_CompositionFilter.hxx b/src/SelectMgr/SelectMgr_CompositionFilter.hxx
index d84bdad3a19d73474b9c3358506b6c147e280f37..2ce3a0c1736224ce904f5318197bde22aca4a4ee 100644 (file)
--- a/src/SelectMgr/SelectMgr_CompositionFilter.hxx
+++ b/src/SelectMgr/SelectMgr_CompositionFilter.hxx
@@ -17,17 +17,10 @@
 #ifndef _SelectMgr_CompositionFilter_HeaderFile
 #define _SelectMgr_CompositionFilter_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
 #include <SelectMgr_ListOfFilter.hxx>
 #include <SelectMgr_Filter.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopAbs_ShapeEnum.hxx>
-class SelectMgr_Filter;
-
 
-class SelectMgr_CompositionFilter;
 DEFINE_STANDARD_HANDLE(SelectMgr_CompositionFilter, SelectMgr_Filter)
 
 //! A framework to define a compound filter composed of
@@ -37,51 +30,33 @@ class SelectMgr_CompositionFilter : public SelectMgr_Filter
 
 public:
 
-  
   //! Adds the filter afilter to a filter object created by a
   //! filter class inheriting this framework.
   Standard_EXPORT void Add (const Handle(SelectMgr_Filter)& afilter);
-  
+
   //! Removes the filter aFilter from this framework.
   Standard_EXPORT void Remove (const Handle(SelectMgr_Filter)& aFilter);
-  
+
   //! Returns true if this framework is empty.
   Standard_EXPORT Standard_Boolean IsEmpty() const;
-  
+
   //! Returns true if the filter aFilter is in this framework.
   Standard_EXPORT Standard_Boolean IsIn (const Handle(SelectMgr_Filter)& aFilter) const;
-  
+
   //! Returns the list of stored filters from this framework.
-    const SelectMgr_ListOfFilter& StoredFilters() const;
-  
+  const SelectMgr_ListOfFilter& StoredFilters() const { return myFilters; }
+
   //! Clears the filters used in this framework.
   Standard_EXPORT void Clear();
-  
-  Standard_EXPORT virtual Standard_Boolean ActsOn (const TopAbs_ShapeEnum aStandardMode) const Standard_OVERRIDE;
-
-
 
+  Standard_EXPORT virtual Standard_Boolean ActsOn (const TopAbs_ShapeEnum aStandardMode) const Standard_OVERRIDE;
 
   DEFINE_STANDARD_RTTIEXT(SelectMgr_CompositionFilter,SelectMgr_Filter)
 
 protected:
 
-
   SelectMgr_ListOfFilter myFilters;
 
-
-private:
-
-
-
-
 };
 
-
-#include <SelectMgr_CompositionFilter.lxx>
-
-
-
-
-
 #endif // _SelectMgr_CompositionFilter_HeaderFile

diff --git a/src/SelectMgr/SelectMgr_CompositionFilter.lxx b/src/SelectMgr/SelectMgr_CompositionFilter.lxx
deleted file mode 100644 (file)
index fe1bb18..0000000
--- a/src/SelectMgr/SelectMgr_CompositionFilter.lxx
+++ /dev/null
@@ -1,19 +0,0 @@
-// Created on: 1997-01-21
-// Created by: Robert COUBLANC
-// 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.
-
-inline const SelectMgr_ListOfFilter& SelectMgr_CompositionFilter::
-StoredFilters() const
-{return myFilters;}

diff --git a/src/SelectMgr/SelectMgr_EntityOwner.hxx b/src/SelectMgr/SelectMgr_EntityOwner.hxx
index dfe1bbb7f883aad41ccf7bfc80f12a06f505165d..f2cebbbdc246013ec3d09bb5e02f89426c0c742d 100644 (file)
--- a/src/SelectMgr/SelectMgr_EntityOwner.hxx
+++ b/src/SelectMgr/SelectMgr_EntityOwner.hxx
@@ -211,7 +211,7 @@ protected:
 
 DEFINE_STANDARD_HANDLE(SelectMgr_EntityOwner, Standard_Transient)
 
-// for porting old code
+Standard_DEPRECATED("Deprecated alias - SelectMgr_EntityOwner should be used instead")
 typedef SelectMgr_EntityOwner SelectBasics_EntityOwner;
 
 #endif // _SelectMgr_EntityOwner_HeaderFile

diff --git a/src/SelectMgr/SelectMgr_SelectionImageFiller.cxx b/src/SelectMgr/SelectMgr_SelectionImageFiller.cxx
index 7bfa8ce505264ffb5fa735cb94aab75beabf0cc8..2f4db469e86a2a7637a96e7bc920833393fee73e 100644 (file)
--- a/src/SelectMgr/SelectMgr_SelectionImageFiller.cxx
+++ b/src/SelectMgr/SelectMgr_SelectionImageFiller.cxx
@@ -192,8 +192,8 @@ namespace
           const Handle(SelectMgr_Selection)& aSel = aSelIter.Value();
           for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (aSel->Entities()); aSelEntIter.More(); aSelEntIter.Next())
           {
-            const Handle(SelectMgr_SensitiveEntity)& aSens   = aSelEntIter.Value();
-            const Handle(SelectBasics_EntityOwner)&  anOwner = aSens->BaseSensitive()->OwnerId();
+            const Handle(SelectMgr_SensitiveEntity)& aSens = aSelEntIter.Value();
+            const Handle(SelectMgr_EntityOwner)&   anOwner = aSens->BaseSensitive()->OwnerId();
             if (!myMapOwnerColors.IsBound (anOwner))
             {
               Quantity_Color aColor;
@@ -223,7 +223,7 @@ namespace
     }
 
   protected:
-    NCollection_DataMap<Handle(SelectBasics_EntityOwner), Quantity_Color> myMapOwnerColors;
+    NCollection_DataMap<Handle(SelectMgr_EntityOwner), Quantity_Color> myMapOwnerColors;
   };
 
   //! Help class for filling pixel with random color for each selection mode.

diff --git a/src/SelectMgr/SelectMgr_SensitiveEntity.hxx b/src/SelectMgr/SelectMgr_SensitiveEntity.hxx
index eacf12b605d2c6fdabe1000a95237b78b1519b3b..a6343d4abbc4a9707458e2ee7d11d5069a813dc8 100644 (file)
--- a/src/SelectMgr/SelectMgr_SensitiveEntity.hxx
+++ b/src/SelectMgr/SelectMgr_SensitiveEntity.hxx
@@ -16,7 +16,7 @@
 #ifndef _SelectMgr_SensitiveEntity_HeaderFile
 #define _SelectMgr_SensitiveEntity_HeaderFile
 
-#include <SelectBasics_SensitiveEntity.hxx>
+#include <Select3D_SensitiveEntity.hxx>
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 

diff --git a/src/SelectMgr/SelectMgr_SequenceOfFilter.hxx b/src/SelectMgr/SelectMgr_SequenceOfFilter.hxx
deleted file mode 100644 (file)
index 79eac17..0000000
--- a/src/SelectMgr/SelectMgr_SequenceOfFilter.hxx
+++ /dev/null
@@ -1,26 +0,0 @@
-// Created on: 1995-02-06
-// Created by: Mister rmi
-// Copyright (c) 1995-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 SelectMgr_SequenceOfFilter_HeaderFile
-#define SelectMgr_SequenceOfFilter_HeaderFile
-
-#include <SelectMgr_Filter.hxx>
-#include <NCollection_Sequence.hxx>
-
-typedef NCollection_Sequence<Handle(SelectMgr_Filter)> SelectMgr_SequenceOfFilter;
-
-
-#endif

diff --git a/src/V3d/FILES b/src/V3d/FILES
index 45e08ec58fa60d335bd0ebeb60919ec02c956a36..3c3d59a4e99cdba7dc050dee503e930c5ccb11d7 100755 (executable)
--- a/src/V3d/FILES
+++ b/src/V3d/FILES
@@ -11,7 +11,6 @@ V3d_ImageDumpOptions.hxx
 V3d_Light.hxx
 V3d_ListOfLight.hxx
 V3d_ListOfView.hxx
-V3d_Parameter.hxx
 V3d_Plane.cxx
 V3d_Plane.hxx
 V3d_PositionalLight.cxx
@@ -38,4 +37,3 @@ V3d_View.hxx
 V3d_Viewer.cxx
 V3d_Viewer.hxx
 V3d_ViewerPointer.hxx
-V3d_ViewPointer.hxx

diff --git a/src/V3d/V3d_Parameter.hxx b/src/V3d/V3d_Parameter.hxx
deleted file mode 100644 (file)
index 9e96a31..0000000
--- a/src/V3d/V3d_Parameter.hxx
+++ /dev/null
@@ -1,25 +0,0 @@
-// Created on: 1992-11-13
-// Created by: GG
-// Copyright (c) 1992-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 _V3d_Parameter_HeaderFile
-#define _V3d_Parameter_HeaderFile
-
-#include <Standard_Real.hxx>
-
-typedef Standard_Real V3d_Parameter;
-
-
-#endif // _V3d_Parameter_HeaderFile

diff --git a/src/V3d/V3d_PositionLight.hxx b/src/V3d/V3d_PositionLight.hxx
index 42c78be6c95c5a51d1c99a1180b3c15da7ed87e2..b206770e6888bd6c6db645c848afe3452f462d53 100644 (file)
--- a/src/V3d/V3d_PositionLight.hxx
+++ b/src/V3d/V3d_PositionLight.hxx
@@ -17,7 +17,6 @@
 #ifndef _V3d_PositionLight_HeaderFile
 #define _V3d_PositionLight_HeaderFile
 
-#include <Graphic3d_Vertex.hxx>
 #include <V3d_Light.hxx>
 
 //! Base class for Positional, Spot and Directional Light classes.

diff --git a/src/V3d/V3d_ViewPointer.hxx b/src/V3d/V3d_ViewPointer.hxx
deleted file mode 100644 (file)
index 432226b..0000000
--- a/src/V3d/V3d_ViewPointer.hxx
+++ /dev/null
@@ -1,23 +0,0 @@
-// Created on: 1992-11-13
-// Created by: GG
-// Copyright (c) 1992-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 _V3d_ViewPointer_HeaderFile
-#define _V3d_ViewPointer_HeaderFile
-
-class V3d_View;
-typedef V3d_View* V3d_ViewPointer;
-
-#endif // _V3d_ViewPointer_HeaderFile

diff --git a/tools/VInspector/VInspector_ItemPresentableObject.cxx b/tools/VInspector/VInspector_ItemPresentableObject.cxx
index 9babba37ff720d2acfa48d9f3616c88cb695ca81..94f5025c17442bf80fd30c039b6d3a648a7f671d 100644 (file)
--- a/tools/VInspector/VInspector_ItemPresentableObject.cxx
+++ b/tools/VInspector/VInspector_ItemPresentableObject.cxx
@@ -30,7 +30,7 @@
 #include <NCollection_List.hxx>
 #include <Prs3d.hxx>
 #include <Prs3d_Drawer.hxx>
-#include <SelectBasics_EntityOwner.hxx>
+#include <SelectMgr_EntityOwner.hxx>
 #include <StdSelect_BRepOwner.hxx>
 
 #include <Standard_WarningsDisable.hxx>

diff --git a/tools/VInspector/VInspector_Tools.cxx b/tools/VInspector/VInspector_Tools.cxx
index 8c33d500de2af160f3f23273de2a6062fae94efa..83bc7da199c012b5e2beab63855e7483393bd18e 100644 (file)
--- a/tools/VInspector/VInspector_Tools.cxx
+++ b/tools/VInspector/VInspector_Tools.cxx
@@ -100,7 +100,7 @@ int VInspector_Tools::SelectedOwners (const Handle(AIS_InteractiveContext)& theC
 // purpose :
 // =======================================================================
 bool VInspector_Tools::IsOwnerSelected (const Handle(AIS_InteractiveContext)& theContext,
-                                        const Handle(SelectBasics_EntityOwner)& theOwner)
+                                        const Handle(SelectMgr_EntityOwner)& theOwner)
 {
   bool anIsSelected = false;
   for (theContext->InitSelected(); theContext->MoreSelected() && !anIsSelected; theContext->NextSelected())
@@ -112,10 +112,10 @@ bool VInspector_Tools::IsOwnerSelected (const Handle(AIS_InteractiveContext)& th
 // function : ContextOwners
 // purpose :
 // =======================================================================
-NCollection_List<Handle(SelectBasics_EntityOwner)> VInspector_Tools::ContextOwners (
+NCollection_List<Handle(SelectMgr_EntityOwner)> VInspector_Tools::ContextOwners (
                                                const Handle(AIS_InteractiveContext)& theContext)
 {
-  NCollection_List<Handle(SelectBasics_EntityOwner)> aResultOwners;
+  NCollection_List<Handle(SelectMgr_EntityOwner)> aResultOwners;
   if (theContext.IsNull())
     return aResultOwners;
 
@@ -137,8 +137,8 @@ NCollection_List<Handle(SelectBasics_EntityOwner)> VInspector_Tools::ContextOwne
         Handle(SelectMgr_SensitiveEntity) anEntity = aSelEntIter.Value();
         if (anEntity.IsNull())
           continue;
-        const Handle(SelectBasics_SensitiveEntity)& aBase = anEntity->BaseSensitive();
-        Handle(SelectBasics_EntityOwner) anOwner = aBase->OwnerId();
+        const Handle(Select3D_SensitiveEntity)& aBase = anEntity->BaseSensitive();
+        Handle(SelectMgr_EntityOwner) anOwner = aBase->OwnerId();
         Standard_Transient* anOwnerPtr = anOwner.get();
         if (aSelectedIds.contains ((size_t)anOwnerPtr))
           continue;
@@ -154,22 +154,22 @@ NCollection_List<Handle(SelectBasics_EntityOwner)> VInspector_Tools::ContextOwne
 // function : ActiveOwners
 // purpose :
 // =======================================================================
-NCollection_List<Handle(SelectBasics_EntityOwner)> VInspector_Tools::ActiveOwners (
+NCollection_List<Handle(SelectMgr_EntityOwner)> VInspector_Tools::ActiveOwners (
                                 const Handle(AIS_InteractiveContext)& theContext,
-                                NCollection_List<Handle(SelectBasics_EntityOwner)>& theEmptySelectableOwners)
+                                NCollection_List<Handle(SelectMgr_EntityOwner)>& theEmptySelectableOwners)
 {
-  NCollection_List<Handle(SelectBasics_EntityOwner)> aResultOwners;
+  NCollection_List<Handle(SelectMgr_EntityOwner)> aResultOwners;
 
   // only local context is processed: TODO for global context
   Handle(AIS_InteractiveContext) aContext = theContext;
   if (aContext.IsNull())
     return aResultOwners;
-  NCollection_List<Handle(SelectBasics_EntityOwner)> anActiveOwners;
+  NCollection_List<Handle(SelectMgr_EntityOwner)> anActiveOwners;
   // OCCT BUG:1 - equal pointer owners are appears in the list
   aContext->MainSelector()->ActiveOwners (anActiveOwners);
   QList<size_t> aSelectedIds; // Remember of selected address in order to avoid duplicates
   Handle(SelectMgr_EntityOwner) anOwner;
-  for (NCollection_List<Handle(SelectBasics_EntityOwner)>::Iterator anOwnersIt (anActiveOwners);
+  for (NCollection_List<Handle(SelectMgr_EntityOwner)>::Iterator anOwnersIt (anActiveOwners);
        anOwnersIt.More(); anOwnersIt.Next())
   {
     anOwner = anOwnersIt.Value();
@@ -195,7 +195,7 @@ NCollection_List<Handle(SelectBasics_EntityOwner)> VInspector_Tools::ActiveOwner
 // purpose :
 // =======================================================================
 void VInspector_Tools::AddOrRemoveSelectedShapes (const Handle(AIS_InteractiveContext)& theContext,
-                                                  const NCollection_List<Handle(SelectBasics_EntityOwner)>& theOwners)
+                                                  const NCollection_List<Handle(SelectMgr_EntityOwner)>& theOwners)
 {
   // TODO: the next two rows are to be removed later
   theContext->UnhilightSelected(false);
@@ -203,7 +203,7 @@ void VInspector_Tools::AddOrRemoveSelectedShapes (const Handle(AIS_InteractiveCo
 
   theContext->UnhilightSelected(Standard_False);
 
-  for (NCollection_List<Handle(SelectBasics_EntityOwner)>::Iterator anOwnersIt(theOwners);
+  for (NCollection_List<Handle(SelectMgr_EntityOwner)>::Iterator anOwnersIt(theOwners);
        anOwnersIt.More(); anOwnersIt.Next())
   {
     Handle(SelectMgr_EntityOwner) anOwner = anOwnersIt.Value();

diff --git a/tools/VInspector/VInspector_Tools.hxx b/tools/VInspector/VInspector_Tools.hxx
index 2b65f9d338ff2fee974104acd62e08f1155fd4a0..6e988a9f06717cd48d395c8024abfc715e793542 100644 (file)
--- a/tools/VInspector/VInspector_Tools.hxx
+++ b/tools/VInspector/VInspector_Tools.hxx
@@ -72,27 +72,27 @@ public:
   //! \param theOwner a selectable owner
   //! \return boolean value
   Standard_EXPORT static bool IsOwnerSelected (const Handle(AIS_InteractiveContext)& theContext,
-                                               const Handle(SelectBasics_EntityOwner)& theOwner);
+                                               const Handle(SelectMgr_EntityOwner)& theOwner);
 
   //! Returns all owners present in the context
   //! \param theContext an interactive context
   //! \return container of owners
-  Standard_EXPORT static NCollection_List<Handle(SelectBasics_EntityOwner)> ContextOwners (
+  Standard_EXPORT static NCollection_List<Handle(SelectMgr_EntityOwner)> ContextOwners (
                                                  const Handle(AIS_InteractiveContext)& theContext);
 
   //! Returns active owners in main selector of context
   //! \param theContext an interactive context
   //! \param theEmptySelectableOwners container of owners with NULL presentation or not displayed presentation
   //! \return container of owners
-  Standard_EXPORT static NCollection_List<Handle(SelectBasics_EntityOwner)> ActiveOwners (
+  Standard_EXPORT static NCollection_List<Handle(SelectMgr_EntityOwner)> ActiveOwners (
                             const Handle(AIS_InteractiveContext)& theContext,
-                            NCollection_List<Handle(SelectBasics_EntityOwner)>& theEmptySelectableOwners);
+                            NCollection_List<Handle(SelectMgr_EntityOwner)>& theEmptySelectableOwners);
 
   //! Unhighlight selected, set selected the owners
   //! \param theContext an interactive context
   //! \param theOwners a container of owners
   Standard_EXPORT static void AddOrRemoveSelectedShapes (const Handle(AIS_InteractiveContext)& theContext,
-                                         const NCollection_List<Handle(SelectBasics_EntityOwner)>& theOwners);
+                                         const NCollection_List<Handle(SelectMgr_EntityOwner)>& theOwners);
 
   //! Unhighlight selected, set selected presentations
   //! \param theContext an interactive context

diff --git a/tools/VInspector/VInspector_ViewModel.hxx b/tools/VInspector/VInspector_ViewModel.hxx
index 906f9f60f768c8da09fc2fa544750241f50d0611..a6575d7d4ae3ea51cdc017011ffd83064e4a4cad 100644 (file)
--- a/tools/VInspector/VInspector_ViewModel.hxx
+++ b/tools/VInspector/VInspector_ViewModel.hxx
@@ -18,8 +18,8 @@
 
 #include <AIS_InteractiveContext.hxx>
 #include <NCollection_List.hxx>
-#include <SelectBasics_EntityOwner.hxx>
-#include <Standard.hxx>
+#include <SelectMgr_EntityOwner.hxx>
+
 #include <inspector/TreeModel_ModelBase.hxx>
 #include <inspector/VInspector_ItemBase.hxx>
 

diff --git a/tools/VInspector/VInspector_Window.hxx b/tools/VInspector/VInspector_Window.hxx
index 44cfb1f4f4aa7f88744a06aa18e3b1e9fad82f02..3c986eed5041ff8ff4bf62d02bd611dd2d122d26 100644 (file)
--- a/tools/VInspector/VInspector_Window.hxx
+++ b/tools/VInspector/VInspector_Window.hxx
@@ -18,8 +18,7 @@
 
 #include <AIS_InteractiveContext.hxx>
 #include <NCollection_List.hxx>
-#include <SelectBasics_EntityOwner.hxx>
-#include <Standard.hxx>
+#include <SelectMgr_EntityOwner.hxx>
 
 #include <inspector/TInspectorAPI_PluginParameters.hxx>
 #include <inspector/VInspector_CallBack.hxx>