0029576: Coding Rules - remove unused declarations from package Aspect

The following unused declarations have been removed:
  Aspect_TypeOfPrimitive, Aspect_TypeOfLayer, Aspect_TypeOfEdge,
  Aspect_TypeOfDrawMode, Aspect_TypeOfConstraint,
  Aspect_DriverDefinitionError, Aspect_BadAccess.

diff --git a/dox/dev_guides/upgrade/upgrade.md b/dox/dev_guides/upgrade/upgrade.md
index b663b7c..450b744 100644 (file)
--- a/dox/dev_guides/upgrade/upgrade.md
+++ b/dox/dev_guides/upgrade/upgrade.md
@@ -791,6 +791,7 @@ std::stable_sort (aValues.begin(), aValues.end());
 
 The old mechanism for rendering Underlay and Overlay on-screen 2D objects based on *Visual3d_Layer* and immediate drawing model (uncached and thus slow) has been removed.
 Classes *Aspect_Clayer2d, OpenGl_GraphicDriver_Layer, Visual3d_Layer, Visual3d_LayerItem, V3d_LayerMgr* and *V3d_LayerMgrPointer* have been deleted.
+The following auxiliary definition have been removed as well: Aspect_TypeOfPrimitive, Aspect_TypeOfLayer, Aspect_TypeOfEdge, Aspect_TypeOfDrawMode, Aspect_TypeOfConstraint, Aspect_DriverDefinitionError, Aspect_BadAccess.
 
 General AIS interactive objects with transformation persistence flag *Graphic3d_TMF_2d* can be used as a replacement of *Visual3d_LayerItem*.
 The anchor point specified for transformation persistence defines the window corner of  (or center in case of (0, 0) point).
@@ -1523,7 +1524,7 @@ Multiple changes have been applied to lights management within TKV3d and TKOpenG
 
 @subsection upgrade_730_shadingmodels Shading Models
 
-*Graphic3d_AspectFillArea3d* has been extended by a new property ::ShadingModel(), which previously has been defined globally for entire View.
+*Graphic3d_AspectFillArea3d* has been extended by a new property *ShadingModel()*, which previously has been defined globally for entire View.
 
 Previously, triangle array without normal vertex attributes was implicitly considered as unshaded,
 but now such array will be shaded using *Graphic3d_TOSM_FACET* model (e.g. by computing per-triangle normals).
@@ -1533,7 +1534,7 @@ Alternatively, material without reflectance properties can be used for disabling
 @subsection upgrade_730_tkopengl Custom low-level OpenGL elements
 
 The following API changes should be considered while porting custom OpenGl_Element objects:
-* OpenGl_ShaderManager::BindFaceProgram(), ::BindLineProgram(), ::BindMarkerProgram() now takes enumeration arguments instead of Boolean flags.
+* *OpenGl_ShaderManager::BindFaceProgram()*, *BindLineProgram()*, *BindMarkerProgram()* now take enumeration arguments instead of Boolean flags.
 
 @subsection upgrade_730_BOPAlgo_Section Changes in BOPAlgo_Section
 

diff --git a/src/Aspect/Aspect_BadAccess.hxx b/src/Aspect/Aspect_BadAccess.hxx
deleted file mode 100644 (file)
index 6c82d11..0000000
--- a/src/Aspect/Aspect_BadAccess.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-// Created by: NW,JPB,CAL
-// Copyright (c) 1991-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 _Aspect_BadAccess_HeaderFile
-#define _Aspect_BadAccess_HeaderFile
-
-#include <Standard_Type.hxx>
-#include <Standard_DefineException.hxx>
-#include <Standard_SStream.hxx>
-#include <Standard_DomainError.hxx>
-
-class Aspect_BadAccess;
-DEFINE_STANDARD_HANDLE(Aspect_BadAccess, Standard_DomainError)
-
-#if !defined No_Exception && !defined No_Aspect_BadAccess
-  #define Aspect_BadAccess_Raise_if(CONDITION, MESSAGE) \
-  if (CONDITION) throw Aspect_BadAccess(MESSAGE);
-#else
-  #define Aspect_BadAccess_Raise_if(CONDITION, MESSAGE)
-#endif
-
-DEFINE_STANDARD_EXCEPTION(Aspect_BadAccess, Standard_DomainError)
-
-#endif // _Aspect_BadAccess_HeaderFile

diff --git a/src/Aspect/Aspect_DriverDefinitionError.hxx b/src/Aspect/Aspect_DriverDefinitionError.hxx
deleted file mode 100644 (file)
index 465784b..0000000
--- a/src/Aspect/Aspect_DriverDefinitionError.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-// Created by: NW,JPB,CAL
-// Copyright (c) 1991-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 _Aspect_DriverDefinitionError_HeaderFile
-#define _Aspect_DriverDefinitionError_HeaderFile
-
-#include <Standard_Type.hxx>
-#include <Standard_DefineException.hxx>
-#include <Standard_SStream.hxx>
-#include <Standard_OutOfRange.hxx>
-
-class Aspect_DriverDefinitionError;
-DEFINE_STANDARD_HANDLE(Aspect_DriverDefinitionError, Standard_OutOfRange)
-
-#if !defined No_Exception && !defined No_Aspect_DriverDefinitionError
-  #define Aspect_DriverDefinitionError_Raise_if(CONDITION, MESSAGE) \
-  if (CONDITION) throw Aspect_DriverDefinitionError(MESSAGE);
-#else
-  #define Aspect_DriverDefinitionError_Raise_if(CONDITION, MESSAGE)
-#endif
-
-DEFINE_STANDARD_EXCEPTION(Aspect_DriverDefinitionError, Standard_OutOfRange)
-
-#endif // _Aspect_DriverDefinitionError_HeaderFile

diff --git a/src/Aspect/Aspect_TypeOfConstraint.hxx b/src/Aspect/Aspect_TypeOfConstraint.hxx
deleted file mode 100644 (file)
index 7cc78f1..0000000
--- a/src/Aspect/Aspect_TypeOfConstraint.hxx
+++ /dev/null
@@ -1,28 +0,0 @@
-// Created by: NW,JPB,CAL
-// Copyright (c) 1991-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 _Aspect_TypeOfConstraint_HeaderFile
-#define _Aspect_TypeOfConstraint_HeaderFile
-
-//! Definition of the attachment for the layers
-enum Aspect_TypeOfConstraint
-{
-Aspect_TOC_BOTTOM_LEFT,
-Aspect_TOC_BOTTOM_RIGHT,
-Aspect_TOC_TOP_LEFT,
-Aspect_TOC_TOP_RIGHT
-};
-
-#endif // _Aspect_TypeOfConstraint_HeaderFile

diff --git a/src/Aspect/Aspect_TypeOfDrawMode.hxx b/src/Aspect/Aspect_TypeOfDrawMode.hxx
deleted file mode 100644 (file)
index 6a87e57..0000000
--- a/src/Aspect/Aspect_TypeOfDrawMode.hxx
+++ /dev/null
@@ -1,28 +0,0 @@
-// Created by: NW,JPB,CAL
-// Copyright (c) 1991-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 _Aspect_TypeOfDrawMode_HeaderFile
-#define _Aspect_TypeOfDrawMode_HeaderFile
-
-//! Definition of the draw modes
-enum Aspect_TypeOfDrawMode
-{
-Aspect_TODM_REPLACE,
-Aspect_TODM_ERASE,
-Aspect_TODM_XOR,
-Aspect_TODM_XORLIGHT
-};
-
-#endif // _Aspect_TypeOfDrawMode_HeaderFile

diff --git a/src/Aspect/Aspect_TypeOfEdge.hxx b/src/Aspect/Aspect_TypeOfEdge.hxx
deleted file mode 100644 (file)
index 6756a13..0000000
--- a/src/Aspect/Aspect_TypeOfEdge.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
-// Created by: NW,JPB,CAL
-// Copyright (c) 1991-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 _Aspect_TypeOfEdge_HeaderFile
-#define _Aspect_TypeOfEdge_HeaderFile
-
-//! Definition of edge visibility
-//!
-//! TOE_VISIBLE         Edge is displayed
-//! TOE_INVISIBLE       Edge is not displayed
-enum Aspect_TypeOfEdge
-{
-Aspect_TOE_VISIBLE,
-Aspect_TOE_INVISIBLE
-};
-
-#endif // _Aspect_TypeOfEdge_HeaderFile

diff --git a/src/Aspect/Aspect_TypeOfLayer.hxx b/src/Aspect/Aspect_TypeOfLayer.hxx
deleted file mode 100644 (file)
index 3bd4ff2..0000000
--- a/src/Aspect/Aspect_TypeOfLayer.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-// Created by: NW,JPB,CAL
-// Copyright (c) 1991-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 _Aspect_TypeOfLayer_HeaderFile
-#define _Aspect_TypeOfLayer_HeaderFile
-
-//! Modes of drawing for the objects in a layer
-//!
-//! TOL_OVERLAY, the graphic of the layer is draw
-//! after the 3d graphic.
-//! TOL_UNDERLAY, the graphic of the layer is draw
-//! before the 3d graphic.
-enum Aspect_TypeOfLayer
-{
-Aspect_TOL_OVERLAY,
-Aspect_TOL_UNDERLAY
-};
-
-#endif // _Aspect_TypeOfLayer_HeaderFile

diff --git a/src/Aspect/Aspect_TypeOfPrimitive.hxx b/src/Aspect/Aspect_TypeOfPrimitive.hxx
deleted file mode 100644 (file)
index 0daf356..0000000
--- a/src/Aspect/Aspect_TypeOfPrimitive.hxx
+++ /dev/null
@@ -1,32 +0,0 @@
-// Created by: NW,JPB,CAL
-// Copyright (c) 1991-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 _Aspect_TypeOfPrimitive_HeaderFile
-#define _Aspect_TypeOfPrimitive_HeaderFile
-
-
-enum Aspect_TypeOfPrimitive
-{
-Aspect_TOP_UNKNOWN,
-Aspect_TOP_POLYLINE,
-Aspect_TOP_POLYGON,
-Aspect_TOP_SEGMENTS,
-Aspect_TOP_ARCS,
-Aspect_TOP_POLYARCS,
-Aspect_TOP_POINTS,
-Aspect_TOP_MARKERS
-};
-
-#endif // _Aspect_TypeOfPrimitive_HeaderFile

diff --git a/src/Aspect/FILES b/src/Aspect/FILES
index 64a8a08..c63cdf0 100755 (executable)
--- a/src/Aspect/FILES
+++ b/src/Aspect/FILES
@@ -3,7 +3,6 @@ Aspect_AspectLineDefinitionError.hxx
 Aspect_AspectMarkerDefinitionError.hxx
 Aspect_Background.cxx
 Aspect_Background.hxx
-Aspect_BadAccess.hxx
 Aspect_CircularGrid.cxx
 Aspect_CircularGrid.hxx
 Aspect_Convert.hxx
@@ -12,7 +11,6 @@ Aspect_DisplayConnection.cxx
 Aspect_DisplayConnection.hxx
 Aspect_DisplayConnectionDefinitionError.hxx
 Aspect_Drawable.hxx
-Aspect_DriverDefinitionError.hxx
 Aspect_FBConfig.hxx
 Aspect_FillMethod.hxx
 Aspect_GenId.cxx
@@ -39,17 +37,12 @@ Aspect_SequenceOfColor.hxx
 Aspect_TypeOfColorScaleData.hxx
 Aspect_TypeOfColorScaleOrientation.hxx
 Aspect_TypeOfColorScalePosition.hxx
-Aspect_TypeOfConstraint.hxx
 Aspect_TypeOfDeflection.hxx
 Aspect_TypeOfDisplayText.hxx
-Aspect_TypeOfDrawMode.hxx
-Aspect_TypeOfEdge.hxx
 Aspect_TypeOfFacingModel.hxx
 Aspect_TypeOfHighlightMethod.hxx
-Aspect_TypeOfLayer.hxx
 Aspect_TypeOfLine.hxx
 Aspect_TypeOfMarker.hxx
-Aspect_TypeOfPrimitive.hxx
 Aspect_TypeOfResize.hxx
 Aspect_TypeOfStyleText.hxx
 Aspect_TypeOfTriedronPosition.hxx