OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-24 13:50:49 +03:00
Code Activity

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

Browse Source 
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.
This commit is contained in:
kgv
2021-03-19 12:37:30 +03:00
committed by bugmaster
parent ef188756a0
commit bbd9292784
35 changed files with 44 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SelectMgr/FILES
View File

@@ -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

39
src/SelectMgr/SelectMgr_CompositionFilter.hxx
View File

@@ -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;
DEFINE_STANDARD_RTTIEXT(SelectMgr_CompositionFilter,SelectMgr_Filter)
protected:
SelectMgr_ListOfFilter myFilters;
private:
};
#include <SelectMgr_CompositionFilter.lxx>
#endif // _SelectMgr_CompositionFilter_HeaderFile

19
src/SelectMgr/SelectMgr_CompositionFilter.lxx
View File

@@ -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;}

2
src/SelectMgr/SelectMgr_EntityOwner.hxx
View File

@@ -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

6
src/SelectMgr/SelectMgr_SelectionImageFiller.cxx
View File

@@ -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.

2
src/SelectMgr/SelectMgr_SensitiveEntity.hxx
View File

@@ -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>

26
src/SelectMgr/SelectMgr_SequenceOfFilter.hxx
View File

@@ -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