1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00

0031789: Coding Rules - remove redundant Standard_EXPORT from TKMesh

- Standard_EXPORT which were specified for inline methods were deleted.
- ALL occurrences of DEFINE_STANDARD_RTTI_INLINE were replaced by DEFINE_STANDARD_RTTIEXT in header files and IMPLEMENT_STANDARD_RTTIEXT in source files
- ALL occurrences of "inline" keyword were deleted where it didn't not cause a linkage errors
- Added source files for classes that were without them for IMPLEMENT_STANDARD_RTTIEXT
This commit is contained in:
mkrylova
2020-09-24 17:14:15 +03:00
committed by abv
parent 42624fdc75
commit 4945e8be99
121 changed files with 729 additions and 327 deletions

View File

@@ -1,13 +1,22 @@
IMeshData_Curve.hxx
IMeshData_Curve.cxx
IMeshData_Edge.hxx
IMeshData_Edge.cxx
IMeshData_Face.hxx
IMeshData_Face.cxx
IMeshData_Model.hxx
IMeshData_Model.cxx
IMeshData_ParametersList.hxx
IMeshData_ParametersList.cxx
IMeshData_ParametersListArrayAdaptor.hxx
IMeshData_PCurve.hxx
IMeshData_PCurve.cxx
IMeshData_Shape.hxx
IMeshData_Shape.cxx
IMeshData_Status.hxx
IMeshData_StatusOwner.hxx
IMeshData_TessellatedShape.hxx
IMeshData_TessellatedShape.cxx
IMeshData_Types.hxx
IMeshData_Wire.hxx
IMeshData_Wire.cxx

View File

@@ -0,0 +1,18 @@
// Created on: 2020-09-28
// Copyright (c) 2020 OPEN CASCADE SAS
// Created by: Maria KRYLOVA
//
// 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.
#include <IMeshData_Curve.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshData_Curve, IMeshData_ParametersList)

View File

@@ -28,7 +28,7 @@ class IMeshData_Curve : public IMeshData_ParametersList
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshData_Curve()
virtual ~IMeshData_Curve()
{
}
@@ -49,12 +49,12 @@ public:
//! Removes point with the given index.
Standard_EXPORT virtual void RemovePoint (const Standard_Integer theIndex) = 0;
DEFINE_STANDARD_RTTI_INLINE(IMeshData_Curve, IMeshData_ParametersList)
DEFINE_STANDARD_RTTIEXT(IMeshData_Curve, IMeshData_ParametersList)
protected:
//! Constructor.
Standard_EXPORT IMeshData_Curve()
IMeshData_Curve()
{
}
};

View File

@@ -0,0 +1,18 @@
// Created on: 2020-09-28
// Copyright (c) 2020 OPEN CASCADE SAS
// Created by: Maria KRYLOVA
//
// 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.
#include <IMeshData_Edge.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshData_Edge, IMeshData_TessellatedShape)

View File

@@ -34,12 +34,12 @@ class IMeshData_Edge : public IMeshData_TessellatedShape, public IMeshData_Statu
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshData_Edge()
virtual ~IMeshData_Edge()
{
}
//! Returns TopoDS_Edge attached to model.
inline const TopoDS_Edge& GetEdge () const
const TopoDS_Edge& GetEdge () const
{
return TopoDS::Edge (GetShape ());
}
@@ -62,7 +62,7 @@ public:
const Standard_Integer theIndex) const = 0;
//! Clears curve and all pcurves assigned to the edge from discretization.
inline void Clear(const Standard_Boolean isKeepEndPoints)
void Clear(const Standard_Boolean isKeepEndPoints)
{
myCurve->Clear(isKeepEndPoints);
for (Standard_Integer aPCurveIt = 0; aPCurveIt < PCurvesNb(); ++aPCurveIt)
@@ -72,81 +72,81 @@ public:
}
//! Returns true in case if the edge is free one, i.e. it does not have pcurves.
inline Standard_Boolean IsFree () const
Standard_Boolean IsFree () const
{
return (PCurvesNb () == 0);
}
//! Sets 3d curve associated with current edge.
inline void SetCurve (const IMeshData::ICurveHandle& theCurve)
void SetCurve (const IMeshData::ICurveHandle& theCurve)
{
myCurve = theCurve;
}
//! Returns 3d curve associated with current edge.
inline const IMeshData::ICurveHandle& GetCurve () const
const IMeshData::ICurveHandle& GetCurve () const
{
return myCurve;
}
//! Gets value of angular deflection for the discrete model.
inline Standard_Real GetAngularDeflection () const
Standard_Real GetAngularDeflection () const
{
return myAngDeflection;
}
//! Sets value of angular deflection for the discrete model.
inline void SetAngularDeflection (const Standard_Real theValue)
void SetAngularDeflection (const Standard_Real theValue)
{
myAngDeflection = theValue;
}
//! Returns same param flag.
//! By default equals to flag stored in topological shape.
inline Standard_Boolean GetSameParam () const
Standard_Boolean GetSameParam () const
{
return mySameParam;
}
//! Updates same param flag.
inline void SetSameParam (const Standard_Boolean theValue)
void SetSameParam (const Standard_Boolean theValue)
{
mySameParam = theValue;
}
//! Returns same range flag.
//! By default equals to flag stored in topological shape.
inline Standard_Boolean GetSameRange () const
Standard_Boolean GetSameRange () const
{
return mySameRange;
}
//! Updates same range flag.
inline void SetSameRange (const Standard_Boolean theValue)
void SetSameRange (const Standard_Boolean theValue)
{
mySameRange = theValue;
}
//! Returns degenerative flag.
//! By default equals to flag stored in topological shape.
inline Standard_Boolean GetDegenerated () const
Standard_Boolean GetDegenerated () const
{
return myDegenerated;
}
//! Updates degenerative flag.
inline void SetDegenerated (const Standard_Boolean theValue)
void SetDegenerated (const Standard_Boolean theValue)
{
myDegenerated = theValue;
}
DEFINE_STANDARD_RTTI_INLINE(IMeshData_Edge, IMeshData_TessellatedShape)
DEFINE_STANDARD_RTTIEXT(IMeshData_Edge, IMeshData_TessellatedShape)
protected:
//! Constructor.
//! Initializes empty model.
Standard_EXPORT IMeshData_Edge (const TopoDS_Edge& theEdge)
IMeshData_Edge (const TopoDS_Edge& theEdge)
: IMeshData_TessellatedShape(theEdge),
mySameParam (BRep_Tool::SameParameter(theEdge)),
mySameRange (BRep_Tool::SameRange (theEdge)),

View File

@@ -0,0 +1,18 @@
// Created on: 2020-09-28
// Copyright (c) 2020 OPEN CASCADE SAS
// Created by: Maria KRYLOVA
//
// 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.
#include <IMeshData_Face.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshData_Face, IMeshData_TessellatedShape)

View File

@@ -36,7 +36,7 @@ class IMeshData_Face : public IMeshData_TessellatedShape, public IMeshData_Statu
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshData_Face()
virtual ~IMeshData_Face()
{
}
@@ -53,32 +53,32 @@ public:
const Standard_Integer theIndex) const = 0;
//! Returns face's surface.
inline const Handle(BRepAdaptor_HSurface)& GetSurface() const
const Handle(BRepAdaptor_HSurface)& GetSurface() const
{
return mySurface;
}
//! Returns TopoDS_Face attached to model.
inline const TopoDS_Face& GetFace () const
const TopoDS_Face& GetFace () const
{
return TopoDS::Face (GetShape ());
}
//! Returns whether the face discrete model is valid.
inline Standard_Boolean IsValid () const
Standard_Boolean IsValid () const
{
return (IsEqual(IMeshData_NoError) ||
IsEqual(IMeshData_ReMesh) ||
IsEqual(IMeshData_UnorientedWire));
}
DEFINE_STANDARD_RTTI_INLINE(IMeshData_Face, IMeshData_TessellatedShape)
DEFINE_STANDARD_RTTIEXT(IMeshData_Face, IMeshData_TessellatedShape)
protected:
//! Constructor.
//! Initializes empty model.
Standard_EXPORT IMeshData_Face (const TopoDS_Face& theFace)
IMeshData_Face (const TopoDS_Face& theFace)
: IMeshData_TessellatedShape(theFace)
{
BRepAdaptor_Surface aSurfAdaptor(GetFace(), Standard_False);

View File

@@ -0,0 +1,18 @@
// Created on: 2020-09-28
// Copyright (c) 2020 OPEN CASCADE SAS
// Created by: Maria KRYLOVA
//
// 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.
#include <IMeshData_Model.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshData_Model, IMeshData_Shape)

View File

@@ -32,14 +32,14 @@ class IMeshData_Model : public IMeshData_Shape
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshData_Model()
virtual ~IMeshData_Model()
{
}
//! Returns maximum size of shape model.
Standard_EXPORT virtual Standard_Real GetMaxSize () const = 0;
DEFINE_STANDARD_RTTI_INLINE(IMeshData_Model, IMeshData_Shape)
DEFINE_STANDARD_RTTIEXT(IMeshData_Model, IMeshData_Shape)
public: //! @name discrete faces
@@ -67,7 +67,7 @@ protected:
//! Constructor.
//! Initializes empty model.
Standard_EXPORT IMeshData_Model (const TopoDS_Shape& theShape)
IMeshData_Model (const TopoDS_Shape& theShape)
: IMeshData_Shape(theShape)
{
}

View File

@@ -0,0 +1,18 @@
// Created on: 2020-09-28
// Copyright (c) 2020 OPEN CASCADE SAS
// Created by: Maria KRYLOVA
//
// 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.
#include <IMeshData_PCurve.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshData_PCurve, IMeshData_ParametersList)

View File

@@ -29,7 +29,7 @@ class IMeshData_PCurve : public IMeshData_ParametersList
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshData_PCurve()
virtual ~IMeshData_PCurve()
{
}
@@ -54,35 +54,35 @@ public:
Standard_EXPORT virtual void RemovePoint (const Standard_Integer theIndex) = 0;
//! Returns forward flag of this pcurve.
inline Standard_Boolean IsForward () const
Standard_Boolean IsForward () const
{
return (myOrientation != TopAbs_REVERSED);
}
//! Returns internal flag of this pcurve.
inline Standard_Boolean IsInternal() const
Standard_Boolean IsInternal() const
{
return (myOrientation == TopAbs_INTERNAL);
}
//! Returns orientation of the edge associated with current pcurve.
inline TopAbs_Orientation GetOrientation() const
TopAbs_Orientation GetOrientation() const
{
return myOrientation;
}
//! Returns discrete face pcurve is associated to.
inline const IMeshData::IFacePtr& GetFace () const
const IMeshData::IFacePtr& GetFace () const
{
return myDFace;
}
DEFINE_STANDARD_RTTI_INLINE(IMeshData_PCurve, IMeshData_ParametersList)
DEFINE_STANDARD_RTTIEXT(IMeshData_PCurve, IMeshData_ParametersList)
protected:
//! Constructor.
Standard_EXPORT IMeshData_PCurve (
IMeshData_PCurve (
const IMeshData::IFacePtr& theDFace,
const TopAbs_Orientation theOrientation)
: myDFace(theDFace),

View File

@@ -0,0 +1,18 @@
// Created on: 2020-09-28
// Copyright (c) 2020 OPEN CASCADE SAS
// Created by: Maria KRYLOVA
//
// 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.
#include <IMeshData_ParametersList.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshData_ParametersList, Standard_Transient)

View File

@@ -25,7 +25,7 @@ class IMeshData_ParametersList : public Standard_Transient
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshData_ParametersList()
virtual ~IMeshData_ParametersList()
{
}
@@ -38,12 +38,12 @@ public:
//! Clears parameters list.
Standard_EXPORT virtual void Clear(const Standard_Boolean isKeepEndPoints) = 0;
DEFINE_STANDARD_RTTI_INLINE(IMeshData_ParametersList, Standard_Transient)
DEFINE_STANDARD_RTTIEXT(IMeshData_ParametersList, Standard_Transient)
protected:
//! Constructor.
Standard_EXPORT IMeshData_ParametersList()
IMeshData_ParametersList()
{
}

View File

@@ -28,31 +28,31 @@ class IMeshData_ParametersListArrayAdaptor : public Standard_Transient
public:
//! Constructor. Initializes tool by the given parameters.
Standard_EXPORT IMeshData_ParametersListArrayAdaptor(
IMeshData_ParametersListArrayAdaptor(
const ParametersListPtrType& theParameters)
: myParameters (theParameters)
{
}
//! Destructor.
Standard_EXPORT virtual ~IMeshData_ParametersListArrayAdaptor()
virtual ~IMeshData_ParametersListArrayAdaptor()
{
}
//! Returns lower index in parameters array.
Standard_EXPORT Standard_Integer Lower() const
Standard_Integer Lower() const
{
return 0;
}
//! Returns upper index in parameters array.
Standard_EXPORT Standard_Integer Upper() const
Standard_Integer Upper() const
{
return myParameters->ParametersNb() - 1;
}
//! Returns value of the given index.
Standard_EXPORT Standard_Real Value(const Standard_Integer theIndex) const
Standard_Real Value(const Standard_Integer theIndex) const
{
return myParameters->GetParameter(theIndex);
}

View File

@@ -0,0 +1,18 @@
// Created on: 2020-09-28
// Copyright (c) 2020 OPEN CASCADE SAS
// Created by: Maria KRYLOVA
//
// 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.
#include <IMeshData_Shape.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshData_Shape, Standard_Transient)

View File

@@ -27,12 +27,12 @@ class IMeshData_Shape : public Standard_Transient
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshData_Shape()
virtual ~IMeshData_Shape()
{
}
//! Assigns shape to discrete shape.
inline void SetShape (const TopoDS_Shape& theShape)
void SetShape (const TopoDS_Shape& theShape)
{
myShape = theShape;
}
@@ -43,17 +43,17 @@ public:
return myShape;
}
DEFINE_STANDARD_RTTI_INLINE(IMeshData_Shape, Standard_Transient)
DEFINE_STANDARD_RTTIEXT(IMeshData_Shape, Standard_Transient)
protected:
//! Constructor.
Standard_EXPORT IMeshData_Shape()
IMeshData_Shape()
{
}
//! Constructor.
Standard_EXPORT IMeshData_Shape (const TopoDS_Shape& theShape)
IMeshData_Shape (const TopoDS_Shape& theShape)
: myShape(theShape)
{
}

View File

@@ -26,36 +26,36 @@ class IMeshData_StatusOwner
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshData_StatusOwner()
virtual ~IMeshData_StatusOwner()
{
}
//! Returns true in case if status is strictly equal to the given value.
inline Standard_Boolean IsEqual(const IMeshData_Status theValue) const
Standard_Boolean IsEqual(const IMeshData_Status theValue) const
{
return (myStatus == theValue);
}
//! Returns true in case if status is set.
inline Standard_Boolean IsSet(const IMeshData_Status theValue) const
Standard_Boolean IsSet(const IMeshData_Status theValue) const
{
return (myStatus & theValue) != 0;
}
//! Adds status to status flags of a face.
inline void SetStatus(const IMeshData_Status theValue)
void SetStatus(const IMeshData_Status theValue)
{
myStatus |= theValue;
}
//! Adds status to status flags of a face.
inline void UnsetStatus(const IMeshData_Status theValue)
void UnsetStatus(const IMeshData_Status theValue)
{
myStatus &= ~theValue;
}
//! Returns complete status mask.
inline Standard_Integer GetStatusMask() const
Standard_Integer GetStatusMask() const
{
return myStatus;
}
@@ -63,7 +63,7 @@ public:
protected:
//! Constructor. Initializes default status.
Standard_EXPORT IMeshData_StatusOwner()
IMeshData_StatusOwner()
: myStatus(IMeshData_NoError)
{
}

View File

@@ -0,0 +1,18 @@
// Created on: 2020-09-28
// Copyright (c) 2020 OPEN CASCADE SAS
// Created by: Maria KRYLOVA
//
// 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.
#include <IMeshData_TessellatedShape.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshData_TessellatedShape, IMeshData_Shape)

View File

@@ -26,34 +26,34 @@ class IMeshData_TessellatedShape : public IMeshData_Shape
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshData_TessellatedShape()
virtual ~IMeshData_TessellatedShape()
{
}
//! Gets deflection value for the discrete model.
inline Standard_Real GetDeflection () const
Standard_Real GetDeflection () const
{
return myDeflection;
}
//! Sets deflection value for the discrete model.
inline void SetDeflection (const Standard_Real theValue)
void SetDeflection (const Standard_Real theValue)
{
myDeflection = theValue;
}
DEFINE_STANDARD_RTTI_INLINE(IMeshData_TessellatedShape, IMeshData_Shape)
DEFINE_STANDARD_RTTIEXT(IMeshData_TessellatedShape, IMeshData_Shape)
protected:
//! Constructor.
Standard_EXPORT IMeshData_TessellatedShape ()
IMeshData_TessellatedShape ()
: myDeflection(RealLast())
{
}
//! Constructor.
Standard_EXPORT IMeshData_TessellatedShape (const TopoDS_Shape& theShape)
IMeshData_TessellatedShape (const TopoDS_Shape& theShape)
: IMeshData_Shape(theShape),
myDeflection(RealLast())
{

View File

@@ -0,0 +1,18 @@
// Created on: 2020-09-28
// Copyright (c) 2020 OPEN CASCADE SAS
// Created by: Maria KRYLOVA
//
// 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.
#include <IMeshData_Wire.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshData_Wire, IMeshData_TessellatedShape)

View File

@@ -32,12 +32,12 @@ class IMeshData_Wire : public IMeshData_TessellatedShape, public IMeshData_Statu
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshData_Wire()
virtual ~IMeshData_Wire()
{
}
//! Returns TopoDS_Face attached to model.
inline const TopoDS_Wire& GetWire () const
const TopoDS_Wire& GetWire () const
{
return TopoDS::Wire (GetShape ());
}
@@ -59,13 +59,13 @@ public:
Standard_EXPORT virtual TopAbs_Orientation GetEdgeOrientation (
const Standard_Integer theIndex) const = 0;
DEFINE_STANDARD_RTTI_INLINE(IMeshData_Wire, IMeshData_TessellatedShape)
DEFINE_STANDARD_RTTIEXT(IMeshData_Wire, IMeshData_TessellatedShape)
protected:
//! Constructor.
//! Initializes empty model.
Standard_EXPORT IMeshData_Wire(const TopoDS_Wire& theWire)
IMeshData_Wire(const TopoDS_Wire& theWire)
: IMeshData_TessellatedShape(theWire)
{
}