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,20 @@
IMeshTools_Context.hxx
IMeshTools_Context.cxx
IMeshTools_CurveTessellator.hxx
IMeshTools_CurveTessellator.cxx
IMeshTools_MeshAlgo.hxx
IMeshTools_MeshAlgo.cxx
IMeshTools_MeshAlgoFactory.hxx
IMeshTools_MeshAlgoFactory.cxx
IMeshTools_MeshAlgoType.hxx
IMeshTools_MeshBuilder.hxx
IMeshTools_MeshBuilder.cxx
IMeshTools_ModelAlgo.hxx
IMeshTools_ModelAlgo.cxx
IMeshTools_ModelBuilder.hxx
IMeshTools_ModelBuilder.cxx
IMeshTools_Parameters.hxx
IMeshTools_ShapeExplorer.hxx
IMeshTools_ShapeExplorer.cxx
IMeshTools_ShapeVisitor.hxx
IMeshTools_ShapeVisitor.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 <IMeshTools_Context.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshTools_Context, IMeshData_Shape)

View File

@@ -32,18 +32,18 @@ class IMeshTools_Context : public IMeshData_Shape
public:
//! Constructor.
Standard_EXPORT IMeshTools_Context()
IMeshTools_Context()
{
}
//! Destructor.
Standard_EXPORT virtual ~IMeshTools_Context()
virtual ~IMeshTools_Context()
{
}
//! Builds model using assined model builder.
//! @return True on success, False elsewhere.
Standard_EXPORT virtual Standard_Boolean BuildModel ()
virtual Standard_Boolean BuildModel ()
{
if (myModelBuilder.IsNull())
{
@@ -57,7 +57,7 @@ public:
//! Performs discretization of model edges using assigned edge discret algorithm.
//! @return True on success, False elsewhere.
Standard_EXPORT virtual Standard_Boolean DiscretizeEdges()
virtual Standard_Boolean DiscretizeEdges()
{
if (myModel.IsNull() || myEdgeDiscret.IsNull())
{
@@ -71,7 +71,7 @@ public:
//! Performs healing of discrete model built by DiscretizeEdges() method
//! using assigned healing algorithm.
//! @return True on success, False elsewhere.
Standard_EXPORT virtual Standard_Boolean HealModel()
virtual Standard_Boolean HealModel()
{
if (myModel.IsNull())
{
@@ -86,7 +86,7 @@ public:
//! Performs pre-processing of discrete model using assigned algorithm.
//! Performs auxiliary actions such as cleaning shape from old triangulation.
//! @return True on success, False elsewhere.
Standard_EXPORT virtual Standard_Boolean PreProcessModel()
virtual Standard_Boolean PreProcessModel()
{
if (myModel.IsNull())
{
@@ -113,7 +113,7 @@ public:
//! Performs post-processing of discrete model using assigned algorithm.
//! @return True on success, False elsewhere.
Standard_EXPORT virtual Standard_Boolean PostProcessModel()
virtual Standard_Boolean PostProcessModel()
{
if (myModel.IsNull())
{
@@ -126,7 +126,7 @@ public:
}
//! Cleans temporary context data.
Standard_EXPORT virtual void Clean()
virtual void Clean()
{
if (myParameters.CleanModel)
{
@@ -135,96 +135,96 @@ public:
}
//! Gets instance of a tool to be used to build discrete model.
inline const Handle (IMeshTools_ModelBuilder)& GetModelBuilder () const
const Handle (IMeshTools_ModelBuilder)& GetModelBuilder () const
{
return myModelBuilder;
}
//! Sets instance of a tool to be used to build discrete model.
inline void SetModelBuilder (const Handle (IMeshTools_ModelBuilder)& theBuilder)
void SetModelBuilder (const Handle (IMeshTools_ModelBuilder)& theBuilder)
{
myModelBuilder = theBuilder;
}
//! Gets instance of a tool to be used to discretize edges of a model.
inline const Handle (IMeshTools_ModelAlgo)& GetEdgeDiscret () const
const Handle (IMeshTools_ModelAlgo)& GetEdgeDiscret () const
{
return myEdgeDiscret;
}
//! Sets instance of a tool to be used to discretize edges of a model.
inline void SetEdgeDiscret (const Handle (IMeshTools_ModelAlgo)& theEdgeDiscret)
void SetEdgeDiscret (const Handle (IMeshTools_ModelAlgo)& theEdgeDiscret)
{
myEdgeDiscret = theEdgeDiscret;
}
//! Gets instance of a tool to be used to heal discrete model.
inline const Handle(IMeshTools_ModelAlgo)& GetModelHealer() const
const Handle(IMeshTools_ModelAlgo)& GetModelHealer() const
{
return myModelHealer;
}
//! Sets instance of a tool to be used to heal discrete model.
inline void SetModelHealer(const Handle(IMeshTools_ModelAlgo)& theModelHealer)
void SetModelHealer(const Handle(IMeshTools_ModelAlgo)& theModelHealer)
{
myModelHealer = theModelHealer;
}
//! Gets instance of pre-processing algorithm.
inline const Handle(IMeshTools_ModelAlgo)& GetPreProcessor() const
const Handle(IMeshTools_ModelAlgo)& GetPreProcessor() const
{
return myPreProcessor;
}
//! Sets instance of pre-processing algorithm.
inline void SetPreProcessor(const Handle(IMeshTools_ModelAlgo)& thePreProcessor)
void SetPreProcessor(const Handle(IMeshTools_ModelAlgo)& thePreProcessor)
{
myPreProcessor = thePreProcessor;
}
//! Gets instance of meshing algorithm.
inline const Handle(IMeshTools_ModelAlgo)& GetFaceDiscret() const
const Handle(IMeshTools_ModelAlgo)& GetFaceDiscret() const
{
return myFaceDiscret;
}
//! Sets instance of meshing algorithm.
inline void SetFaceDiscret(const Handle(IMeshTools_ModelAlgo)& theFaceDiscret)
void SetFaceDiscret(const Handle(IMeshTools_ModelAlgo)& theFaceDiscret)
{
myFaceDiscret = theFaceDiscret;
}
//! Gets instance of post-processing algorithm.
inline const Handle(IMeshTools_ModelAlgo)& GetPostProcessor() const
const Handle(IMeshTools_ModelAlgo)& GetPostProcessor() const
{
return myPostProcessor;
}
//! Sets instance of post-processing algorithm.
inline void SetPostProcessor(const Handle(IMeshTools_ModelAlgo)& thePostProcessor)
void SetPostProcessor(const Handle(IMeshTools_ModelAlgo)& thePostProcessor)
{
myPostProcessor = thePostProcessor;
}
//! Gets parameters to be used for meshing.
inline const IMeshTools_Parameters& GetParameters () const
const IMeshTools_Parameters& GetParameters () const
{
return myParameters;
}
//! Gets reference to parameters to be used for meshing.
inline IMeshTools_Parameters& ChangeParameters ()
IMeshTools_Parameters& ChangeParameters ()
{
return myParameters;
}
//! Returns discrete model of a shape.
inline const Handle (IMeshData_Model)& GetModel () const
const Handle (IMeshData_Model)& GetModel () const
{
return myModel;
}
DEFINE_STANDARD_RTTI_INLINE(IMeshTools_Context, IMeshData_Shape)
DEFINE_STANDARD_RTTIEXT(IMeshTools_Context, IMeshData_Shape)
private:

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 <IMeshTools_CurveTessellator.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshTools_CurveTessellator, Standard_Transient)

View File

@@ -27,7 +27,7 @@ class IMeshTools_CurveTessellator : public Standard_Transient
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshTools_CurveTessellator()
virtual ~IMeshTools_CurveTessellator()
{
}
@@ -44,12 +44,12 @@ public:
gp_Pnt& thePoint,
Standard_Real& theParameter) const = 0;
DEFINE_STANDARD_RTTI_INLINE(IMeshTools_CurveTessellator, Standard_Transient)
DEFINE_STANDARD_RTTIEXT(IMeshTools_CurveTessellator, Standard_Transient)
protected:
//! Constructor.
Standard_EXPORT IMeshTools_CurveTessellator()
IMeshTools_CurveTessellator()
{
}
};

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 <IMeshTools_MeshAlgo.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshTools_MeshAlgo, Standard_Transient)

View File

@@ -29,7 +29,7 @@ class IMeshTools_MeshAlgo : public Standard_Transient
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshTools_MeshAlgo()
virtual ~IMeshTools_MeshAlgo()
{
}
@@ -39,12 +39,12 @@ public:
const IMeshTools_Parameters& theParameters,
const Message_ProgressRange& theRange) = 0;
DEFINE_STANDARD_RTTI_INLINE(IMeshTools_MeshAlgo, Standard_Transient)
DEFINE_STANDARD_RTTIEXT(IMeshTools_MeshAlgo, Standard_Transient)
protected:
//! Constructor.
Standard_EXPORT IMeshTools_MeshAlgo()
IMeshTools_MeshAlgo()
{
}
};

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 <IMeshTools_MeshAlgoFactory.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshTools_MeshAlgoFactory, Standard_Transient)

View File

@@ -30,7 +30,7 @@ class IMeshTools_MeshAlgoFactory : public Standard_Transient
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshTools_MeshAlgoFactory()
virtual ~IMeshTools_MeshAlgoFactory()
{
}
@@ -39,12 +39,12 @@ public:
const GeomAbs_SurfaceType theSurfaceType,
const IMeshTools_Parameters& theParameters) const = 0;
DEFINE_STANDARD_RTTI_INLINE(IMeshTools_MeshAlgoFactory, Standard_Transient)
DEFINE_STANDARD_RTTIEXT(IMeshTools_MeshAlgoFactory, Standard_Transient)
protected:
//! Constructor.
Standard_EXPORT IMeshTools_MeshAlgoFactory()
IMeshTools_MeshAlgoFactory()
{
}
};

View File

@@ -17,6 +17,8 @@
#include <IMeshData_Face.hxx>
#include <OSD_Parallel.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshTools_MeshBuilder, Message_Algorithm)
//=======================================================================
// Function: Constructor
// Purpose :

View File

@@ -51,13 +51,13 @@ public:
Standard_EXPORT virtual ~IMeshTools_MeshBuilder();
//! Sets context for algorithm.
inline void SetContext (const Handle (IMeshTools_Context)& theContext)
void SetContext (const Handle (IMeshTools_Context)& theContext)
{
myContext = theContext;
}
//! Gets context of algorithm.
inline const Handle (IMeshTools_Context)& GetContext () const
const Handle (IMeshTools_Context)& GetContext () const
{
return myContext;
}
@@ -65,7 +65,7 @@ public:
//! Performs meshing ot the shape using current context.
Standard_EXPORT virtual void Perform (const Message_ProgressRange& theRange);
DEFINE_STANDARD_RTTI_INLINE(IMeshTools_MeshBuilder, Message_Algorithm)
DEFINE_STANDARD_RTTIEXT(IMeshTools_MeshBuilder, Message_Algorithm)
private:

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 <IMeshTools_ModelAlgo.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshTools_ModelAlgo, Standard_Transient)

View File

@@ -31,7 +31,7 @@ class IMeshTools_ModelAlgo : public Standard_Transient
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshTools_ModelAlgo()
virtual ~IMeshTools_ModelAlgo()
{
}
@@ -53,12 +53,12 @@ public:
}
}
DEFINE_STANDARD_RTTI_INLINE(IMeshTools_ModelAlgo, Standard_Transient)
DEFINE_STANDARD_RTTIEXT(IMeshTools_ModelAlgo, Standard_Transient)
protected:
//! Constructor.
Standard_EXPORT IMeshTools_ModelAlgo()
IMeshTools_ModelAlgo()
{
}

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 <IMeshTools_ModelBuilder.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshTools_ModelBuilder, Message_Algorithm)

View File

@@ -21,8 +21,8 @@
#include <Standard_Failure.hxx>
#include <Standard_Type.hxx>
#include <TopoDS_Shape.hxx>
#include <IMeshData_Model.hxx>
class IMeshData_Model;
struct IMeshTools_Parameters;
//! Interface class represents API for tool building discrete model.
@@ -36,7 +36,7 @@ class IMeshTools_ModelBuilder : public Message_Algorithm
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshTools_ModelBuilder()
virtual ~IMeshTools_ModelBuilder()
{
}
@@ -61,12 +61,12 @@ public:
}
}
DEFINE_STANDARD_RTTI_INLINE(IMeshTools_ModelBuilder, Message_Algorithm)
DEFINE_STANDARD_RTTIEXT(IMeshTools_ModelBuilder, Message_Algorithm)
protected:
//! Constructor.
Standard_EXPORT IMeshTools_ModelBuilder()
IMeshTools_ModelBuilder()
{
}

View File

@@ -25,6 +25,8 @@
#include <TopTools_MapOfShape.hxx>
#include <Geom_Surface.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshTools_ShapeExplorer, IMeshData_Shape)
namespace
{
//=======================================================================

View File

@@ -35,7 +35,7 @@ public:
//! Starts exploring of a shape.
Standard_EXPORT virtual void Accept (const Handle (IMeshTools_ShapeVisitor)& theVisitor);
DEFINE_STANDARD_RTTI_INLINE(IMeshTools_ShapeExplorer, IMeshData_Shape)
DEFINE_STANDARD_RTTIEXT(IMeshTools_ShapeExplorer, IMeshData_Shape)
};
#endif

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 <IMeshTools_ShapeVisitor.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IMeshTools_ShapeVisitor, Standard_Transient)

View File

@@ -28,7 +28,7 @@ class IMeshTools_ShapeVisitor : public Standard_Transient
public:
//! Destructor.
Standard_EXPORT virtual ~IMeshTools_ShapeVisitor()
virtual ~IMeshTools_ShapeVisitor()
{
}
@@ -38,12 +38,12 @@ public:
//! Handles TopoDS_Edge object.
Standard_EXPORT virtual void Visit (const TopoDS_Edge& theEdge) = 0;
DEFINE_STANDARD_RTTI_INLINE(IMeshTools_ShapeVisitor, Standard_Transient)
DEFINE_STANDARD_RTTIEXT(IMeshTools_ShapeVisitor, Standard_Transient)
protected:
//! Constructor.
Standard_EXPORT IMeshTools_ShapeVisitor()
IMeshTools_ShapeVisitor()
{
}
};